From 1622a86d7185afbc8e117b40abe7d1a7e5df40f2 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Fri, 16 Mar 2012 11:12:59 +0100 Subject: [PATCH] New: possibility to view/edit notes in invoice card --- htdocs/compta/facture.php | 6 +++++- htdocs/compta/facture/class/facture.class.php | 8 +++++--- htdocs/core/lib/invoice.lib.php | 16 ++++++++++------ 3 files changed, 20 insertions(+), 10 deletions(-) diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index d8088441861..15c1404c347 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -2737,7 +2737,11 @@ else } print '
'; - + + if (! empty($conf->global->MAIN_DISABLE_NOTES_TAB)) + { + include(DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php'); + } /* * Lines diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index f0af7b909b9..d6765742f7e 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -72,7 +72,8 @@ class Facture extends CommonObject var $total_ht=0; var $total_tva=0; var $total_ttc=0; - var $note; + var $note; // deprecated + var $note_private; var $note_public; //! 0=draft, //! 1=validated (need to be paid), @@ -763,7 +764,7 @@ class Facture extends CommonObject $sql.= ', f.datec as datec'; $sql.= ', f.date_valid as datev'; $sql.= ', f.tms as datem'; - $sql.= ', f.note, f.note_public, f.fk_statut, f.paye, f.close_code, f.close_note, f.fk_user_author, f.fk_user_valid, f.model_pdf'; + $sql.= ', f.note as note_private, f.note_public, f.fk_statut, f.paye, f.close_code, f.close_note, f.fk_user_author, f.fk_user_valid, f.model_pdf'; $sql.= ', f.fk_facture_source'; $sql.= ', f.fk_mode_reglement, f.fk_cond_reglement, f.fk_projet'; $sql.= ', p.code as mode_reglement_code, p.libelle as mode_reglement_libelle'; @@ -818,7 +819,8 @@ class Facture extends CommonObject $this->cond_reglement_doc = $obj->cond_reglement_libelle_doc; $this->fk_project = $obj->fk_projet; $this->fk_facture_source = $obj->fk_facture_source; - $this->note = $obj->note; + $this->note = $obj->note_private; + $this->note_private = $obj->note_private; // deprecated $this->note_public = $obj->note_public; $this->user_author = $obj->fk_user_author; $this->user_valid = $obj->fk_user_valid; diff --git a/htdocs/core/lib/invoice.lib.php b/htdocs/core/lib/invoice.lib.php index 82987aa7547..b8651d753cc 100644 --- a/htdocs/core/lib/invoice.lib.php +++ b/htdocs/core/lib/invoice.lib.php @@ -1,5 +1,6 @@ +/* Copyright (C) 2005-2012 Laurent Destailleur + * Copyright (C) 2005-2012 Regis Houssin * * 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 @@ -66,11 +67,14 @@ function facture_prepare_head($object) // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab // $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to remove a tab complete_head_from_modules($conf,$langs,$object,$head,$h,'invoice'); - - $head[$h][0] = DOL_URL_ROOT.'/compta/facture/note.php?facid='.$object->id; - $head[$h][1] = $langs->trans('Notes'); - $head[$h][2] = 'note'; - $h++; + + if (empty($conf->global->MAIN_DISABLE_NOTES_TAB)) + { + $head[$h][0] = DOL_URL_ROOT.'/compta/facture/note.php?facid='.$object->id; + $head[$h][1] = $langs->trans('Notes'); + $head[$h][2] = 'note'; + $h++; + } $head[$h][0] = DOL_URL_ROOT.'/compta/facture/document.php?facid='.$object->id; /*$filesdir = $conf->facture->dir_output . "/" . dol_sanitizeFileName($fac->ref);