| @@ -656,8 +656,8 @@ | |||||
| round((bill.otherReceivePay+bill.otherLatePay+bill.otherServiceChargePay-bill.otherPay)/100,2) | round((bill.otherReceivePay+bill.otherLatePay+bill.otherServiceChargePay-bill.otherPay)/100,2) | ||||
| otherReceivePay, | otherReceivePay, | ||||
| round((bill.rentReceivePay+bill.rentLatePay+bill.rentServiceChargePay+bill.propertyReceivePay+bill.depositReceivePay+bill.otherReceivePay | round((bill.rentReceivePay+bill.rentLatePay+bill.rentServiceChargePay+bill.propertyReceivePay+bill.depositReceivePay+bill.otherReceivePay | ||||
| +bill.rentLatePay+bill.propertyLatePay+bill.depositLatePay+bill.otherLatePay+bill.rentSeviceChargePay+bill.propertySeviceChargePay | |||||
| +bill.depositSeviceChargePay+bill.otherSeviceChargePay | |||||
| +bill.rentLatePay+bill.propertyLatePay+bill.depositLatePay+bill.otherLatePay+bill.rentServiceChargePay+bill.propertyServiceChargePay | |||||
| +bill.depositServiceChargePay+bill.otherServiceChargePay | |||||
| -bill.rentPay-bill.propertyPay-bill.depositPay-bill.otherPay)/100,2) totalReceivePay | -bill.rentPay-bill.propertyPay-bill.depositPay-bill.otherPay)/100,2) totalReceivePay | ||||
| </when> | </when> | ||||
| <otherwise> | <otherwise> | ||||
| @@ -669,7 +669,7 @@ | |||||
| round((bill.otherReceivePay+bill.otherLatePay+bill.otherServiceChargePay)/100,2) otherReceivePay, | round((bill.otherReceivePay+bill.otherLatePay+bill.otherServiceChargePay)/100,2) otherReceivePay, | ||||
| round((bill.rentReceivePay+bill.propertyReceivePay+bill.depositReceivePay | round((bill.rentReceivePay+bill.propertyReceivePay+bill.depositReceivePay | ||||
| +bill.otherReceivePay+bill.rentLatePay+bill.propertyLatePay+bill.depositLatePay | +bill.otherReceivePay+bill.rentLatePay+bill.propertyLatePay+bill.depositLatePay | ||||
| +bill.otherLatePay+bill.rentSeviceChargePay+bill.propertySeviceChargePay+bill.depositSeviceChargePay+bill.otherSeviceChargePay)/100,2) | |||||
| +bill.otherLatePay+bill.rentServiceChargePay+bill.propertyServiceChargePay+bill.depositServiceChargePay+bill.otherServiceChargePay)/100,2) | |||||
| totalReceivePay | totalReceivePay | ||||
| </otherwise> | </otherwise> | ||||
| </choose> | </choose> | ||||