mirror of
https://github.com/frappe/books.git
synced 2025-01-08 17:24:05 +00:00
Fixed the half-yearly filter
This commit is contained in:
parent
55832f19ad
commit
d091bf1347
@ -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) {
|
||||
|
@ -52,6 +52,7 @@ export default {
|
||||
label: name,
|
||||
fieldname: name,
|
||||
fieldtype: 'Currency',
|
||||
width: 1
|
||||
}));
|
||||
|
||||
columns.push(...columnDefs);
|
||||
|
@ -8,7 +8,6 @@
|
||||
:placeholder="placeholder"
|
||||
readonly
|
||||
@focus="!readonly ? togglePopover() : null"
|
||||
@blur="togglePopover(false)"
|
||||
/>
|
||||
</template>
|
||||
<template v-slot:content="{ togglePopover }">
|
||||
|
Loading…
Reference in New Issue
Block a user