Subversion Repositories SmartDukaan

Rev

Rev 35310 | Rev 36885 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 35310 Rev 36543
Line 833... Line 833...
833
                                            #end
833
                                            #end
834
                                        #end
834
                                        #end
835
                                    </tr>
835
                                    </tr>
836
                                    #end
836
                                    #end
837
 
837
 
-
 
838
                                <tr>
-
 
839
                                    <td class="details">Others</td>
-
 
840
                                    #foreach($label in $labels)
-
 
841
                                        #if($yearMonthPurchaseOthers.get($label))
-
 
842
                                            <td class="currency">$yearMonthPurchaseOthers.get($label)</td>
-
 
843
                                        #else
-
 
844
                                            <td>0</td>
-
 
845
                                        #end
-
 
846
                                    #end
-
 
847
                                </tr>
-
 
848
 
838
                                <tr class="font-weight-bold">
849
                                <tr class="font-weight-bold">
839
                                    <td class="details">Total</td>
850
                                    <td class="details">Total</td>
840
                                    #foreach($label in $labels)
851
                                    #foreach($label in $labels)
841
                                        #if($yearMonthPurchase.get($label))
852
                                        #if($yearMonthPurchase.get($label))
842
                                            <td class="currency">$yearMonthPurchase.get($label)</td>
853
                                            <td class="currency">$yearMonthPurchase.get($label)</td>
Line 1014... Line 1025...
1014
 
1025
 
1015
                                    </tr>
1026
                                    </tr>
1016
 
1027
 
1017
                                    #end
1028
                                    #end
1018
 
1029
 
-
 
1030
                                <tr>
-
 
1031
                                    <td class="details">Others</td>
-
 
1032
                                    #foreach($label in $labels)
-
 
1033
                                        #if($yearMonthTertiaryOthers.get($label))
-
 
1034
                                            <td class="currency">$yearMonthTertiaryOthers.get($label)</td>
-
 
1035
                                        #else
-
 
1036
                                            <td>0</td>
-
 
1037
                                        #end
-
 
1038
                                    #end
-
 
1039
                                </tr>
-
 
1040
 
1019
                                <tr class="font-weight-bold">
1041
                                <tr class="font-weight-bold">
1020
                                    <td class="details">Total</td>
1042
                                    <td class="details">Total</td>
1021
                                    #foreach($label in $labels)
1043
                                    #foreach($label in $labels)
1022
                                        #if($yearMonthTertiary.get($label))
1044
                                        #if($yearMonthTertiary.get($label))
1023
 
1045
 
Line 1130... Line 1152...
1130
                                    </tr>
1152
                                    </tr>
1131
 
1153
 
1132
 
1154
 
1133
                                    #end
1155
                                    #end
1134
 
1156
 
-
 
1157
                                <tr>
-
 
1158
                                    <td class="details">Others</td>
-
 
1159
                                    #foreach($label in $labels)
-
 
1160
                                        #if($earningOthersPerMonth.get($label))
-
 
1161
                                            <td class="currency">$decimalFormatter.format($earningOthersPerMonth.get($label))</td>
-
 
1162
                                        #else
-
 
1163
                                            <td>0</td>
-
 
1164
                                        #end
-
 
1165
                                    #end
-
 
1166
                                </tr>
-
 
1167
 
1135
                                <tr class="font-weight-bold">
1168
                                <tr class="font-weight-bold">
1136
                                    <td class="details">Total</td>
1169
                                    <td class="details">Total</td>
1137
                                    #foreach($label in $labels)
1170
                                    #foreach($label in $labels)
1138
                                        #if($totalEarningPerMonth.get($label))
1171
                                        #if($totalEarningPerMonth.get($label))
1139
 
1172