=== modified file 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/lookup/Lookup.java' --- local/in/dhis-in-api/src/main/java/org/hisp/dhis/lookup/Lookup.java 2014-01-12 16:56:05 +0000 +++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/lookup/Lookup.java 2014-04-11 08:58:44 +0000 @@ -4,6 +4,10 @@ public class Lookup extends BaseNameableObject { + public final static String PAYMENT_ADJUSTMENT_AMOUNT_DE = "PAYMENT_ADJUSTMENT_AMOUNT_DE"; + + public final static String TARIFF_SETTING_AUTHORITY = "TARIFF_SETTING_AUTHORITY"; + public static final String DS_PBF_TYPE = "DS_PBF_TYPE"; public static final String BANK = "BANK"; === modified file 'local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/PBFInvoiceReportForm.vm' --- local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/PBFInvoiceReportForm.vm 2014-04-05 12:21:33 +0000 +++ local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/PBFInvoiceReportForm.vm 2014-04-11 08:58:44 +0000 @@ -34,24 +34,34 @@ var reportFormat = $('#selectedReportFormat').val(); var orgunit = $('#treeSelectedId').val(); + var startPeriod = ""; + var endPeriod = ""; if(quater=='Q1') { period = year+"-01-01"; + startPeriod = year+"-01-01"; + endPeriod = year+"-03-31"; } else if(quater=='Q2') { period = year+"-04-01"; + startPeriod = year+"-04-01"; + endPeriod = year+"-06-30"; } else if(quater=='Q3') { period = year+"-07-01"; + startPeriod = year+"-07-01"; + endPeriod = year+"-09-30"; } else if(quater=='Q4') { period = year+"-10-01"; + startPeriod = year+"-10-01"; + endPeriod = year+"-12-31"; } - window.location.href = "http://192.168.0.21:8095/birt_punjab_213/run?__report=/home/hisp/tomcat_punjab_213/webapps/birt_punjab_213/report/District%20Level%20Reports/JSY%20District%20Report.rptdesign&__format="+reportFormat+"&Date="+period+"&District="+orgunit; + window.location.href = "http://192.168.0.21:8098/birt_pbf/run?__report=/home/ccem/tomcat_pbf/webapps/birt_pbf/report/PBF_Payment_Voucher.rptdesign&__format="+reportFormat+"&startDate="+startPeriod+"&endDate="+endPeriod+"&District="+orgunit; return false; } === modified file 'local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/loadPaymentAdjustment.vm' --- local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/loadPaymentAdjustment.vm 2014-04-10 10:30:33 +0000 +++ local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/loadPaymentAdjustment.vm 2014-04-11 08:58:44 +0000 @@ -2,7 +2,7 @@ @@ -82,26 +82,26 @@