diff --git a/reports/FinancialStatements/FinancialStatements.js b/reports/FinancialStatements/FinancialStatements.js index 17f4074a..cf403d68 100644 --- a/reports/FinancialStatements/FinancialStatements.js +++ b/reports/FinancialStatements/FinancialStatements.js @@ -192,10 +192,13 @@ function getPeriodKey(date, periodicity) { }[quarter]; }, 'Half Yearly': () => { - return { - 1: `Apr ${year} - Sep ${year}`, - 2: `Oct ${year} - Mar ${year}`, - }[[2, 3].includes(quarter) ? 1 : 2]; + if (month > 3) { + return { + 1: `Apr ${year} - Sep ${year}`, + 2: `Oct ${year} - Mar ${year + 1}`, + }[[2, 3].includes(quarter) ? 1 : 2]; + } + return `Oct ${year - 1} - Mar ${year}`; }, Yearly: () => { if (month > 3) { diff --git a/reports/ProfitAndLoss/viewConfig.js b/reports/ProfitAndLoss/viewConfig.js index fb34074f..34dbe737 100644 --- a/reports/ProfitAndLoss/viewConfig.js +++ b/reports/ProfitAndLoss/viewConfig.js @@ -52,6 +52,7 @@ export default { label: name, fieldname: name, fieldtype: 'Currency', + width: 1 })); columns.push(...columnDefs); diff --git a/src/components/DatePicker/DatePicker.vue b/src/components/DatePicker/DatePicker.vue index 248d871e..33079f6c 100644 --- a/src/components/DatePicker/DatePicker.vue +++ b/src/components/DatePicker/DatePicker.vue @@ -8,7 +8,6 @@ :placeholder="placeholder" readonly @focus="!readonly ? togglePopover() : null" - @blur="togglePopover(false)" />