accounting/books
2
0
Fork 0
mirror of https://github.com/frappe/books.git synced 2024-09-20 11:29:00 +00:00
Code Issues Releases Activity

Changes in events, payment modal and date in registers (#92)

Browse Source 
* changes in events, payment modal and date in registers

* Remove window.datatable
This commit is contained in:
sahil28297 2018-09-20 18:09:21 +05:30 committed by Faris Ansari
parent 231b36a51b
commit e5a4464167
4 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/desk/reportpage.js
View File

@ -102,4 +102,4 @@ module.exports = class ReportPage extends Page {
layout: this.layout || 'fluid',
}, this.datatableOptions || {}));
}
}
}

14
models/doctype/SystemSettings/SystemSettings.js
View File

@ -11,14 +11,14 @@ module.exports = {
label: "Date Format",
fieldtype: "Select",
options: [
"dd/mm/yyyy",
"mm/dd/yyyy",
"dd-mm-yyyy",
"mm-dd-yyyy",
"yyyy-mm-dd"
"dd/MM/yyyy",
"MM/dd/yyyy",
"dd-MM-yyyy",
"MM-dd-yyyy",
"yyyy-MM-dd"
],
default: "yyyy-mm-dd",
default: "yyyy-MM-dd",
required: 1
}
]
}
}

4
ui/components/List/ListItem.vue
View File

@ -6,7 +6,9 @@
>
<label class="custom-control-label" :for="id"></label>
</div>
<slot></slot>
<div @click="$emit('clickItem')">
<slot></slot>
</div>
</div>
</template>
<script>

4
utils/format.js
View File

@ -18,7 +18,7 @@ module.exports = {
} else if (field.fieldtype === 'Date') {
let dateFormat;
if (!frappe.SystemSettings) {
dateFormat = 'yyyy-mm-dd';
dateFormat = 'yyyy-MM-dd';
} else {
dateFormat = frappe.SystemSettings.dateFormat;
}
@ -34,4 +34,4 @@ module.exports = {
}
return value;
}
}
}