From c3f2fb7355ec457edca6f1972063e367d66f2c6f Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Thu, 12 Dec 2013 14:55:25 +0530 Subject: [PATCH 1/4] [fix] [minor] payment to invoice patching tool --- .../payment_to_invoice_matching_tool.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.py b/accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.py index 6a31191969..dea5fb59c9 100644 --- a/accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.py +++ b/accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.py @@ -145,6 +145,8 @@ def gl_entry_details(doctype, txt, searchfield, start, page_len, filters): and voucher_no != gle.voucher_no) != abs(ifnull(gle.debit, 0) - ifnull(gle.credit, 0) ) + and if(gle.voucher_type='Sales Invoice', (select is_pos from `tabSales Invoice` + where name=gle.voucher_no), 0)=0 %(mcond)s ORDER BY gle.posting_date desc, gle.voucher_no desc limit %(start)s, %(page_len)s""" % { From c10c0c506671f0bf4352dacf1e8ab7354b36270f Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Thu, 12 Dec 2013 17:13:22 +0530 Subject: [PATCH 2/4] [fix] [minor] series skipping issue in salary manager --- hr/doctype/salary_manager/salary_manager.py | 1 - hr/doctype/salary_slip/salary_slip.py | 13 ++++++------- hr/doctype/salary_structure/salary_structure.py | 5 ++++- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/hr/doctype/salary_manager/salary_manager.py b/hr/doctype/salary_manager/salary_manager.py index 29b13aed98..37a8c5d5e9 100644 --- a/hr/doctype/salary_manager/salary_manager.py +++ b/hr/doctype/salary_manager/salary_manager.py @@ -12,7 +12,6 @@ class DocType: self.doc = doc self.doclist = doclist - def get_emp_list(self): """ Returns list of active employees based on selected criteria diff --git a/hr/doctype/salary_slip/salary_slip.py b/hr/doctype/salary_slip/salary_slip.py index f5eeea164d..94660d0fd8 100644 --- a/hr/doctype/salary_slip/salary_slip.py +++ b/hr/doctype/salary_slip/salary_slip.py @@ -29,18 +29,17 @@ class DocType(TransactionBase): if struct: self.pull_sal_struct(struct) - def check_sal_struct(self): - struct = webnotes.conn.sql("select name from `tabSalary Structure` where employee ='%s' and is_active = 'Yes' "%self.doc.employee) + struct = webnotes.conn.sql("""select name from `tabSalary Structure` + where employee=%s and is_active = 'Yes'""", self.doc.employee) if not struct: - msgprint("Please create Salary Structure for employee '%s'"%self.doc.employee) - self.doc.employee = '' + msgprint("Please create Salary Structure for employee '%s'" % self.doc.employee) + self.doc.employee = None return struct and struct[0][0] or '' - def pull_sal_struct(self, struct): - from hr.doctype.salary_structure.salary_structure import make_salary_slip - self.doclist = make_salary_slip(struct, self.doclist) + from hr.doctype.salary_structure.salary_structure import get_mapped_doclist + self.doclist = get_mapped_doclist(struct, self.doclist) def pull_emp_details(self): emp = webnotes.conn.get_value("Employee", self.doc.employee, diff --git a/hr/doctype/salary_structure/salary_structure.py b/hr/doctype/salary_structure/salary_structure.py index 2dc056dd16..a034b90284 100644 --- a/hr/doctype/salary_structure/salary_structure.py +++ b/hr/doctype/salary_structure/salary_structure.py @@ -74,6 +74,9 @@ class DocType: @webnotes.whitelist() def make_salary_slip(source_name, target_doclist=None): + return [d.fields for d in get_mapped_doclist(source_name, target_doclist)] + +def get_mapped_doclist(source_name, target_doclist=None): from webnotes.model.mapper import get_mapped_doclist def postprocess(source, target): @@ -109,4 +112,4 @@ def make_salary_slip(source_name, target_doclist=None): } }, target_doclist, postprocess) - return [d.fields for d in doclist] \ No newline at end of file + return doclist \ No newline at end of file From f6e06311becce981a1ce54f10d460a0dee053251 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Thu, 12 Dec 2013 17:45:29 +0530 Subject: [PATCH 3/4] [cleanup] [minor] carry forwarded leaves field read only and depends on carry forward checkbox --- hr/doctype/leave_allocation/leave_allocation.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/hr/doctype/leave_allocation/leave_allocation.txt b/hr/doctype/leave_allocation/leave_allocation.txt index a24823a454..38e3eb57c9 100644 --- a/hr/doctype/leave_allocation/leave_allocation.txt +++ b/hr/doctype/leave_allocation/leave_allocation.txt @@ -2,7 +2,7 @@ { "creation": "2013-02-20 19:10:38", "docstatus": 0, - "modified": "2013-07-05 14:44:19", + "modified": "2013-12-12 17:41:52", "modified_by": "Administrator", "owner": "Administrator" }, @@ -131,10 +131,12 @@ "label": "Carry Forward" }, { + "depends_on": "carry_forward", "doctype": "DocField", "fieldname": "carry_forwarded_leaves", "fieldtype": "Float", - "label": "Carry Forwarded Leaves" + "label": "Carry Forwarded Leaves", + "read_only": 1 }, { "allow_on_submit": 1, From f943dc5dc1d446b6c47beda4e85289464c801699 Mon Sep 17 00:00:00 2001 From: Pratik Vyas Date: Thu, 12 Dec 2013 19:45:30 +0600 Subject: [PATCH 4/4] bumped to version 3.2.1 --- config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.json b/config.json index 779f0638b7..77a00b846f 100644 --- a/config.json +++ b/config.json @@ -1,6 +1,6 @@ { "app_name": "ERPNext", - "app_version": "3.2.0", + "app_version": "3.2.1", "base_template": "app/portal/templates/base.html", "modules": { "Accounts": {