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

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

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

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

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

2
utils/format.js
View File

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