Add tab for notes

htdocs/core/lib/loan.lib.php

@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2014		Alexandre Spangaro	<alexandre.spangaro@gmail.com>
+ * Copyright (C) 2015       Frederic France      <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -32,35 +33,45 @@ function loan_prepare_head($object)
 {
     global $langs, $conf;
 
-    $h = 0;
+    $tab = 0;
     $head = array();
 
-	$head[$h][0] = DOL_URL_ROOT.'/loan/card.php?id='.$object->id;
+	$head[$tab][0] = DOL_URL_ROOT.'/loan/card.php?id='.$object->id;
-	$head[$h][1] = $langs->trans('Card');
+	$head[$tab][1] = $langs->trans('Card');
-	$head[$h][2] = 'card';
+	$head[$tab][2] = 'card';
-	$h++;
+	$tab++;
+
+    if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
+    {
+        $nbNote = (empty($object->note_private)?0:1)+(empty($object->note_public)?0:1);
+        $head[$tab][0] = DOL_URL_ROOT."/loan/note.php?id=".$object->id;
+        $head[$tab][1] = $langs->trans("Notes");
+        if($nbNote > 0) $head[$tab][1].= ' <span class="badge">'.$nbNote.'</span>';
+        $head[$tab][2] = 'note';
+        $tab++;
+    }
 
     // Show more tabs from modules
     // Entries must be declared in modules descriptor with line
     // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
     // $this->tabs = array('entity:-tabname);   												to remove a tab
-    complete_head_from_modules($conf,$langs,$object,$head,$h,'loan');
+    complete_head_from_modules($conf, $langs, $object, $head, $tab,'loan');
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 	$upload_dir = $conf->loan->dir_output . "/" . dol_sanitizeFileName($object->ref);
 	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview\.png)$'));
-	$head[$h][0] = DOL_URL_ROOT.'/loan/document.php?id='.$object->id;
+	$head[$tab][0] = DOL_URL_ROOT.'/loan/document.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("Documents");
+	$head[$tab][1] = $langs->trans("Documents");
-	if($nbFiles > 0) $head[$h][1].= ' ('.$nbFiles.')';
+	if($nbFiles > 0) $head[$tab][1].= ' ('.$nbFiles.')';
-	$head[$h][2] = 'documents';
+	$head[$tab][2] = 'documents';
-	$h++;
+	$tab++;
 
-    $head[$h][0] = DOL_URL_ROOT.'/loan/info.php?id='.$object->id;
+    $head[$tab][0] = DOL_URL_ROOT.'/loan/info.php?id='.$object->id;
-    $head[$h][1] = $langs->trans("Info");
+    $head[$tab][1] = $langs->trans("Info");
-    $head[$h][2] = 'info';
+    $head[$tab][2] = 'info';
-    $h++;
+    $tab++;
 
-    complete_head_from_modules($conf,$langs,$object,$head,$h,'loan','remove');
+    complete_head_from_modules($conf,$langs,$object,$head,$tab,'loan','remove');
 
     return $head;
 }

htdocs/langs/en_US/loan.lang

@@ -15,6 +15,7 @@ LoanPayment=Loan payment
 ConfirmDeleteLoan=Confirm deleting this loan
 LoanDeleted=Loan Deleted Successfully
 ConfirmPayLoan=Confirm classify paid this loan
+LoanPaid=Loan Paid
 ErrorLoanCapital=Loan amount has to be numeric and greater than zero.
 ErrorLoanLength=Loan length has to be numeric and greater than zero.
 ErrorLoanInterest=Annual interest has to be numeric and greater than zero.

htdocs/loan/card.php

@@ -52,6 +52,14 @@ if ($action == 'confirm_paid' && $confirm == 'yes')
 {
 	$object->fetch($id);
 	$result = $object->set_paid($user);
+    if ($result > 0)
+    {
+        setEventMessage($langs->trans('LoanPaid'));
+    }
+    else
+    {
+        setEventMessage($loan->error, 'errors');
+    }
 }
 
 // Delete loan

htdocs/loan/note.php

@@ -0,0 +1,99 @@
+<?php
+/* Copyright (C) 2004       Rodolphe Quiedeville    <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2007  Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2012  Regis Houssin           <regis.houssin@capnetworks.com>
+ * Copyright (C) 2013       Florian Henry           <florian.henry@open-concept.pro>
+ * Copyright (C) 2015       Frederic France         <frederic.france@free.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *   \file       htdocs/loan/note.php
+ *   \brief      Tab for notes on loan
+ *   \ingroup    loan
+ */
+
+require '../main.inc.php';
+require_once(DOL_DOCUMENT_ROOT.'/loan/class/loan.class.php');
+require_once DOL_DOCUMENT_ROOT.'/core/lib/loan.lib.php';
+
+$action = GETPOST('action');
+
+$langs->load('loan');
+
+// Security check
+$id = GETPOST('id','int');
+$result = restrictedArea($user, 'loan', $id, '&loan');
+
+$object = new Loan($db);
+if ($id > 0) $object->fetch($id);
+
+$permissionnote=$user->rights->loan->read;  // Used by the include of actions_setnotes.inc.php
+
+
+/*
+ *  Actions
+ */
+
+include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
+
+
+/*
+ *  View
+ */
+
+$form = new Form($db);
+
+llxHeader('',$langs->trans("LoanArea").' - '.$langs->trans("Notes"),'');
+
+if ($id > 0)
+{
+    /*
+     * Affichage onglets
+     */
+
+    $head = loan_prepare_head($object);
+
+    dol_fiche_head($head, 'note', $langs->trans("Loan"),0,'loan');
+
+
+    print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+
+    print '<table class="border" width="100%">';
+
+    // Ref
+    print '<tr><td width="25%">'.$langs->trans('Ref').'</td>';
+    print '<td colspan="3">';
+    print $form->showrefnav($object,'id','','','rowid','ref');
+    print '</td></tr>';
+    // Name
+    print '<tr><td width="20%">'.$langs->trans("Name").'</td>';
+    print '<td colspan="3">'.$object->label.'</td></tr>';
+
+    print "</table>";
+
+    print '<br>';
+
+    $colwidth='25';
+    include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
+
+
+    dol_fiche_end();
+}
+
+llxFooter();
+$db->close();
+

htdocs/loan/payment/payment.php

@@ -170,11 +170,6 @@ if ($_GET["action"] == 'create')
 	print_fiche_titre($langs->trans("DoPayment"));
 	print "<br>\n";
 
-	if ($mesg)
-	{
-		print "<div class=\"error\">$mesg</div>";
-	}
-
 	print '<form name="add_payment" action="'.$_SERVER['PHP_SELF'].'" method="post">';
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print '<input type="hidden" name="id" value="'.$chid.'">';