nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-03 12:19:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

[cleanup] deprecated search criteria, amendment_date, cancel_reason

Browse Source
This commit is contained in:
Anand Doshi
2013-06-11 16:23:18 +05:30
parent 618edee8b7
commit 27e6f13b5d
46 changed files with 21 additions and 595 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
accounts/doctype/journal_voucher/journal_voucher.txt
View File

@@ -2,7 +2,7 @@
{
"creation": "2013-03-25 10:53:52",
"docstatus": 0,
"modified": "2013-04-05 11:10:35",
"modified": "2013-06-11 16:04:20",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -459,29 +459,6 @@
"print_hide": 1,
"read_only": 1
},
{
"description": "The date at which current entry is corrected in the system.",
"doctype": "DocField",
"fieldname": "amendment_date",
"fieldtype": "Date",
"label": "Amendment Date",
"no_copy": 1,
"oldfieldname": "amendment_date",
"oldfieldtype": "Date",
"print_hide": 1,
"read_only": 0
},
{
"doctype": "DocField",
"fieldname": "cancel_reason",
"fieldtype": "Data",
"label": "Cancel Reason",
"no_copy": 1,
"oldfieldname": "cancel_reason",
"oldfieldtype": "Data",
"print_hide": 1,
"read_only": 1
},
{
"amend": 1,
"cancel": 1,

2
accounts/doctype/period_closing_voucher/period_closing_voucher.py
View File

@@ -187,7 +187,7 @@ class DocType:
# Swap Debit & Credit Column and make gl entry
for gl in gl_entries:
fdict = {'account': gl[0], 'cost_center': '', 'against': '', 'debit': flt(gl[2]), 'credit' : flt(gl[1]), 'remarks': self.doc.cancel_reason, 'voucher_type': self.doc.doctype, 'voucher_no': self.doc.name, 'transaction_date': self.doc.transaction_date, 'posting_date': self.doc.posting_date, 'fiscal_year': self.doc.fiscal_year, 'against_voucher': '', 'against_voucher_type': '', 'company': self.doc.company, 'is_opening': 'No', 'aging_date': 'self.doc.posting_date'}
fdict = {'account': gl[0], 'cost_center': '', 'against': '', 'debit': flt(gl[2]), 'credit' : flt(gl[1]), 'remarks': "cancelled", 'voucher_type': self.doc.doctype, 'voucher_no': self.doc.name, 'transaction_date': self.doc.transaction_date, 'posting_date': self.doc.posting_date, 'fiscal_year': self.doc.fiscal_year, 'against_voucher': '', 'against_voucher_type': '', 'company': self.doc.company, 'is_opening': 'No', 'aging_date': 'self.doc.posting_date'}
self.save_entry(fdict, is_cancel = 'Yes')
# Update is_cancelled = 'Yes' to all gl entries for current voucher

23
accounts/doctype/period_closing_voucher/period_closing_voucher.txt
View File

@@ -2,7 +2,7 @@
{
"creation": "2013-01-10 16:34:07",
"docstatus": 0,
"modified": "2013-01-22 14:47:50",
"modified": "2013-06-11 16:04:45",
"modified_by": "Administrator",
"owner": "jai@webnotestech.com"
},
@@ -85,16 +85,6 @@
"oldfieldtype": "Data",
"read_only": 1
},
{
"doctype": "DocField",
"fieldname": "amendment_date",
"fieldtype": "Date",
"label": "Amendment Date",
"no_copy": 1,
"oldfieldname": "amendment_date",
"oldfieldtype": "Date",
"read_only": 1
},
{
"doctype": "DocField",
"fieldname": "company",
@@ -138,17 +128,6 @@
"oldfieldtype": "Small Text",
"reqd": 1
},
{
"doctype": "DocField",
"fieldname": "cancel_reason",
"fieldtype": "Small Text",
"hidden": 1,
"label": "Cancel Reason",
"oldfieldname": "cancel_reason",
"oldfieldtype": "Small Text",
"print_hide": 1,
"search_index": 0
},
{
"doctype": "DocPerm",
"role": "System Manager"

14
accounts/doctype/purchase_invoice/purchase_invoice.txt
View File

@@ -2,7 +2,7 @@
{
"creation": "2013-05-21 16:16:39",
"docstatus": 0,
"modified": "2013-06-05 14:57:08",
"modified": "2013-06-11 16:16:38",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -815,18 +815,6 @@
"read_only": 0,
"search_index": 1
},
{
"depends_on": "eval:!doc.__islocal",
"doctype": "DocField",
"fieldname": "cancel_reason",
"fieldtype": "Data",
"label": "Cancel Reason",
"no_copy": 1,
"oldfieldname": "cancel_reason",
"oldfieldtype": "Data",
"print_hide": 1,
"read_only": 1
},
{
"doctype": "DocField",
"fieldname": "remarks",