lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Can input note (public and private) during trip and expense creation

Browse Source
This commit is contained in:
Laurent Destailleur 2011-10-17 14:15:27 +02:00
parent 918e8d665e
commit c747376945
5 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -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.

27
htdocs/compta/deplacement/fiche.php
View File

@ -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 '</td></tr>';
// Public note
print '<tr>';
print '<td class="border" valign="top">'.$langs->trans('NotePublic').'</td>';
print '<td valign="top" colspan="2">';
print '<textarea name="note_public" wrap="soft" cols="70" rows="'.ROWS_3.'">';
if (is_object($objectsrc)) // Take value from source object
{
print $objectsrc->note_public;
}
print '</textarea></td></tr>';
// Private note
if (! $user->societe_id)
{
print '<tr>';
print '<td class="border" valign="top">'.$langs->trans('NotePrivate').'</td>';
print '<td valign="top" colspan="2">';
print '<textarea name="note" wrap="soft" cols="70" rows="'.ROWS_3.'">';
if (is_object($objectsrc)) // Take value from source object
{
print $objectsrc->note;
}
print '</textarea></td></tr>';
}
print '</table>';
print '<br><center><input class="button" type="submit" value="'.$langs->trans("Save").'"> &nbsp; &nbsp; ';

2
htdocs/langs/en_US/trips.lang
View File

@ -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

1
htdocs/langs/nl_NL/trips.lang
View File

@ -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).

1
htdocs/langs/tr_TR/trips.lang
View File

@ -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).