alxarafe / alixar

dolibarr/htdocs/compta/facture/info.php

Indentation +29 added lines, -29 removed lines

@@ -33,7 +33,7 @@ 
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php';
 if (! empty($conf->projet->enabled)) {
-	include_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
+    include_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
 }
 
 // Load translation files required by the page
@@ -77,35 +77,35 @@ 
 // Project
 if (! empty($conf->projet->enabled))
 {
-	$langs->load("projects");
-	$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
-	if ($user->rights->facture->creer)
-	{
-		if ($action != 'classify')
-			//$morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
-			$morehtmlref.=' : ';
-		if ($action == 'classify') {
-			//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-			$morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-			$morehtmlref.='<input type="hidden" name="action" value="classin">';
-			$morehtmlref.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-			$morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-			$morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-			$morehtmlref.='</form>';
-		} else {
-			$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-		}
-	} else {
-		if (! empty($object->fk_project)) {
-			$proj = new Project($db);
-			$proj->fetch($object->fk_project);
+    $langs->load("projects");
+    $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
+    if ($user->rights->facture->creer)
+    {
+        if ($action != 'classify')
+            //$morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+            $morehtmlref.=' : ';
+        if ($action == 'classify') {
+            //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+            $morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+            $morehtmlref.='<input type="hidden" name="action" value="classin">';
+            $morehtmlref.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+            $morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+            $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+            $morehtmlref.='</form>';
+        } else {
+            $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+        }
+    } else {
+        if (! empty($object->fk_project)) {
+            $proj = new Project($db);
+            $proj->fetch($object->fk_project);
             $morehtmlref .= '<a href="' . BASE_URI . '?controller=projet&method=card&id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
-			$morehtmlref.=$proj->ref;
-			$morehtmlref.='</a>';
-		} else {
-			$morehtmlref.='';
-		}
-	}
+            $morehtmlref.=$proj->ref;
+            $morehtmlref.='</a>';
+        } else {
+            $morehtmlref.='';
+        }
+    }
 }
 $morehtmlref.='</div>';
 

dolibarr/htdocs/compta/facture/contact.php

Indentation +108 added lines, -108 removed lines

@@ -35,7 +35,7 @@ 
 require_once DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 if (! empty($conf->projet->enabled)) {
-	require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
+    require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
 }
 
 // Load translation files required by the page
@@ -60,60 +60,60 @@ 
 
 if ($action == 'addcontact' && $user->rights->facture->creer)
 {
-	$result = $object->fetch($id);
+    $result = $object->fetch($id);
 
     if ($result > 0 && $id > 0)
     {
-    	$contactid = (GETPOST('userid') ? GETPOST('userid','int') : GETPOST('contactid','int'));
-  		$result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]);
+        $contactid = (GETPOST('userid') ? GETPOST('userid','int') : GETPOST('contactid','int'));
+            $result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]);
     }
 
-	if ($result >= 0)
-	{
-		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-		exit;
-	}
-	else
-	{
-		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
-		{
-			$langs->load("errors");
-			setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
-		}
-		else
-		{
-			setEventMessages($object->error, $object->errors, 'errors');
-		}
-	}
+    if ($result >= 0)
+    {
+        header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+        exit;
+    }
+    else
+    {
+        if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
+        {
+            $langs->load("errors");
+            setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
+        }
+        else
+        {
+            setEventMessages($object->error, $object->errors, 'errors');
+        }
+    }
 }
 
 // Toggle the status of a contact
 else if ($action == 'swapstatut' && $user->rights->facture->creer)
 {
-	if ($object->fetch($id))
-	{
-	    $result=$object->swapContactStatus(GETPOST('ligne'));
-	}
-	else
-	{
-		dol_print_error($db);
-	}
+    if ($object->fetch($id))
+    {
+        $result=$object->swapContactStatus(GETPOST('ligne'));
+    }
+    else
+    {
+        dol_print_error($db);
+    }
 }
 
 // Deletes a contact
 else if ($action == 'deletecontact' && $user->rights->facture->creer)
 {
-	$object->fetch($id);
-	$result = $object->delete_contact($lineid);
-
-	if ($result >= 0)
-	{
-		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-		exit;
-	}
-	else {
-		dol_print_error($db);
-	}
+    $object->fetch($id);
+    $result = $object->delete_contact($lineid);
+
+    if ($result >= 0)
+    {
+        header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+        exit;
+    }
+    else {
+        dol_print_error($db);
+    }
 }
 
 
@@ -139,82 +139,82 @@ 
 
 if ($id > 0 || ! empty($ref))
 {
-	if ($object->fetch($id, $ref) > 0)
-	{
-		$object->fetch_thirdparty();
+    if ($object->fetch($id, $ref) > 0)
+    {
+        $object->fetch_thirdparty();
 
-		$head = facture_prepare_head($object);
+        $head = facture_prepare_head($object);
 
-		$totalpaye = $object->getSommePaiement();
+        $totalpaye = $object->getSommePaiement();
 
-		dol_fiche_head($head, 'contact', $langs->trans('InvoiceCustomer'), -1, 'bill');
+        dol_fiche_head($head, 'contact', $langs->trans('InvoiceCustomer'), -1, 'bill');
 
-		// Invoice content
+        // Invoice content
 
         $linkback = '<a href="' . BASE_URI . '?controller=compta/facture&method=list&restore_lastsearch_values=1' . (!empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
 
-		$morehtmlref='<div class="refidno">';
-		// Ref customer
-		$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
-		$morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
-		// Thirdparty
-		$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1,'customer');
-		// Project
-		if (! empty($conf->projet->enabled))
-		{
-		    $langs->load("projects");
-		    $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
-		    if ($user->rights->facture->creer)
-		    {
-		        if ($action != 'classify')
-		            //$morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
-		            $morehtmlref.=' : ';
-		        	if ($action == 'classify') {
-		                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-		                $morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-		                $morehtmlref.='<input type="hidden" name="action" value="classin">';
-		                $morehtmlref.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-		                $morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-		                $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-		                $morehtmlref.='</form>';
-		            } else {
-		                $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-		            }
-		    } else {
-		        if (! empty($object->fk_project)) {
-		            $proj = new Project($db);
-		            $proj->fetch($object->fk_project);
+        $morehtmlref='<div class="refidno">';
+        // Ref customer
+        $morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
+        $morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
+        // Thirdparty
+        $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1,'customer');
+        // Project
+        if (! empty($conf->projet->enabled))
+        {
+            $langs->load("projects");
+            $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
+            if ($user->rights->facture->creer)
+            {
+                if ($action != 'classify')
+                    //$morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+                    $morehtmlref.=' : ';
+                    if ($action == 'classify') {
+                        //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+                        $morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+                        $morehtmlref.='<input type="hidden" name="action" value="classin">';
+                        $morehtmlref.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+                        $morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+                        $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+                        $morehtmlref.='</form>';
+                    } else {
+                        $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+                    }
+            } else {
+                if (! empty($object->fk_project)) {
+                    $proj = new Project($db);
+                    $proj->fetch($object->fk_project);
                     $morehtmlref .= '<a href="' . BASE_URI . '?controller=projet&method=card&id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
-		            $morehtmlref.=$proj->ref;
-		            $morehtmlref.='</a>';
-		        } else {
-		            $morehtmlref.='';
-		        }
-		    }
-		}
-		$morehtmlref.='</div>';
-
-		$object->totalpaye = $totalpaye;   // To give a chance to dol_banner_tab to use already paid amount to show correct status
-
-		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0, '', '', 1);
-
-		dol_fiche_end();
-
-		print '<br>';
-
-		// Contacts lines (modules that overwrite templates must declare this into descriptor)
-		$dirtpls=array_merge($conf->modules_parts['tpl'],array('/core/tpl'));
-		foreach($dirtpls as $reldir)
-		{
-		    $res=@include dol_buildpath($reldir.'/contacts.tpl.php');
-		    if ($res) break;
-		}
-	}
-	else
-	{
-		// Record not found
-		print "ErrorRecordNotFound";
-	}
+                    $morehtmlref.=$proj->ref;
+                    $morehtmlref.='</a>';
+                } else {
+                    $morehtmlref.='';
+                }
+            }
+        }
+        $morehtmlref.='</div>';
+
+        $object->totalpaye = $totalpaye;   // To give a chance to dol_banner_tab to use already paid amount to show correct status
+
+        dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0, '', '', 1);
+
+        dol_fiche_end();
+
+        print '<br>';
+
+        // Contacts lines (modules that overwrite templates must declare this into descriptor)
+        $dirtpls=array_merge($conf->modules_parts['tpl'],array('/core/tpl'));
+        foreach($dirtpls as $reldir)
+        {
+            $res=@include dol_buildpath($reldir.'/contacts.tpl.php');
+            if ($res) break;
+        }
+    }
+    else
+    {
+        // Record not found
+        print "ErrorRecordNotFound";
+    }
 }
 
 // End of page

dolibarr/htdocs/compta/facture/document.php

Indentation +87 added lines, -87 removed lines

@@ -38,7 +38,7 @@ 
 require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 if (! empty($conf->projet->enabled)) {
-	include_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
+    include_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
 }
 
 // Load translation files required by the page
@@ -54,7 +54,7 @@ 
 // Security check
 if ($user->societe_id)
 {
-	$socid = $user->societe_id;
+    $socid = $user->societe_id;
 }
 $result=restrictedArea($user,'facture',$id,'');
 
@@ -72,8 +72,8 @@ 
 $object = new Facture($db);
 if ($object->fetch($id))
 {
-	$object->fetch_thirdparty();
-	$upload_dir = $conf->facture->dir_output . "/" . dol_sanitizeFileName($object->ref);
+    $object->fetch_thirdparty();
+    $upload_dir = $conf->facture->dir_output . "/" . dol_sanitizeFileName($object->ref);
 }
 
 
@@ -96,102 +96,102 @@ 
 
 if ($id > 0 || ! empty($ref))
 {
-	if ($object->fetch($id,$ref) > 0)
-	{
-		$object->fetch_thirdparty();
+    if ($object->fetch($id,$ref) > 0)
+    {
+        $object->fetch_thirdparty();
 
-		$upload_dir = $conf->facture->dir_output.'/'.dol_sanitizeFileName($object->ref);
+        $upload_dir = $conf->facture->dir_output.'/'.dol_sanitizeFileName($object->ref);
 
-		$head = facture_prepare_head($object);
-		dol_fiche_head($head, 'documents', $langs->trans('InvoiceCustomer'), -1, 'bill');
+        $head = facture_prepare_head($object);
+        dol_fiche_head($head, 'documents', $langs->trans('InvoiceCustomer'), -1, 'bill');
 
-    	$totalpaye = $object->getSommePaiement();
+        $totalpaye = $object->getSommePaiement();
 
-		// Build file list
-		$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
-		$totalsize=0;
-		foreach($filearray as $key => $file)
-		{
-			$totalsize+=$file['size'];
-		}
+        // Build file list
+        $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
+        $totalsize=0;
+        foreach($filearray as $key => $file)
+        {
+            $totalsize+=$file['size'];
+        }
 
 
-	    // Invoice content
+        // Invoice content
 
         $linkback = '<a href="' . BASE_URI . '?controller=compta/facture&method=list&restore_lastsearch_values=1' . (!empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
 
-	    $morehtmlref='<div class="refidno">';
-	    // Ref customer
-	    $morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
-	    $morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
-	    // Thirdparty
-	    $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1,'customer');
-	    // Project
-	    if (! empty($conf->projet->enabled))
-	    {
-	    	$langs->load("projects");
-	    	$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
-	    	if ($user->rights->facture->creer)
-	    	{
-	    		if ($action != 'classify')
-	    			//$morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
-	    			$morehtmlref.=' : ';
-	    		if ($action == 'classify') {
-	    			//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-	    			$morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-	    			$morehtmlref.='<input type="hidden" name="action" value="classin">';
-	    			$morehtmlref.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	    			$morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-	    			$morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-	    			$morehtmlref.='</form>';
-	    		} else {
-	    			$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-	    		}
-	    	} else {
-	    		if (! empty($object->fk_project)) {
-	    			$proj = new Project($db);
-	    			$proj->fetch($object->fk_project);
+        $morehtmlref='<div class="refidno">';
+        // Ref customer
+        $morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
+        $morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
+        // Thirdparty
+        $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1,'customer');
+        // Project
+        if (! empty($conf->projet->enabled))
+        {
+            $langs->load("projects");
+            $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
+            if ($user->rights->facture->creer)
+            {
+                if ($action != 'classify')
+                    //$morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+                    $morehtmlref.=' : ';
+                if ($action == 'classify') {
+                    //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+                    $morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+                    $morehtmlref.='<input type="hidden" name="action" value="classin">';
+                    $morehtmlref.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+                    $morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+                    $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+                    $morehtmlref.='</form>';
+                } else {
+                    $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+                }
+            } else {
+                if (! empty($object->fk_project)) {
+                    $proj = new Project($db);
+                    $proj->fetch($object->fk_project);
                     $morehtmlref .= '<a href="' . BASE_URI . '?controller=projet&method=card&id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
-	    			$morehtmlref.=$proj->ref;
-	    			$morehtmlref.='</a>';
-	    		} else {
-	    			$morehtmlref.='';
-	    		}
-	    	}
-	    }
-	    $morehtmlref.='</div>';
-
-	    $object->totalpaye = $totalpaye;   // To give a chance to dol_banner_tab to use already paid amount to show correct status
-
-	    dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0);
-
-		print '<div class="fichecenter">';
-		print '<div class="underbanner clearboth"></div>';
-
-		print '<table class="border" width="100%">';
-
-		print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
-		print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize,1,1).'</td></tr>';
-		print "</table>\n";
-
-		print "</div>\n";
-
-		dol_fiche_end();
-
-		$modulepart = 'facture';
-		$permission = $user->rights->facture->creer;
-		$permtoedit = $user->rights->facture->creer;
-		$param = '&id=' . $object->id;
-		include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php';
-	}
-	else
-	{
-		dol_print_error($db);
-	}
+                    $morehtmlref.=$proj->ref;
+                    $morehtmlref.='</a>';
+                } else {
+                    $morehtmlref.='';
+                }
+            }
+        }
+        $morehtmlref.='</div>';
+
+        $object->totalpaye = $totalpaye;   // To give a chance to dol_banner_tab to use already paid amount to show correct status
+
+        dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0);
+
+        print '<div class="fichecenter">';
+        print '<div class="underbanner clearboth"></div>';
+
+        print '<table class="border" width="100%">';
+
+        print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
+        print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize,1,1).'</td></tr>';
+        print "</table>\n";
+
+        print "</div>\n";
+
+        dol_fiche_end();
+
+        $modulepart = 'facture';
+        $permission = $user->rights->facture->creer;
+        $permtoedit = $user->rights->facture->creer;
+        $param = '&id=' . $object->id;
+        include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php';
+    }
+    else
+    {
+        dol_print_error($db);
+    }
 }
 else
 {
-	print $langs->trans("ErrorUnknown");
+    print $langs->trans("ErrorUnknown");
 }
 
 // End of page

dolibarr/htdocs/loan/createschedule.php

Indentation +94 added lines, -94 removed lines

@@ -43,58 +43,58 @@ 
 
 if ($action == 'createecheancier') {
 
-	$i=1;
-	while($i <$object->nbterm+1){
-
-		$date =  GETPOST('hi_date'.$i,'int');
-		$mens = GETPOST('mens'.$i);
-		$int = GETPOST('hi_interets'.$i);
-		$insurance = GETPOST('hi_insurance'.$i);
-
-		$echeance = new LoanSchedule($db);
-
-		$echeance->fk_loan = $object->id;
-		$echeance->datec = dol_now();
-		$echeance->tms = dol_now();
-		$echeance->datep = $date;
-		$echeance->amount_capital = $mens-$int;
-		$echeance->amount_insurance = $insurance;
-		$echeance->amount_interest = $int;
-		$echeance->fk_typepayment = 3;
-		$echeance->fk_bank = 0;
-		$echeance->fk_user_creat = $user->id;
-		$echeance->fk_user_modif = $user->id;
-		$result=$echeance->create($user);
-		if ($result<0) {
-			setEventMessages($echeance->error, $echeance->errors,'errors');
-		}
-		$i++;
-	}
+    $i=1;
+    while($i <$object->nbterm+1){
+
+        $date =  GETPOST('hi_date'.$i,'int');
+        $mens = GETPOST('mens'.$i);
+        $int = GETPOST('hi_interets'.$i);
+        $insurance = GETPOST('hi_insurance'.$i);
+
+        $echeance = new LoanSchedule($db);
+
+        $echeance->fk_loan = $object->id;
+        $echeance->datec = dol_now();
+        $echeance->tms = dol_now();
+        $echeance->datep = $date;
+        $echeance->amount_capital = $mens-$int;
+        $echeance->amount_insurance = $insurance;
+        $echeance->amount_interest = $int;
+        $echeance->fk_typepayment = 3;
+        $echeance->fk_bank = 0;
+        $echeance->fk_user_creat = $user->id;
+        $echeance->fk_user_modif = $user->id;
+        $result=$echeance->create($user);
+        if ($result<0) {
+            setEventMessages($echeance->error, $echeance->errors,'errors');
+        }
+        $i++;
+    }
 }
 
 if ($action == 'updateecheancier') {
 
-	$i=1;
-	while($i <$object->nbterm+1){
+    $i=1;
+    while($i <$object->nbterm+1){
 
-		$mens = GETPOST('mens'.$i);
-		$int = GETPOST('hi_interets'.$i);
-		$id = GETPOST('hi_rowid'.$i);
-		$insurance = GETPOST('hi_insurance'.$i);
+        $mens = GETPOST('mens'.$i);
+        $int = GETPOST('hi_interets'.$i);
+        $id = GETPOST('hi_rowid'.$i);
+        $insurance = GETPOST('hi_insurance'.$i);
 		
-		$echeance = new LoanSchedule($db);
-		$echeance->fetch($id);
-		$echeance->tms = dol_now();
-		$echeance->amount_capital = $mens-$int;
-		$echeance->amount_insurance = $insurance;
-		$echeance->amount_interest = $int;
-		$echeance->fk_user_modif = $user->id;
-		$result= $echeance->update($user,0);
-		if ($result<0) {
-			setEventMessages(null, $echeance->errors,'errors');
-		}
-		$i++;
-	}
+        $echeance = new LoanSchedule($db);
+        $echeance->fetch($id);
+        $echeance->tms = dol_now();
+        $echeance->amount_capital = $mens-$int;
+        $echeance->amount_insurance = $insurance;
+        $echeance->amount_interest = $int;
+        $echeance->fk_user_modif = $user->id;
+        $result= $echeance->update($user,0);
+        if ($result<0) {
+            setEventMessages(null, $echeance->errors,'errors');
+        }
+        $i++;
+    }
 }
 
 $echeance = new LoanSchedule($db);
@@ -144,9 +144,9 @@ 
 print '<input type="hidden" name="loanid" value="' . $loanid . '">';
 if(count($echeance->lines)>0)
 {
-	print '<input type="hidden" name="action" value="updateecheancier">';
+    print '<input type="hidden" name="action" value="updateecheancier">';
 }else{
-	print '<input type="hidden" name="action" value="createecheancier">';
+    print '<input type="hidden" name="action" value="createecheancier">';
 }
 print '<table class="border" width="100%">';
 print '<tr class="liste_titre">';
@@ -172,57 +172,57 @@ 
 
 if ($object->nbterm > 0 && count($echeance->lines)==0)
 {
-	$i=1;
-	$capital = $object->capital;
-	$insurance = $object->insurance_amount/$object->nbterm;
-	$insurance = price2num($insurance, 'MT');
-	$regulInsurance = price2num($object->insurance_amount - ($insurance * $object->nbterm));
-	while($i <$object->nbterm+1)
-	{
-		$mens = price2num($echeance->calcMonthlyPayments($capital, $object->rate/100, $object->nbterm-$i+1), 'MT');
-		$int = ($capital*($object->rate/12))/100;
-		$int = price2num($int, 'MT');
-		$cap_rest = price2num($capital - ($mens-$int), 'MT');
-		print '<tr>';
-		print '<td align="center" id="n'.$i.'">' . $i .'</td>';
-		print '<td align="center" id ="date' .$i .'"><input type="hidden" name="hi_date' .$i .'" id ="hi_date' .$i .'" value="' . dol_time_plus_duree($object->datestart, $i-1, 'm') . '">' . dol_print_date(dol_time_plus_duree($object->datestart, $i-1, 'm'),'day') . '</td>';
-		print '<td align="center" id="insurance'.$i.'">'.price($insurance+(($i == 1) ? $regulInsurance : 0),0,'',1).' €</td><input type="hidden" name="hi_insurance' .$i .'" id ="hi_insurance' .$i .'" value="' . ($insurance+(($i == 1) ? $regulInsurance : 0)) . '">';
-		print '<td align="center" id="interets'.$i.'">'.price($int,0,'',1).' €</td><input type="hidden" name="hi_interets' .$i .'" id ="hi_interets' .$i .'" value="' . $int . '">';
-		print '<td align="center"><input name="mens'.$i.'" id="mens'.$i.'" size="5" value="'.$mens.'" ech="'.$i.'"> €</td>';
-		print '<td align="center" id="capital'.$i.'">'.price($cap_rest).' €</td><input type="hidden" name="hi_capital' .$i .'" id ="hi_capital' .$i .'" value="' . $cap_rest . '">';
-		print '</tr>'."\n";
-		$i++;
-		$capital = $cap_rest;
-	}
+    $i=1;
+    $capital = $object->capital;
+    $insurance = $object->insurance_amount/$object->nbterm;
+    $insurance = price2num($insurance, 'MT');
+    $regulInsurance = price2num($object->insurance_amount - ($insurance * $object->nbterm));
+    while($i <$object->nbterm+1)
+    {
+        $mens = price2num($echeance->calcMonthlyPayments($capital, $object->rate/100, $object->nbterm-$i+1), 'MT');
+        $int = ($capital*($object->rate/12))/100;
+        $int = price2num($int, 'MT');
+        $cap_rest = price2num($capital - ($mens-$int), 'MT');
+        print '<tr>';
+        print '<td align="center" id="n'.$i.'">' . $i .'</td>';
+        print '<td align="center" id ="date' .$i .'"><input type="hidden" name="hi_date' .$i .'" id ="hi_date' .$i .'" value="' . dol_time_plus_duree($object->datestart, $i-1, 'm') . '">' . dol_print_date(dol_time_plus_duree($object->datestart, $i-1, 'm'),'day') . '</td>';
+        print '<td align="center" id="insurance'.$i.'">'.price($insurance+(($i == 1) ? $regulInsurance : 0),0,'',1).' €</td><input type="hidden" name="hi_insurance' .$i .'" id ="hi_insurance' .$i .'" value="' . ($insurance+(($i == 1) ? $regulInsurance : 0)) . '">';
+        print '<td align="center" id="interets'.$i.'">'.price($int,0,'',1).' €</td><input type="hidden" name="hi_interets' .$i .'" id ="hi_interets' .$i .'" value="' . $int . '">';
+        print '<td align="center"><input name="mens'.$i.'" id="mens'.$i.'" size="5" value="'.$mens.'" ech="'.$i.'"> €</td>';
+        print '<td align="center" id="capital'.$i.'">'.price($cap_rest).' €</td><input type="hidden" name="hi_capital' .$i .'" id ="hi_capital' .$i .'" value="' . $cap_rest . '">';
+        print '</tr>'."\n";
+        $i++;
+        $capital = $cap_rest;
+    }
 }
 elseif(count($echeance->lines)>0)
 {
-	$i=1;
-	$capital = $object->capital;
-	$insurance = $object->insurance_amount/$object->nbterm;
-	$insurance = price2num($insurance, 'MT');
-	$regulInsurance = price2num($object->insurance_amount - ($insurance * $object->nbterm));
-	foreach ($echeance->lines as $line){
-		$mens = $line->amount_capital+$line->amount_insurance+$line->amount_interest;
-		$int = $line->amount_interest;
-		$cap_rest = price2num($capital - ($mens-$int), 'MT');
-		print '<tr>';
-		print '<td align="center" id="n'.$i.'"><input type="hidden" name="hi_rowid' .$i .'" id ="hi_rowid' .$i .'" value="' . $line->id . '">' . $i .'</td>';
-		print '<td align="center" id ="date' .$i .'"><input type="hidden" name="hi_date' .$i .'" id ="hi_date' .$i .'" value="' . $line->datep . '">' . dol_print_date($line->datep,'day') . '</td>';
-		print '<td align="center" id="insurance'.$i.'">'.price($insurance+(($i == 1) ? $regulInsurance : 0),0,'',1).' €</td><input type="hidden" name="hi_insurance' .$i .'" id ="hi_insurance' .$i .'" value="' . ($insurance+(($i == 1) ? $regulInsurance : 0)) . '">';
-		print '<td align="center" id="interets'.$i.'">'.price($int,0,'',1).' €</td><input type="hidden" name="hi_interets' .$i .'" id ="hi_interets' .$i .'" value="' . $int . '">';
-		if($line->datep > dol_now()){
-			print '<td align="center"><input name="mens'.$i.'" id="mens'.$i.'" size="5" value="'.$mens.'" ech="'.$i.'"> €</td>';
-		}else{
-			print '<td align="center">' . price($mens) . ' €</td><input type="hidden" name="mens' .$i .'" id ="mens' .$i .'" value="' . $mens . '">';
-		}
+    $i=1;
+    $capital = $object->capital;
+    $insurance = $object->insurance_amount/$object->nbterm;
+    $insurance = price2num($insurance, 'MT');
+    $regulInsurance = price2num($object->insurance_amount - ($insurance * $object->nbterm));
+    foreach ($echeance->lines as $line){
+        $mens = $line->amount_capital+$line->amount_insurance+$line->amount_interest;
+        $int = $line->amount_interest;
+        $cap_rest = price2num($capital - ($mens-$int), 'MT');
+        print '<tr>';
+        print '<td align="center" id="n'.$i.'"><input type="hidden" name="hi_rowid' .$i .'" id ="hi_rowid' .$i .'" value="' . $line->id . '">' . $i .'</td>';
+        print '<td align="center" id ="date' .$i .'"><input type="hidden" name="hi_date' .$i .'" id ="hi_date' .$i .'" value="' . $line->datep . '">' . dol_print_date($line->datep,'day') . '</td>';
+        print '<td align="center" id="insurance'.$i.'">'.price($insurance+(($i == 1) ? $regulInsurance : 0),0,'',1).' €</td><input type="hidden" name="hi_insurance' .$i .'" id ="hi_insurance' .$i .'" value="' . ($insurance+(($i == 1) ? $regulInsurance : 0)) . '">';
+        print '<td align="center" id="interets'.$i.'">'.price($int,0,'',1).' €</td><input type="hidden" name="hi_interets' .$i .'" id ="hi_interets' .$i .'" value="' . $int . '">';
+        if($line->datep > dol_now()){
+            print '<td align="center"><input name="mens'.$i.'" id="mens'.$i.'" size="5" value="'.$mens.'" ech="'.$i.'"> €</td>';
+        }else{
+            print '<td align="center">' . price($mens) . ' €</td><input type="hidden" name="mens' .$i .'" id ="mens' .$i .'" value="' . $mens . '">';
+        }
 		
-		print '<td align="center" id="capital'.$i.'">'.price($cap_rest).' €</td><input type="hidden" name="hi_capital' .$i .'" id ="hi_capital' .$i .'" value="' . $cap_rest . '">';
+        print '<td align="center" id="capital'.$i.'">'.price($cap_rest).' €</td><input type="hidden" name="hi_capital' .$i .'" id ="hi_capital' .$i .'" value="' . $cap_rest . '">';
         print '<td align="center"><a class="butAction" href="' . BASE_URL . '?controller=loan/payment&method=payment&id=' . $object->id . '&amp;action=create">' . $langs->trans('DoPayment') . '</a></td>';
-		print '</tr>'."\n";
-		$i++;
-		$capital = $cap_rest;
-	}
+        print '</tr>'."\n";
+        $i++;
+        $capital = $cap_rest;
+    }
 }
 
 print '</table>';

dolibarr/htdocs/loan/schedule.php

Indentation +58 added lines, -58 removed lines

@@ -150,9 +150,9 @@ 
 print '<input type="hidden" name="loanid" value="' . $loanid . '">';
 if(count($echeance->lines)>0)
 {
-	print '<input type="hidden" name="action" value="updateecheancier">';
+    print '<input type="hidden" name="action" value="updateecheancier">';
 }else{
-	print '<input type="hidden" name="action" value="createecheancier">';
+    print '<input type="hidden" name="action" value="createecheancier">';
 }
 print '<table class="border" width="100%">';
 print '<tr class="liste_titre">';
@@ -178,68 +178,68 @@ 
 
 if ($object->nbterm > 0 && count($echeance->lines)==0)
 {
-	$i=1;
-	$capital = $object->capital;
-	$insurance = $object->insurance_amount/$object->nbterm;
-	$insurance = price2num($insurance, 'MT');
-	$regulInsurance = price2num($object->insurance_amount - ($insurance * $object->nbterm));
-	while($i <$object->nbterm+1)
-	{
-		$mens = price2num($echeance->calcMonthlyPayments($capital, $object->rate/100, $object->nbterm-$i+1), 'MT');
-		$int = ($capital*($object->rate/12))/100;
-		$int = price2num($int, 'MT');
-		$insu = ($insurance+(($i == 1) ? $regulInsurance : 0));
-		$cap_rest = price2num($capital - ($mens-$int), 'MT');
-		print '<tr>';
-		print '<td align="center" id="n'.$i.'">' . $i .'</td>';
-		print '<td align="center" id ="date' .$i .'"><input type="hidden" name="hi_date' .$i .'" id ="hi_date' .$i .'" value="' . dol_time_plus_duree($object->datestart, $i-1, 'm') . '">' . dol_print_date(dol_time_plus_duree($object->datestart, $i-1, 'm'),'day') . '</td>';
-		print '<td align="center" id="insurance'.$i.'">'.price($insurance+(($i == 1) ? $regulInsurance : 0),0,'',1).' €</td><input type="hidden" name="hi_insurance' .$i .'" id ="hi_insurance' .$i .'" value="' . ($insurance+(($i == 1) ? $regulInsurance : 0)) . '">';
-		print '<td align="center" id="interets'.$i.'">'.price($int,0,'',1).' €</td><input type="hidden" name="hi_interets' .$i .'" id ="hi_interets' .$i .'" value="' . $int . '">';
-		print '<td align="center"><input name="mens'.$i.'" id="mens'.$i.'" size="5" value="'.$mens.'" ech="'.$i.'"> €</td>';
-		print '<td align="center" id="capital'.$i.'">'.price($cap_rest).' €</td><input type="hidden" name="hi_capital' .$i .'" id ="hi_capital' .$i .'" value="' . $cap_rest . '">';
-		print '</tr>'."\n";
-		$i++;
-		$capital = $cap_rest;
-	}
+    $i=1;
+    $capital = $object->capital;
+    $insurance = $object->insurance_amount/$object->nbterm;
+    $insurance = price2num($insurance, 'MT');
+    $regulInsurance = price2num($object->insurance_amount - ($insurance * $object->nbterm));
+    while($i <$object->nbterm+1)
+    {
+        $mens = price2num($echeance->calcMonthlyPayments($capital, $object->rate/100, $object->nbterm-$i+1), 'MT');
+        $int = ($capital*($object->rate/12))/100;
+        $int = price2num($int, 'MT');
+        $insu = ($insurance+(($i == 1) ? $regulInsurance : 0));
+        $cap_rest = price2num($capital - ($mens-$int), 'MT');
+        print '<tr>';
+        print '<td align="center" id="n'.$i.'">' . $i .'</td>';
+        print '<td align="center" id ="date' .$i .'"><input type="hidden" name="hi_date' .$i .'" id ="hi_date' .$i .'" value="' . dol_time_plus_duree($object->datestart, $i-1, 'm') . '">' . dol_print_date(dol_time_plus_duree($object->datestart, $i-1, 'm'),'day') . '</td>';
+        print '<td align="center" id="insurance'.$i.'">'.price($insurance+(($i == 1) ? $regulInsurance : 0),0,'',1).' €</td><input type="hidden" name="hi_insurance' .$i .'" id ="hi_insurance' .$i .'" value="' . ($insurance+(($i == 1) ? $regulInsurance : 0)) . '">';
+        print '<td align="center" id="interets'.$i.'">'.price($int,0,'',1).' €</td><input type="hidden" name="hi_interets' .$i .'" id ="hi_interets' .$i .'" value="' . $int . '">';
+        print '<td align="center"><input name="mens'.$i.'" id="mens'.$i.'" size="5" value="'.$mens.'" ech="'.$i.'"> €</td>';
+        print '<td align="center" id="capital'.$i.'">'.price($cap_rest).' €</td><input type="hidden" name="hi_capital' .$i .'" id ="hi_capital' .$i .'" value="' . $cap_rest . '">';
+        print '</tr>'."\n";
+        $i++;
+        $capital = $cap_rest;
+    }
 }
 elseif(count($echeance->lines)>0)
 {
-	$i=1;
-	$capital = $object->capital;
-	$insurance = $object->insurance_amount/$object->nbterm;
-	$insurance = price2num($insurance, 'MT');
-	$regulInsurance = price2num($object->insurance_amount - ($insurance * $object->nbterm));
-	$printed = false;
-	foreach ($echeance->lines as $line){
-		$mens = $line->amount_capital+$line->amount_interest;
-		$int = $line->amount_interest;
-		$insu = ($insurance+(($i == 1) ? $regulInsurance : 0));
-		$cap_rest = price2num($capital - ($mens-$int), 'MT');
+    $i=1;
+    $capital = $object->capital;
+    $insurance = $object->insurance_amount/$object->nbterm;
+    $insurance = price2num($insurance, 'MT');
+    $regulInsurance = price2num($object->insurance_amount - ($insurance * $object->nbterm));
+    $printed = false;
+    foreach ($echeance->lines as $line){
+        $mens = $line->amount_capital+$line->amount_interest;
+        $int = $line->amount_interest;
+        $insu = ($insurance+(($i == 1) ? $regulInsurance : 0));
+        $cap_rest = price2num($capital - ($mens-$int), 'MT');
 		
-		print '<tr>';
-		print '<td align="center" id="n'.$i.'"><input type="hidden" name="hi_rowid' .$i .'" id ="hi_rowid' .$i .'" value="' . $line->id . '">' . $i .'</td>';
-		print '<td align="center" id ="date' .$i .'"><input type="hidden" name="hi_date' .$i .'" id ="hi_date' .$i .'" value="' . $line->datep . '">' . dol_print_date($line->datep,'day') . '</td>';
-		print '<td align="center" id="insurance'.$i.'">'.price($insu,0,'',1).' €</td><input type="hidden" name="hi_insurance' .$i .'" id ="hi_insurance' .$i .'" value="' . $insu . '">';
-		print '<td align="center" id="interets'.$i.'">'.price($int,0,'',1).' €</td><input type="hidden" name="hi_interets' .$i .'" id ="hi_interets' .$i .'" value="' . $int . '">';
-		if($line->datep > dol_now() && empty($line->fk_bank)){
-			print '<td align="center"><input name="mens'.$i.'" id="mens'.$i.'" size="5" value="'.$mens.'" ech="'.$i.'"> €</td>';
-		}else{
-			print '<td align="center">' . price($mens) . ' €</td><input type="hidden" name="mens' .$i .'" id ="mens' .$i .'" value="' . $mens . '">';
-		}
+        print '<tr>';
+        print '<td align="center" id="n'.$i.'"><input type="hidden" name="hi_rowid' .$i .'" id ="hi_rowid' .$i .'" value="' . $line->id . '">' . $i .'</td>';
+        print '<td align="center" id ="date' .$i .'"><input type="hidden" name="hi_date' .$i .'" id ="hi_date' .$i .'" value="' . $line->datep . '">' . dol_print_date($line->datep,'day') . '</td>';
+        print '<td align="center" id="insurance'.$i.'">'.price($insu,0,'',1).' €</td><input type="hidden" name="hi_insurance' .$i .'" id ="hi_insurance' .$i .'" value="' . $insu . '">';
+        print '<td align="center" id="interets'.$i.'">'.price($int,0,'',1).' €</td><input type="hidden" name="hi_interets' .$i .'" id ="hi_interets' .$i .'" value="' . $int . '">';
+        if($line->datep > dol_now() && empty($line->fk_bank)){
+            print '<td align="center"><input name="mens'.$i.'" id="mens'.$i.'" size="5" value="'.$mens.'" ech="'.$i.'"> €</td>';
+        }else{
+            print '<td align="center">' . price($mens) . ' €</td><input type="hidden" name="mens' .$i .'" id ="mens' .$i .'" value="' . $mens . '">';
+        }
 		
-		print '<td align="center" id="capital'.$i.'">'.price($cap_rest).' €</td><input type="hidden" name="hi_capital' .$i .'" id ="hi_capital' .$i .'" value="' . $cap_rest . '">';
-		print '<td align="center">';
-		if (!empty($line->fk_bank)) print $langs->trans('Paid');
-		elseif (!$printed)
-		{
+        print '<td align="center" id="capital'.$i.'">'.price($cap_rest).' €</td><input type="hidden" name="hi_capital' .$i .'" id ="hi_capital' .$i .'" value="' . $cap_rest . '">';
+        print '<td align="center">';
+        if (!empty($line->fk_bank)) print $langs->trans('Paid');
+        elseif (!$printed)
+        {
             print '<a class="butAction" href="' . BASE_URI . '?controller=loan/payment&method=payment.php&id=' . $object->id . '&amp;action=create&line_id=' . $line->id . '">' . $langs->trans('DoPayment') . '</a>';
-		    $printed = true;
-		}
-		print '</td>';
-		print '</tr>'."\n";
-		$i++;
-		$capital = $cap_rest;
-	}
+            $printed = true;
+        }
+        print '</td>';
+        print '</tr>'."\n";
+        $i++;
+        $capital = $cap_rest;
+    }
 }
 
 print '</table>';