@@ -168,7 +168,7 @@ |
||
168 | 168 | |
169 | 169 | if ($result > 0) { |
170 | 170 | dol_htmloutput_mesg("Notes de frais créées"); |
171 | - }else{ |
|
171 | + } else{ |
|
172 | 172 | dol_htmloutput_errors("Note de frais non créée"); |
173 | 173 | } |
174 | 174 | } else { |
@@ -189,10 +189,12 @@ discard block |
||
189 | 189 | include DOL_DOCUMENT_ROOT . '/core/actions_changeselectedfields.inc.php'; |
190 | 190 | |
191 | 191 | // Purge search criteria |
192 | - if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // All tests are required to be compatible with all browsers |
|
192 | + if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) { |
|
193 | + // All tests are required to be compatible with all browsers |
|
193 | 194 | { |
194 | 195 | |
195 | 196 | $search_idBBC_vols = ''; |
197 | + } |
|
196 | 198 | $search_date = ''; |
197 | 199 | $search_lieuD = ''; |
198 | 200 | $search_lieuA = ''; |
@@ -756,7 +758,9 @@ discard block |
||
756 | 758 | { |
757 | 759 | print '<td>'.$flight->getNomUrl(0).'</td>'; |
758 | 760 | |
759 | - if (! $i) $totalarray['nbfield']++; |
|
761 | + if (! $i) { |
|
762 | + $totalarray['nbfield']++; |
|
763 | + } |
|
760 | 764 | } |
761 | 765 | if (! empty($arrayfields['t.date']['checked'])) |
762 | 766 | { |
@@ -764,104 +768,138 @@ discard block |
||
764 | 768 | print dol_print_date($db->jdate($obj->date), '%d-%m-%y'); |
765 | 769 | print '</td>'; |
766 | 770 | |
767 | - if (! $i) $totalarray['nbfield']++; |
|
771 | + if (! $i) { |
|
772 | + $totalarray['nbfield']++; |
|
773 | + } |
|
768 | 774 | } |
769 | 775 | if (! empty($arrayfields['t.lieuD']['checked'])) |
770 | 776 | { |
771 | 777 | print '<td>'.$obj->lieuD.'</td>'; |
772 | 778 | |
773 | - if (! $i) $totalarray['nbfield']++; |
|
779 | + if (! $i) { |
|
780 | + $totalarray['nbfield']++; |
|
781 | + } |
|
774 | 782 | } |
775 | 783 | if (! empty($arrayfields['t.lieuA']['checked'])) |
776 | 784 | { |
777 | 785 | print '<td>'.$obj->lieuA.'</td>'; |
778 | 786 | |
779 | - if (! $i) $totalarray['nbfield']++; |
|
787 | + if (! $i) { |
|
788 | + $totalarray['nbfield']++; |
|
789 | + } |
|
780 | 790 | } |
781 | 791 | if (! empty($arrayfields['t.heureD']['checked'])) |
782 | 792 | { |
783 | 793 | print '<td>'.$obj->heureD.'</td>'; |
784 | 794 | |
785 | - if (! $i) $totalarray['nbfield']++; |
|
795 | + if (! $i) { |
|
796 | + $totalarray['nbfield']++; |
|
797 | + } |
|
786 | 798 | } |
787 | 799 | if (! empty($arrayfields['t.heureA']['checked'])) |
788 | 800 | { |
789 | 801 | print '<td>'.$obj->heureA.'</td>'; |
790 | 802 | |
791 | - if (! $i) $totalarray['nbfield']++; |
|
803 | + if (! $i) { |
|
804 | + $totalarray['nbfield']++; |
|
805 | + } |
|
792 | 806 | } |
793 | 807 | if (! empty($arrayfields['t.BBC_ballons_idBBC_ballons']['checked'])) |
794 | 808 | { |
795 | 809 | print '<td>'.$obj->bal.'</td>'; |
796 | 810 | |
797 | - if (! $i) $totalarray['nbfield']++; |
|
811 | + if (! $i) { |
|
812 | + $totalarray['nbfield']++; |
|
813 | + } |
|
798 | 814 | } |
799 | 815 | if (! empty($arrayfields['t.nbrPax']['checked'])) |
800 | 816 | { |
801 | 817 | print '<td>'.$obj->nbrPax.'</td>'; |
802 | 818 | |
803 | - if (! $i) $totalarray['nbfield']++; |
|
819 | + if (! $i) { |
|
820 | + $totalarray['nbfield']++; |
|
821 | + } |
|
804 | 822 | } |
805 | 823 | if (! empty($arrayfields['t.remarque']['checked'])) |
806 | 824 | { |
807 | 825 | print '<td>'.$obj->remarque.'</td>'; |
808 | 826 | |
809 | - if (! $i) $totalarray['nbfield']++; |
|
827 | + if (! $i) { |
|
828 | + $totalarray['nbfield']++; |
|
829 | + } |
|
810 | 830 | } |
811 | 831 | if (! empty($arrayfields['t.incidents']['checked'])) |
812 | 832 | { |
813 | 833 | print '<td>'.$obj->incidents.'</td>'; |
814 | 834 | |
815 | - if (! $i) $totalarray['nbfield']++; |
|
835 | + if (! $i) { |
|
836 | + $totalarray['nbfield']++; |
|
837 | + } |
|
816 | 838 | } |
817 | 839 | if (! empty($arrayfields['t.fk_type']['checked'])) |
818 | 840 | { |
819 | 841 | print '<td>'.$obj->flight_type.'</td>'; |
820 | 842 | |
821 | - if (! $i) $totalarray['nbfield']++; |
|
843 | + if (! $i) { |
|
844 | + $totalarray['nbfield']++; |
|
845 | + } |
|
822 | 846 | } |
823 | 847 | if (! empty($arrayfields['t.fk_pilot']['checked'])) |
824 | 848 | { |
825 | 849 | print '<td>'.$obj->pilot.'</td>'; |
826 | 850 | |
827 | - if (! $i) $totalarray['nbfield']++; |
|
851 | + if (! $i) { |
|
852 | + $totalarray['nbfield']++; |
|
853 | + } |
|
828 | 854 | } |
829 | 855 | if (! empty($arrayfields['t.fk_organisateur']['checked'])) |
830 | 856 | { |
831 | 857 | print '<td>'.$obj->organisator.'</td>'; |
832 | 858 | |
833 | - if (! $i) $totalarray['nbfield']++; |
|
859 | + if (! $i) { |
|
860 | + $totalarray['nbfield']++; |
|
861 | + } |
|
834 | 862 | } |
835 | 863 | if (! empty($arrayfields['t.is_facture']['checked'])) |
836 | 864 | { |
837 | 865 | $flight->is_facture = $obj->is_facture; |
838 | 866 | print '<td>'.$flight->getLibStatut(3).'</td>'; |
839 | 867 | |
840 | - if (! $i) $totalarray['nbfield']++; |
|
868 | + if (! $i) { |
|
869 | + $totalarray['nbfield']++; |
|
870 | + } |
|
841 | 871 | } |
842 | 872 | if (! empty($arrayfields['t.kilometers']['checked'])) |
843 | 873 | { |
844 | 874 | print '<td>'.$obj->kilometers.'</td>'; |
845 | 875 | |
846 | - if (! $i) $totalarray['nbfield']++; |
|
876 | + if (! $i) { |
|
877 | + $totalarray['nbfield']++; |
|
878 | + } |
|
847 | 879 | } |
848 | 880 | if (! empty($arrayfields['t.cost']['checked'])) |
849 | 881 | { |
850 | 882 | print '<td>'.$obj->cost.'</td>'; |
851 | 883 | |
852 | - if (! $i) $totalarray['nbfield']++; |
|
884 | + if (! $i) { |
|
885 | + $totalarray['nbfield']++; |
|
886 | + } |
|
853 | 887 | } |
854 | 888 | if (! empty($arrayfields['t.fk_receiver']['checked'])) |
855 | 889 | { |
856 | 890 | print '<td>'.$obj->receiver.'</td>'; |
857 | 891 | |
858 | - if (! $i) $totalarray['nbfield']++; |
|
892 | + if (! $i) { |
|
893 | + $totalarray['nbfield']++; |
|
894 | + } |
|
859 | 895 | } |
860 | 896 | if (! empty($arrayfields['t.justif_kilometers']['checked'])) |
861 | 897 | { |
862 | 898 | print '<td>'.$obj->justif_kilometers.'</td>'; |
863 | 899 | |
864 | - if (! $i) $totalarray['nbfield']++; |
|
900 | + if (! $i) { |
|
901 | + $totalarray['nbfield']++; |
|
902 | + } |
|
865 | 903 | } |
866 | 904 | |
867 | 905 | // Extra fields |
@@ -916,9 +954,11 @@ discard block |
||
916 | 954 | |
917 | 955 | // Action column |
918 | 956 | print '<td class="nowrap" align="center">'; |
919 | - if ($massactionbutton || $massaction) // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined |
|
957 | + if ($massactionbutton || $massaction) { |
|
958 | + // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined |
|
920 | 959 | { |
921 | 960 | $selected = 0; |
961 | + } |
|
922 | 962 | if (in_array($obj->idBBC_vols, $arrayofselected)) { |
923 | 963 | $selected = 1; |
924 | 964 | } |
@@ -501,7 +501,9 @@ discard block |
||
501 | 501 | if ($withpicto) |
502 | 502 | { |
503 | 503 | $result.=($link.img_object(($notooltip?'':$label), 'label', ($notooltip?'':'class="classfortooltip"')).$linkend); |
504 | - if ($withpicto != 2) $result.=' '; |
|
504 | + if ($withpicto != 2) { |
|
505 | + $result.=' '; |
|
506 | + } |
|
505 | 507 | } |
506 | 508 | $result.= $link . $this->ref . $linkend; |
507 | 509 | return $result; |
@@ -532,33 +534,57 @@ discard block |
||
532 | 534 | if ($mode == 0) |
533 | 535 | { |
534 | 536 | $prefix=''; |
535 | - if ($status == 1) return $langs->trans('Enabled'); |
|
536 | - if ($status == 0) return $langs->trans('Disabled'); |
|
537 | + if ($status == 1) { |
|
538 | + return $langs->trans('Enabled'); |
|
539 | + } |
|
540 | + if ($status == 0) { |
|
541 | + return $langs->trans('Disabled'); |
|
542 | + } |
|
537 | 543 | } |
538 | 544 | if ($mode == 1) |
539 | 545 | { |
540 | - if ($status == 1) return $langs->trans('Enabled'); |
|
541 | - if ($status == 0) return $langs->trans('Disabled'); |
|
546 | + if ($status == 1) { |
|
547 | + return $langs->trans('Enabled'); |
|
548 | + } |
|
549 | + if ($status == 0) { |
|
550 | + return $langs->trans('Disabled'); |
|
551 | + } |
|
542 | 552 | } |
543 | 553 | if ($mode == 2) |
544 | 554 | { |
545 | - if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled'); |
|
546 | - if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled'); |
|
555 | + if ($status == 1) { |
|
556 | + return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled'); |
|
557 | + } |
|
558 | + if ($status == 0) { |
|
559 | + return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled'); |
|
560 | + } |
|
547 | 561 | } |
548 | 562 | if ($mode == 3) |
549 | 563 | { |
550 | - if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4'); |
|
551 | - if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5'); |
|
564 | + if ($status == 1) { |
|
565 | + return img_picto($langs->trans('Enabled'),'statut4'); |
|
566 | + } |
|
567 | + if ($status == 0) { |
|
568 | + return img_picto($langs->trans('Disabled'),'statut5'); |
|
569 | + } |
|
552 | 570 | } |
553 | 571 | if ($mode == 4) |
554 | 572 | { |
555 | - if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled'); |
|
556 | - if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled'); |
|
573 | + if ($status == 1) { |
|
574 | + return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled'); |
|
575 | + } |
|
576 | + if ($status == 0) { |
|
577 | + return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled'); |
|
578 | + } |
|
557 | 579 | } |
558 | 580 | if ($mode == 5) |
559 | 581 | { |
560 | - if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4'); |
|
561 | - if ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5'); |
|
582 | + if ($status == 1) { |
|
583 | + return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4'); |
|
584 | + } |
|
585 | + if ($status == 0) { |
|
586 | + return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5'); |
|
587 | + } |
|
562 | 588 | } |
563 | 589 | |
564 | 590 | return ""; |