deprecated gl_control and some rewrites
diff --git a/controllers/accounts_controller.py b/controllers/accounts_controller.py
index d2f29b2..912135e 100644
--- a/controllers/accounts_controller.py
+++ b/controllers/accounts_controller.py
@@ -16,7 +16,8 @@
from __future__ import unicode_literals
import webnotes
-
+from webnotes.utils import flt
+from webnotes.model.doc import addchild
from utilities.transaction_base import TransactionBase
class AccountsController(TransactionBase):
@@ -37,15 +38,39 @@
}
gl_dict.update(args)
return gl_dict
-
- def get_company_abbr(self):
- return webnotes.conn.get_value("Company", self.doc.company, "abbr")
def get_stock_in_hand_account(self):
- stock_in_hand = webnotes.conn.get_value("Company", self.doc.company, "stock_in_hand")
-
+ stock_in_hand = webnotes.conn.get_value("Company", self.doc.company, "stock_in_hand")
if not stock_in_hand:
webnotes.msgprint("""Please specify "Stock In Hand" account
for company: %s""" % (self.doc.company,), raise_exception=1)
return stock_in_hand
+
+ def clear_unallocated_advances(self, parenttype, parentfield):
+ for d in self.doclist:
+ if d.parentfield == parentfield and flt(d.allocated_amount) == 0:
+ self.doclist.remove(d)
+
+ webnotes.conn.sql("""delete from `tab%s` where parent = %s
+ and ifnull(allocated_amount, 0) = 0""" % (parenttype, '%s'), self.doc.name)
+
+ def get_advances(self, account_head, parenttype, parentfield, dr_or_cr):
+ res = webnotes.conn.sql("""select t1.name as jv_no, t1.remark,
+ t2.%s as amount, t2.name as jv_detail_no
+ from `tabJournal Voucher` t1, `tabJournal Voucher Detail` t2
+ where t1.name = t2.parent and t2.account = %s and t2.is_advance = 'Yes'
+ and (t2.against_voucher is null or t2.against_voucher = '')
+ and (t2.against_invoice is null or t2.against_invoice = '')
+ and (t2.against_jv is null or t2.against_jv = '')
+ and t1.docstatus = 1 order by t1.posting_date""" %
+ (dr_or_cr, '%s'), account_head, as_dict=1)
+
+ self.doclist = self.doc.clear_table(self.doclist, parentfield)
+ for d in res:
+ add = addchild(self.doc, parentfield, parenttype, self.doclist)
+ add.journal_voucher = d.jv_no
+ add.jv_detail_no = d.jv_detail_no
+ add.remarks = d.remark
+ add.advance_amount = flt(d.amount)
+ add.allocate_amount = 0
\ No newline at end of file