Debug v21
This commit is contained in:
parent
46ec368462
commit
e36f5fc31d
1 changed files with 16 additions and 11 deletions
|
|
@ -1551,7 +1551,9 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
|
|||
print '</td>';
|
||||
print '</tr>';
|
||||
|
||||
print '<tr><td>'.$form->editfieldkey('CustomerCode', 'customer_code', '', $object, 0).'</td><td>';
|
||||
// Customer code
|
||||
print '<tr>';
|
||||
print '<td>'.$form->editfieldkey('CustomerCode', 'customer_code', '', $object, 0).'</td><td>';
|
||||
print '<table class="nobordernopadding"><tr><td>';
|
||||
$tmpcode = $object->code_client;
|
||||
if (empty($tmpcode) && !empty($modCodeClient->code_auto)) {
|
||||
|
|
@ -1564,14 +1566,14 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
|
|||
print '</td></tr></table>';
|
||||
print '</td>';
|
||||
|
||||
// Supplier code
|
||||
if ((isModEnabled("fournisseur") && $user->hasRight('fournisseur', 'lire') && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD')) || (isModEnabled("supplier_order") && $user->hasRight('supplier_order', 'lire')) || (isModEnabled("supplier_invoice") && $user->hasRight('supplier_invoice', 'lire'))) {
|
||||
if ($conf->browser->layout == 'phone') {
|
||||
print '<td colspan="2"></td>';
|
||||
print '</tr><tr>';
|
||||
}
|
||||
print '<td>'.$form->editfieldkey('SupplierCode', 'supplier_code', '', $object, 0).'</td>';
|
||||
print '<td>';
|
||||
print '<table class="nobordernopadding"><tr>';
|
||||
print '<td>'.$form->editfieldkey('SupplierCode', 'supplier_code', '', $object, 0).'</td><td>';
|
||||
print '<table class="nobordernopadding"><tr><td>';
|
||||
$tmpcode = $object->code_fournisseur;
|
||||
if (empty($tmpcode) && !empty($modCodeFournisseur->code_auto)) {
|
||||
$tmpcode = $modCodeFournisseur->getNextValue($object, 1);
|
||||
|
|
@ -2332,7 +2334,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
|
|||
// Nature of thirdparty
|
||||
$selectedprospect = (GETPOSTISSET('prospect') ? GETPOSTINT('prospect') : $selectedprospect);
|
||||
$selectedcustomer = (GETPOSTISSET('customer') ? GETPOSTINT('customer') : $selectedcustomer);
|
||||
print '<tr class="marginbottomlarge height50"><td class="titlefieldcreate">'.$form->editfieldkey('', 'customerprospect', '', $object, 0, 'string', '', 0).'</td>';
|
||||
print '<tr class="marginbottomlarge height50">';
|
||||
print '<td class="maxwidthonsmartphone" colspan="3">';
|
||||
|
||||
if (!getDolGlobalString('SOCIETE_DISABLE_PROSPECTS')) {
|
||||
|
|
@ -2393,7 +2395,8 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
|
|||
}
|
||||
print '</td>';
|
||||
print '</tr>';
|
||||
print '<tr><td>'.$form->editfieldkey('CustomerCode', 'customer_code', '', $object, 0).'</td><td>';
|
||||
|
||||
print '<tr><td>'.$form->editfieldkey('CustomerCode', 'customer_code', '', $object, 0).'</td><td colspan="3">';
|
||||
print '<table class="nobordernopadding"><tr><td>';
|
||||
$tmpcode = $object->code_client;
|
||||
if (empty($tmpcode) && !empty($modCodeClient->code_auto)) {
|
||||
|
|
@ -2410,7 +2413,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
|
|||
print '</tr><tr>';
|
||||
}
|
||||
|
||||
print '<td>'.$form->editfieldkey('SupplierCode', 'supplier_code', '', $object, 0).'</td><td>';
|
||||
print '<td>'.$form->editfieldkey('SupplierCode', 'supplier_code', '', $object, 0).'</td><td colspan="3">';
|
||||
|
||||
if ((isModEnabled("fournisseur") && $user->hasRight('fournisseur', 'lire') && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD')) || (isModEnabled("supplier_order") && $user->hasRight('supplier_order', 'lire')) || (isModEnabled("supplier_invoice") && $user->hasRight('supplier_invoice', 'lire'))) {
|
||||
print '<table class="nobordernopadding"><tr><td>';
|
||||
|
|
@ -2437,12 +2440,13 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
|
|||
}
|
||||
|
||||
// Status
|
||||
print '<tr><td>'.$form->editfieldkey('Status', 'status', '', $object, 0).'</td><td colspan="3">';
|
||||
print '<tr><td>'.$form->editfieldkey('Status', 'status', '', $object, 0).'</td><td'.($conf->browser->layout == 'phone' ? '' : ' colspan="3"').'>';
|
||||
print $form->selectarray('status', array('0' => $langs->trans('ActivityCeased'), '1' => $langs->trans('InActivity')), $object->status, 0, 0, 0, '', 0, 0, 0, '', 'minwidth100', 1);
|
||||
print '</td></tr>';
|
||||
|
||||
$colspan = ($conf->browser->layout == 'phone' ? 2 : 4);
|
||||
print '<tr><td'.($colspan ? ' colspan="'.$colspan.'"' : '').'> </td></tr>';
|
||||
//$colspan = ($conf->browser->layout == 'phone' ? 2 : 4);
|
||||
$colspan = 4;
|
||||
print '<tr><td colspan="'.$colspan.'"> </td></tr>';
|
||||
|
||||
// Address
|
||||
print '<tr><td class="tdtop">'.$form->editfieldkey('Address', 'address', '', $object, 0).'</td>';
|
||||
|
|
@ -2550,7 +2554,8 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
|
|||
|
||||
// Social network
|
||||
if (isModEnabled('socialnetworks')) {
|
||||
$colspan = ($conf->browser->layout == 'phone' ? 2 : 4);
|
||||
//$colspan = ($conf->browser->layout == 'phone' ? 2 : 4);
|
||||
$colspan = 4;
|
||||
|
||||
$object->showSocialNetwork($socialnetworks, $colspan);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue