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

Merge pull request #1863 from FHenry/3.6

Browse Source 
Fix: list event view lost type event filter
This commit is contained in:
Laurent Destailleur 2014-09-02 19:34:17 +02:00
commit 257d7c41d6
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -11,6 +11,8 @@ For users:
- Fix: Salary payments are not reflected on the reporting sheets - Fix: Salary payments are not reflected on the reporting sheets
- Fix: Unsubscribe emailing not working - Fix: Unsubscribe emailing not working
- Fix: Trigger on create category call failed because user is not passed on card - Fix: Trigger on create category call failed because user is not passed on card
- Fix: list event view lost type event filter
- Fix: Save also code event
***** ChangeLog for 3.6 compared to 3.5.* ***** ***** ChangeLog for 3.6 compared to 3.5.* *****
For users: For users:

1
htdocs/comm/action/class/actioncomm.class.php
View File

@ -140,6 +140,7 @@ class ActionComm extends CommonObject
if ($result > 0) if ($result > 0)
{ {
$this->type_id=$cactioncomm->id; $this->type_id=$cactioncomm->id;
$this->code=$cactioncomm->code;
} }
else if ($result == 0) else if ($result == 0)
{ {

2
htdocs/comm/action/listactions.php
View File

@ -195,7 +195,7 @@ if ($resql)
$head = calendars_prepare_head(''); $head = calendars_prepare_head('');
dol_fiche_head($head, 'card', $langs->trans('Events'), 0, 'list'); dol_fiche_head($head, 'card', $langs->trans('Events'), 0, 'list');
print_actions_filter($form,$canedit,$status,$year,$month,$day,$showbirthday,$filtera,$filtert,$filterd,$pid,$socid,-1); print_actions_filter($form,$canedit,$status,$year,$month,$day,$showbirthday,$filtera,$filtert,$filterd,$pid,$socid,-1,$actioncode);
dol_fiche_end(); dol_fiche_end();
// Add link to show birthdays // Add link to show birthdays