diff --git a/ChangeLog b/ChangeLog index ad511567db3..f8308852249 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ English Dolibarr ChangeLog ***** ChangeLog for 3.2 compared to 3.1 ***** For users: +- New: Can input note (private and public) during note and expenses creation. - New: Print ticket show invoice ref into POS module. - New: Can edit customer discounts from invoice create and edit card. - New: task #11243: Show quantity into stocks for each sub-products into the sub-product tab. diff --git a/htdocs/compta/deplacement/fiche.php b/htdocs/compta/deplacement/fiche.php index 9b094101aa4..ce36b404709 100644 --- a/htdocs/compta/deplacement/fiche.php +++ b/htdocs/compta/deplacement/fiche.php @@ -78,6 +78,8 @@ if ($_POST["action"] == 'add' && $user->rights->deplacement->creer) $deplacement->type = $_POST["type"]; $deplacement->socid = $_POST["socid"]; $deplacement->fk_user = $_POST["fk_user"]; + $deplacement->note = $_POST["note"]; + $deplacement->note_public = $_POST["note_public"]; if (! $deplacement->date) { @@ -219,6 +221,31 @@ if ($_GET["action"] == 'create') print $html->select_societes($_POST["socid"]?$_POST["socid"]:$_GET["socid"],'socid','',1); print ''; + // Public note + print ''; + print ''.$langs->trans('NotePublic').''; + print ''; + print ''; + + // Private note + if (! $user->societe_id) + { + print ''; + print ''.$langs->trans('NotePrivate').''; + print ''; + print ''; + } + print ''; print '
    '; diff --git a/htdocs/langs/en_US/trips.lang b/htdocs/langs/en_US/trips.lang index af3dad34470..4b097c8e713 100644 --- a/htdocs/langs/en_US/trips.lang +++ b/htdocs/langs/en_US/trips.lang @@ -18,5 +18,5 @@ TF_OTHER=Other TF_LUNCH=Lunch TF_TRIP=Trip ListTripsAndExpenses=List of trips and expenses -ExpensesArea=Trips and exepenses area +ExpensesArea=Trips and expenses area SearchATripAndExpense=Search a trip and expense \ No newline at end of file diff --git a/htdocs/langs/nl_NL/trips.lang b/htdocs/langs/nl_NL/trips.lang index d70835ede8d..7a836bf4fbc 100644 --- a/htdocs/langs/nl_NL/trips.lang +++ b/htdocs/langs/nl_NL/trips.lang @@ -23,6 +23,5 @@ ListTripsAndExpenses = Lijst van de reis- en onkosten // START - Lines generated via autotranslator.php tool (2011-10-10 01:37:25). // Reference language: en_US -> nl_NL -ExpensesArea=Uitstapjes en exepenses gebied SearchATripAndExpense=Zoek een reis en kosten // STOP - Lines generated via autotranslator.php tool (2011-10-10 01:41:40). diff --git a/htdocs/langs/tr_TR/trips.lang b/htdocs/langs/tr_TR/trips.lang index 1506084222c..d3146b18e6a 100755 --- a/htdocs/langs/tr_TR/trips.lang +++ b/htdocs/langs/tr_TR/trips.lang @@ -31,6 +31,5 @@ ListTripsAndExpenses=Geziler ve harcamalar listesi // START - Lines generated via autotranslator.php tool (2011-10-09 13:54:25). // Reference language: en_US -> tr_TR TripsAndExpensesStatistics=Gezi ve giderleri istatistikleri -ExpensesArea=Gezileri ve exepenses alanı SearchATripAndExpense=Bir gezi ve gider ara // STOP - Lines generated via autotranslator.php tool (2011-10-09 13:54:39).