diff --git a/htdocs/don/card.php b/htdocs/don/card.php index aa0a27b6979..fd68b028254 100644 --- a/htdocs/don/card.php +++ b/htdocs/don/card.php @@ -305,9 +305,6 @@ if ($action == 'create') print ''; print ''; - $nbrows=11; - if (! empty($conf->projet->enabled)) $nbrows++; - // Date print ''; print ''; - $nbrows=12; - if (! empty($conf->projet->enabled)) $nbrows++; - // Date - print "".''; @@ -454,10 +448,10 @@ if (! empty($id) && $action == 'edit') print "\n"; $langs->load("companies"); - print "".''; - print "".''; - print "".''; - print "".''; + print ''; + print ''; + print ''; // Zip / Town @@ -468,7 +462,7 @@ if (! empty($id) && $action == 'edit') print ''; // Country - print ''; @@ -593,9 +587,6 @@ if (! empty($id) && $action != 'edit') print '
'.$langs->trans("Date").''; $form->select_date($donation_date?$donation_date:-1,'','','','',"add",1,1); @@ -428,11 +425,8 @@ if (! empty($id) && $action == 'edit') print '
'.$langs->trans("Date").''; + print '
'.$langs->trans("Date").''; $form->select_date($object->date,'','','','',"update"); print '
'.$langs->trans("Company").'
'.$langs->trans("Lastname").'
'.$langs->trans("Firstname").'
'.$langs->trans("Address").''; + print '
'.$langs->trans("Company").'
'.$langs->trans("Lastname").'
'.$langs->trans("Firstname").'
'.$langs->trans("Address").''; print '
'.$langs->trans('Country').''; + print '
'.$langs->trans('Country').''; print $form->select_country((!empty($object->country_id)?$object->country_id:$mysoc->country_code),'country_id'); if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1); print '
'; - $nbrows=12; - if (! empty($conf->projet->enabled)) $nbrows++; - // Ref /* print ''; */ // Date - print '"; @@ -668,13 +659,13 @@ if (! empty($id) && $action != 'edit') // Other attributes $cols = 2; include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php'; - + print '
'.$langs->trans("Ref").''; @@ -604,7 +595,7 @@ if (! empty($id) && $action != 'edit') print '
'.$langs->trans("Date").''; + print '
'.$langs->trans("Date").''; print dol_print_date($object->date,"day"); print "
'; - + print ''; print '
'; print '
'; - + /* * Payments */ @@ -737,16 +728,13 @@ if (! empty($id) && $action != 'edit') dol_print_error($db); } - print '
'; print '
'; print ''; - + print '
'; - - + dol_fiche_end(); - $remaintopay = $object->amount - $totalpaid; @@ -821,7 +809,7 @@ if (! empty($id) && $action != 'edit') print $formfile->showdocuments('donation',$filename,$filedir,$urlsource,$genallowed,$delallowed,$object->modelpdf); print '
'; - + print '
'; }