Anand Doshi | 885e074 | 2015-03-03 14:55:30 +0530 | [diff] [blame] | 1 | # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors |
Rushabh Mehta | e67d1fb | 2013-08-05 14:59:54 +0530 | [diff] [blame] | 2 | # License: GNU General Public License v3. See license.txt |
Nabin Hait | c3afb25 | 2013-03-19 12:01:24 +0530 | [diff] [blame] | 3 | |
| 4 | from __future__ import unicode_literals |
Rohit Waghchaure | e9ff191 | 2017-06-19 12:54:59 +0530 | [diff] [blame] | 5 | import frappe, erpnext |
Rushabh Mehta | ffd80a6 | 2017-01-16 17:23:20 +0530 | [diff] [blame] | 6 | from frappe.utils import cint, flt, cstr |
Rushabh Mehta | 793ba6b | 2014-02-14 15:47:51 +0530 | [diff] [blame] | 7 | from frappe import msgprint, _ |
| 8 | import frappe.defaults |
Valmik Jangla | d89dcf6 | 2016-03-04 14:33:49 +0530 | [diff] [blame] | 9 | from erpnext.accounts.utils import get_fiscal_year |
Nabin Hait | 1f94fa2 | 2015-08-24 14:32:38 +0530 | [diff] [blame] | 10 | from erpnext.accounts.general_ledger import make_gl_entries, delete_gl_entries, process_gl_map |
Rushabh Mehta | 1f84799 | 2013-12-12 19:12:19 +0530 | [diff] [blame] | 11 | from erpnext.controllers.accounts_controller import AccountsController |
Rohit Waghchaure | 3899d74 | 2017-01-25 18:47:53 +0530 | [diff] [blame] | 12 | from erpnext.stock.stock_ledger import get_valuation_rate |
Nabin Hait | 6d7b0ce | 2017-06-15 11:09:27 +0530 | [diff] [blame] | 13 | from erpnext.stock import get_warehouse_account_map |
Nabin Hait | c3afb25 | 2013-03-19 12:01:24 +0530 | [diff] [blame] | 14 | |
| 15 | class StockController(AccountsController): |
Nabin Hait | 8af429d | 2016-11-16 17:21:59 +0530 | [diff] [blame] | 16 | def validate(self): |
| 17 | super(StockController, self).validate() |
| 18 | self.validate_inspection() |
Rushabh Mehta | ffd80a6 | 2017-01-16 17:23:20 +0530 | [diff] [blame] | 19 | |
Nabin Hait | 9784d27 | 2016-12-30 16:21:35 +0530 | [diff] [blame] | 20 | def make_gl_entries(self, gl_entries=None, repost_future_gle=True, from_repost=False): |
Anand Doshi | f78d1ae | 2014-03-28 13:55:00 +0530 | [diff] [blame] | 21 | if self.docstatus == 2: |
| 22 | delete_gl_entries(voucher_type=self.doctype, voucher_no=self.name) |
Anand Doshi | 2ce39cf | 2014-04-07 18:51:58 +0530 | [diff] [blame] | 23 | |
Rohit Waghchaure | e9ff191 | 2017-06-19 12:54:59 +0530 | [diff] [blame] | 24 | if cint(erpnext.is_perpetual_inventory_enabled(self.company)): |
Nabin Hait | 6d7b0ce | 2017-06-15 11:09:27 +0530 | [diff] [blame] | 25 | warehouse_account = get_warehouse_account_map() |
Anand Doshi | 2ce39cf | 2014-04-07 18:51:58 +0530 | [diff] [blame] | 26 | |
Anand Doshi | f78d1ae | 2014-03-28 13:55:00 +0530 | [diff] [blame] | 27 | if self.docstatus==1: |
Nabin Hait | 9784d27 | 2016-12-30 16:21:35 +0530 | [diff] [blame] | 28 | if not gl_entries: |
| 29 | gl_entries = self.get_gl_entries(warehouse_account) |
| 30 | make_gl_entries(gl_entries, from_repost=from_repost) |
Nabin Hait | 145e5e2 | 2013-10-22 23:51:41 +0530 | [diff] [blame] | 31 | |
Nabin Hait | becf75d | 2014-03-27 17:18:29 +0530 | [diff] [blame] | 32 | if repost_future_gle: |
Nabin Hait | b9e0481 | 2014-09-26 14:22:18 +0530 | [diff] [blame] | 33 | items, warehouses = self.get_items_and_warehouses() |
Nabin Hait | adeb976 | 2014-10-06 11:53:52 +0530 | [diff] [blame] | 34 | update_gl_entries_after(self.posting_date, self.posting_time, warehouses, items, |
Nabin Hait | f1a07ff | 2014-10-15 12:23:35 +0530 | [diff] [blame] | 35 | warehouse_account) |
Rohit Waghchaure | b6381c6 | 2018-06-12 13:54:40 +0530 | [diff] [blame] | 36 | elif self.doctype in ['Purchase Receipt', 'Purchase Invoice'] and self.docstatus == 1: |
Rohit Waghchaure | 4216972 | 2018-05-16 18:16:08 +0530 | [diff] [blame] | 37 | gl_entries = [] |
| 38 | gl_entries = self.get_asset_gl_entry(gl_entries) |
| 39 | make_gl_entries(gl_entries, from_repost=from_repost) |
Anand Doshi | 2ce39cf | 2014-04-07 18:51:58 +0530 | [diff] [blame] | 40 | |
Nabin Hait | e83069c | 2013-11-14 18:40:08 +0530 | [diff] [blame] | 41 | def get_gl_entries(self, warehouse_account=None, default_expense_account=None, |
Nabin Hait | 142007a | 2013-09-17 15:15:16 +0530 | [diff] [blame] | 42 | default_cost_center=None): |
Nabin Hait | adeb976 | 2014-10-06 11:53:52 +0530 | [diff] [blame] | 43 | |
Nabin Hait | 142007a | 2013-09-17 15:15:16 +0530 | [diff] [blame] | 44 | if not warehouse_account: |
Nabin Hait | 6d7b0ce | 2017-06-15 11:09:27 +0530 | [diff] [blame] | 45 | warehouse_account = get_warehouse_account_map() |
Anand Doshi | 2ce39cf | 2014-04-07 18:51:58 +0530 | [diff] [blame] | 46 | |
Anand Doshi | de1a97d | 2014-04-17 11:37:46 +0530 | [diff] [blame] | 47 | sle_map = self.get_stock_ledger_details() |
| 48 | voucher_details = self.get_voucher_details(default_expense_account, default_cost_center, sle_map) |
Anand Doshi | 2ce39cf | 2014-04-07 18:51:58 +0530 | [diff] [blame] | 49 | |
Nabin Hait | 2e296fa | 2013-08-28 18:53:11 +0530 | [diff] [blame] | 50 | gl_list = [] |
Nabin Hait | 7a75e10 | 2013-09-17 10:21:20 +0530 | [diff] [blame] | 51 | warehouse_with_no_account = [] |
Rushabh Mehta | ffd80a6 | 2017-01-16 17:23:20 +0530 | [diff] [blame] | 52 | |
Nabin Hait | 8c61f34 | 2016-12-15 13:46:03 +0530 | [diff] [blame] | 53 | for item_row in voucher_details: |
| 54 | sle_list = sle_map.get(item_row.name) |
Nabin Hait | 2e296fa | 2013-08-28 18:53:11 +0530 | [diff] [blame] | 55 | if sle_list: |
| 56 | for sle in sle_list: |
| 57 | if warehouse_account.get(sle.warehouse): |
Nabin Hait | 2e296fa | 2013-08-28 18:53:11 +0530 | [diff] [blame] | 58 | # from warehouse account |
Rushabh Mehta | ffd80a6 | 2017-01-16 17:23:20 +0530 | [diff] [blame] | 59 | |
Nabin Hait | 8c61f34 | 2016-12-15 13:46:03 +0530 | [diff] [blame] | 60 | self.check_expense_account(item_row) |
Rushabh Mehta | ffd80a6 | 2017-01-16 17:23:20 +0530 | [diff] [blame] | 61 | |
Javier Wong | 9b11d9b | 2017-04-14 18:24:04 +0800 | [diff] [blame] | 62 | # If the item does not have the allow zero valuation rate flag set |
Nabin Hait | ea8fab5 | 2017-02-06 17:13:39 +0530 | [diff] [blame] | 63 | # and ( valuation rate not mentioned in an incoming entry |
Rushabh Mehta | cc8b2b2 | 2017-03-31 12:44:29 +0530 | [diff] [blame] | 64 | # or incoming entry not found while delivering the item), |
Nabin Hait | ea8fab5 | 2017-02-06 17:13:39 +0530 | [diff] [blame] | 65 | # try to pick valuation rate from previous sle or Item master and update in SLE |
| 66 | # Otherwise, throw an exception |
Nabin Hait | 0a6aaf4 | 2017-02-07 01:23:26 +0530 | [diff] [blame] | 67 | |
| 68 | if not sle.stock_value_difference and self.doctype != "Stock Reconciliation" \ |
Javier Wong | 9b11d9b | 2017-04-14 18:24:04 +0800 | [diff] [blame] | 69 | and not item_row.get("allow_zero_valuation_rate"): |
Nabin Hait | 0a6aaf4 | 2017-02-07 01:23:26 +0530 | [diff] [blame] | 70 | |
Nabin Hait | ea8fab5 | 2017-02-06 17:13:39 +0530 | [diff] [blame] | 71 | sle = self.update_stock_ledger_entries(sle) |
Rushabh Mehta | 14a908b | 2015-10-15 12:28:20 +0530 | [diff] [blame] | 72 | |
Nabin Hait | 2e296fa | 2013-08-28 18:53:11 +0530 | [diff] [blame] | 73 | gl_list.append(self.get_gl_dict({ |
Nabin Hait | 6d7b0ce | 2017-06-15 11:09:27 +0530 | [diff] [blame] | 74 | "account": warehouse_account[sle.warehouse]["account"], |
Nabin Hait | 8c61f34 | 2016-12-15 13:46:03 +0530 | [diff] [blame] | 75 | "against": item_row.expense_account, |
| 76 | "cost_center": item_row.cost_center, |
Nabin Hait | dc82d4f | 2014-04-07 12:02:57 +0530 | [diff] [blame] | 77 | "remarks": self.get("remarks") or "Accounting Entry for Stock", |
Nabin Hait | 46bcbaf | 2015-08-19 13:49:10 +0530 | [diff] [blame] | 78 | "debit": flt(sle.stock_value_difference, 2), |
Nabin Hait | 6e439a5 | 2015-08-28 19:24:22 +0530 | [diff] [blame] | 79 | }, warehouse_account[sle.warehouse]["account_currency"])) |
Nabin Hait | 27994c2 | 2013-08-26 16:53:30 +0530 | [diff] [blame] | 80 | |
Rushabh Mehta | 14a908b | 2015-10-15 12:28:20 +0530 | [diff] [blame] | 81 | # to target warehouse / expense account |
Nabin Hait | 2e296fa | 2013-08-28 18:53:11 +0530 | [diff] [blame] | 82 | gl_list.append(self.get_gl_dict({ |
Nabin Hait | 8c61f34 | 2016-12-15 13:46:03 +0530 | [diff] [blame] | 83 | "account": item_row.expense_account, |
Nabin Hait | 6d7b0ce | 2017-06-15 11:09:27 +0530 | [diff] [blame] | 84 | "against": warehouse_account[sle.warehouse]["account"], |
Nabin Hait | 8c61f34 | 2016-12-15 13:46:03 +0530 | [diff] [blame] | 85 | "cost_center": item_row.cost_center, |
Nabin Hait | dc82d4f | 2014-04-07 12:02:57 +0530 | [diff] [blame] | 86 | "remarks": self.get("remarks") or "Accounting Entry for Stock", |
Nabin Hait | 46bcbaf | 2015-08-19 13:49:10 +0530 | [diff] [blame] | 87 | "credit": flt(sle.stock_value_difference, 2), |
Nabin Hait | 8c61f34 | 2016-12-15 13:46:03 +0530 | [diff] [blame] | 88 | "project": item_row.get("project") or self.get("project") |
Nabin Hait | 2e296fa | 2013-08-28 18:53:11 +0530 | [diff] [blame] | 89 | })) |
Nabin Hait | 7a75e10 | 2013-09-17 10:21:20 +0530 | [diff] [blame] | 90 | elif sle.warehouse not in warehouse_with_no_account: |
| 91 | warehouse_with_no_account.append(sle.warehouse) |
Anand Doshi | 2ce39cf | 2014-04-07 18:51:58 +0530 | [diff] [blame] | 92 | |
| 93 | if warehouse_with_no_account: |
Nabin Hait | d662502 | 2016-10-24 18:17:57 +0530 | [diff] [blame] | 94 | for wh in warehouse_with_no_account: |
| 95 | if frappe.db.get_value("Warehouse", wh, "company"): |
Nabin Hait | 6d7b0ce | 2017-06-15 11:09:27 +0530 | [diff] [blame] | 96 | frappe.throw(_("Warehouse {0} is not linked to any account, please mention the account in the warehouse record or set default inventory account in company {1}.").format(wh, self.company)) |
Rushabh Mehta | 14a908b | 2015-10-15 12:28:20 +0530 | [diff] [blame] | 97 | |
Nabin Hait | 2e296fa | 2013-08-28 18:53:11 +0530 | [diff] [blame] | 98 | return process_gl_map(gl_list) |
Rushabh Mehta | ffd80a6 | 2017-01-16 17:23:20 +0530 | [diff] [blame] | 99 | |
Rohit Waghchaure | 3899d74 | 2017-01-25 18:47:53 +0530 | [diff] [blame] | 100 | def update_stock_ledger_entries(self, sle): |
Rushabh Mehta | cc8b2b2 | 2017-03-31 12:44:29 +0530 | [diff] [blame] | 101 | sle.valuation_rate = get_valuation_rate(sle.item_code, sle.warehouse, |
Rohit Waghchaure | a5f4094 | 2017-06-16 15:21:36 +0530 | [diff] [blame] | 102 | self.doctype, self.name, currency=self.company_currency, company=self.company) |
Nabin Hait | ea8fab5 | 2017-02-06 17:13:39 +0530 | [diff] [blame] | 103 | |
Nabin Hait | cb19f52 | 2017-01-25 19:20:35 +0530 | [diff] [blame] | 104 | sle.stock_value = flt(sle.qty_after_transaction) * flt(sle.valuation_rate) |
Nabin Hait | ea8fab5 | 2017-02-06 17:13:39 +0530 | [diff] [blame] | 105 | sle.stock_value_difference = flt(sle.actual_qty) * flt(sle.valuation_rate) |
Rushabh Mehta | cc8b2b2 | 2017-03-31 12:44:29 +0530 | [diff] [blame] | 106 | |
Kanchan Chauhan | b77eaf7 | 2017-01-28 13:18:49 +0530 | [diff] [blame] | 107 | if sle.name: |
Nabin Hait | ea8fab5 | 2017-02-06 17:13:39 +0530 | [diff] [blame] | 108 | frappe.db.sql(""" |
Rushabh Mehta | cc8b2b2 | 2017-03-31 12:44:29 +0530 | [diff] [blame] | 109 | update |
| 110 | `tabStock Ledger Entry` |
| 111 | set |
Nabin Hait | ea8fab5 | 2017-02-06 17:13:39 +0530 | [diff] [blame] | 112 | stock_value = %(stock_value)s, |
Rushabh Mehta | cc8b2b2 | 2017-03-31 12:44:29 +0530 | [diff] [blame] | 113 | valuation_rate = %(valuation_rate)s, |
| 114 | stock_value_difference = %(stock_value_difference)s |
| 115 | where |
Nabin Hait | ea8fab5 | 2017-02-06 17:13:39 +0530 | [diff] [blame] | 116 | name = %(name)s""", (sle)) |
Rushabh Mehta | cc8b2b2 | 2017-03-31 12:44:29 +0530 | [diff] [blame] | 117 | |
Nabin Hait | ea8fab5 | 2017-02-06 17:13:39 +0530 | [diff] [blame] | 118 | return sle |
Rushabh Mehta | cc8b2b2 | 2017-03-31 12:44:29 +0530 | [diff] [blame] | 119 | |
Anand Doshi | de1a97d | 2014-04-17 11:37:46 +0530 | [diff] [blame] | 120 | def get_voucher_details(self, default_expense_account, default_cost_center, sle_map): |
| 121 | if self.doctype == "Stock Reconciliation": |
| 122 | return [frappe._dict({ "name": voucher_detail_no, "expense_account": default_expense_account, |
| 123 | "cost_center": default_cost_center }) for voucher_detail_no, sle in sle_map.items()] |
| 124 | else: |
Nabin Hait | dd38a26 | 2014-12-26 13:15:21 +0530 | [diff] [blame] | 125 | details = self.get("items") |
Anand Doshi | 094610d | 2014-04-16 19:56:53 +0530 | [diff] [blame] | 126 | |
Anand Doshi | de1a97d | 2014-04-17 11:37:46 +0530 | [diff] [blame] | 127 | if default_expense_account or default_cost_center: |
| 128 | for d in details: |
| 129 | if default_expense_account and not d.get("expense_account"): |
| 130 | d.expense_account = default_expense_account |
| 131 | if default_cost_center and not d.get("cost_center"): |
| 132 | d.cost_center = default_cost_center |
Anand Doshi | 2ce39cf | 2014-04-07 18:51:58 +0530 | [diff] [blame] | 133 | |
Anand Doshi | de1a97d | 2014-04-17 11:37:46 +0530 | [diff] [blame] | 134 | return details |
Anand Doshi | 2ce39cf | 2014-04-07 18:51:58 +0530 | [diff] [blame] | 135 | |
Nabin Hait | b9e0481 | 2014-09-26 14:22:18 +0530 | [diff] [blame] | 136 | def get_items_and_warehouses(self): |
Nabin Hait | becf75d | 2014-03-27 17:18:29 +0530 | [diff] [blame] | 137 | items, warehouses = [], [] |
Anand Doshi | 2ce39cf | 2014-04-07 18:51:58 +0530 | [diff] [blame] | 138 | |
Nabin Hait | dd38a26 | 2014-12-26 13:15:21 +0530 | [diff] [blame] | 139 | if hasattr(self, "items"): |
| 140 | item_doclist = self.get("items") |
Anand Doshi | f78d1ae | 2014-03-28 13:55:00 +0530 | [diff] [blame] | 141 | elif self.doctype == "Stock Reconciliation": |
Nabin Hait | becf75d | 2014-03-27 17:18:29 +0530 | [diff] [blame] | 142 | import json |
| 143 | item_doclist = [] |
Anand Doshi | f78d1ae | 2014-03-28 13:55:00 +0530 | [diff] [blame] | 144 | data = json.loads(self.reconciliation_json) |
Nabin Hait | becf75d | 2014-03-27 17:18:29 +0530 | [diff] [blame] | 145 | for row in data[data.index(self.head_row)+1:]: |
| 146 | d = frappe._dict(zip(["item_code", "warehouse", "qty", "valuation_rate"], row)) |
| 147 | item_doclist.append(d) |
Anand Doshi | 2ce39cf | 2014-04-07 18:51:58 +0530 | [diff] [blame] | 148 | |
Nabin Hait | becf75d | 2014-03-27 17:18:29 +0530 | [diff] [blame] | 149 | if item_doclist: |
| 150 | for d in item_doclist: |
| 151 | if d.item_code and d.item_code not in items: |
| 152 | items.append(d.item_code) |
Anand Doshi | 2ce39cf | 2014-04-07 18:51:58 +0530 | [diff] [blame] | 153 | |
Nabin Hait | dc82d4f | 2014-04-07 12:02:57 +0530 | [diff] [blame] | 154 | if d.get("warehouse") and d.warehouse not in warehouses: |
Nabin Hait | becf75d | 2014-03-27 17:18:29 +0530 | [diff] [blame] | 155 | warehouses.append(d.warehouse) |
Anand Doshi | 2ce39cf | 2014-04-07 18:51:58 +0530 | [diff] [blame] | 156 | |
Nabin Hait | dc82d4f | 2014-04-07 12:02:57 +0530 | [diff] [blame] | 157 | if self.doctype == "Stock Entry": |
| 158 | if d.get("s_warehouse") and d.s_warehouse not in warehouses: |
| 159 | warehouses.append(d.s_warehouse) |
| 160 | if d.get("t_warehouse") and d.t_warehouse not in warehouses: |
| 161 | warehouses.append(d.t_warehouse) |
Nabin Hait | becf75d | 2014-03-27 17:18:29 +0530 | [diff] [blame] | 162 | |
Nabin Hait | b9e0481 | 2014-09-26 14:22:18 +0530 | [diff] [blame] | 163 | return items, warehouses |
Anand Doshi | 2ce39cf | 2014-04-07 18:51:58 +0530 | [diff] [blame] | 164 | |
Nabin Hait | 2e296fa | 2013-08-28 18:53:11 +0530 | [diff] [blame] | 165 | def get_stock_ledger_details(self): |
| 166 | stock_ledger = {} |
Nabin Hait | ea8fab5 | 2017-02-06 17:13:39 +0530 | [diff] [blame] | 167 | stock_ledger_entries = frappe.db.sql(""" |
Rushabh Mehta | cc8b2b2 | 2017-03-31 12:44:29 +0530 | [diff] [blame] | 168 | select |
Nabin Hait | 0a6aaf4 | 2017-02-07 01:23:26 +0530 | [diff] [blame] | 169 | name, warehouse, stock_value_difference, valuation_rate, |
Rushabh Mehta | cc8b2b2 | 2017-03-31 12:44:29 +0530 | [diff] [blame] | 170 | voucher_detail_no, item_code, posting_date, posting_time, |
Nabin Hait | 0a6aaf4 | 2017-02-07 01:23:26 +0530 | [diff] [blame] | 171 | actual_qty, qty_after_transaction |
Nabin Hait | ea8fab5 | 2017-02-06 17:13:39 +0530 | [diff] [blame] | 172 | from |
| 173 | `tabStock Ledger Entry` |
| 174 | where |
| 175 | voucher_type=%s and voucher_no=%s |
| 176 | """, (self.doctype, self.name), as_dict=True) |
Nabin Hait | 0a6aaf4 | 2017-02-07 01:23:26 +0530 | [diff] [blame] | 177 | |
Nabin Hait | ea8fab5 | 2017-02-06 17:13:39 +0530 | [diff] [blame] | 178 | for sle in stock_ledger_entries: |
Nabin Hait | 2e296fa | 2013-08-28 18:53:11 +0530 | [diff] [blame] | 179 | stock_ledger.setdefault(sle.voucher_detail_no, []).append(sle) |
| 180 | return stock_ledger |
Anand Doshi | 2ce39cf | 2014-04-07 18:51:58 +0530 | [diff] [blame] | 181 | |
Rushabh Mehta | 551406a | 2017-04-21 12:40:19 +0530 | [diff] [blame] | 182 | def make_batches(self, warehouse_field): |
Rushabh Mehta | e385b5b | 2017-04-20 15:21:01 +0530 | [diff] [blame] | 183 | '''Create batches if required. Called before submit''' |
| 184 | for d in self.items: |
Rushabh Mehta | 551406a | 2017-04-21 12:40:19 +0530 | [diff] [blame] | 185 | if d.get(warehouse_field) and not d.batch_no: |
| 186 | has_batch_no, create_new_batch = frappe.db.get_value('Item', d.item_code, ['has_batch_no', 'create_new_batch']) |
| 187 | if has_batch_no and create_new_batch: |
| 188 | d.batch_no = frappe.get_doc(dict( |
| 189 | doctype='Batch', |
| 190 | item=d.item_code, |
| 191 | supplier=getattr(self, 'supplier', None), |
| 192 | reference_doctype=self.doctype, |
| 193 | reference_name=self.name)).insert().name |
Rushabh Mehta | e385b5b | 2017-04-20 15:21:01 +0530 | [diff] [blame] | 194 | |
Nabin Hait | 2e296fa | 2013-08-28 18:53:11 +0530 | [diff] [blame] | 195 | def make_adjustment_entry(self, expected_gle, voucher_obj): |
Rushabh Mehta | 1f84799 | 2013-12-12 19:12:19 +0530 | [diff] [blame] | 196 | from erpnext.accounts.utils import get_stock_and_account_difference |
Nabin Hait | 27994c2 | 2013-08-26 16:53:30 +0530 | [diff] [blame] | 197 | account_list = [d.account for d in expected_gle] |
| 198 | acc_diff = get_stock_and_account_difference(account_list, expected_gle[0].posting_date) |
Anand Doshi | 2ce39cf | 2014-04-07 18:51:58 +0530 | [diff] [blame] | 199 | |
Nabin Hait | 27994c2 | 2013-08-26 16:53:30 +0530 | [diff] [blame] | 200 | cost_center = self.get_company_default("cost_center") |
| 201 | stock_adjustment_account = self.get_company_default("stock_adjustment_account") |
| 202 | |
Nabin Hait | d474194 | 2013-08-06 15:57:25 +0530 | [diff] [blame] | 203 | gl_entries = [] |
| 204 | for account, diff in acc_diff.items(): |
| 205 | if diff: |
Nabin Hait | 27994c2 | 2013-08-26 16:53:30 +0530 | [diff] [blame] | 206 | gl_entries.append([ |
| 207 | # stock in hand account |
Nabin Hait | 2e296fa | 2013-08-28 18:53:11 +0530 | [diff] [blame] | 208 | voucher_obj.get_gl_dict({ |
Nabin Hait | 27994c2 | 2013-08-26 16:53:30 +0530 | [diff] [blame] | 209 | "account": account, |
| 210 | "against": stock_adjustment_account, |
| 211 | "debit": diff, |
| 212 | "remarks": "Adjustment Accounting Entry for Stock", |
| 213 | }), |
Anand Doshi | 2ce39cf | 2014-04-07 18:51:58 +0530 | [diff] [blame] | 214 | |
Nabin Hait | 27994c2 | 2013-08-26 16:53:30 +0530 | [diff] [blame] | 215 | # account against stock in hand |
Nabin Hait | 2e296fa | 2013-08-28 18:53:11 +0530 | [diff] [blame] | 216 | voucher_obj.get_gl_dict({ |
Nabin Hait | 27994c2 | 2013-08-26 16:53:30 +0530 | [diff] [blame] | 217 | "account": stock_adjustment_account, |
| 218 | "against": account, |
| 219 | "credit": diff, |
| 220 | "cost_center": cost_center or None, |
| 221 | "remarks": "Adjustment Accounting Entry for Stock", |
| 222 | }), |
| 223 | ]) |
Anand Doshi | 2ce39cf | 2014-04-07 18:51:58 +0530 | [diff] [blame] | 224 | |
Nabin Hait | d474194 | 2013-08-06 15:57:25 +0530 | [diff] [blame] | 225 | if gl_entries: |
Rushabh Mehta | 1f84799 | 2013-12-12 19:12:19 +0530 | [diff] [blame] | 226 | from erpnext.accounts.general_ledger import make_gl_entries |
Nabin Hait | d474194 | 2013-08-06 15:57:25 +0530 | [diff] [blame] | 227 | make_gl_entries(gl_entries) |
Anand Doshi | 2ce39cf | 2014-04-07 18:51:58 +0530 | [diff] [blame] | 228 | |
Nabin Hait | 27994c2 | 2013-08-26 16:53:30 +0530 | [diff] [blame] | 229 | def check_expense_account(self, item): |
Rushabh Mehta | 052fe82 | 2014-04-16 19:20:11 +0530 | [diff] [blame] | 230 | if not item.get("expense_account"): |
Nabin Hait | d341254 | 2014-05-01 17:42:21 +0530 | [diff] [blame] | 231 | frappe.throw(_("Expense or Difference account is mandatory for Item {0} as it impacts overall stock value").format(item.item_code)) |
Anand Doshi | 2ce39cf | 2014-04-07 18:51:58 +0530 | [diff] [blame] | 232 | |
Anand Doshi | 496123a | 2014-06-19 19:25:19 +0530 | [diff] [blame] | 233 | else: |
Nabin Hait | 00778c9 | 2014-06-25 19:12:24 +0530 | [diff] [blame] | 234 | is_expense_account = frappe.db.get_value("Account", |
| 235 | item.get("expense_account"), "report_type")=="Profit and Loss" |
jof2jc | 524ebbc | 2016-02-08 23:44:55 +0700 | [diff] [blame] | 236 | if self.doctype not in ("Purchase Receipt", "Purchase Invoice", "Stock Reconciliation", "Stock Entry") and not is_expense_account: |
Nabin Hait | 00778c9 | 2014-06-25 19:12:24 +0530 | [diff] [blame] | 237 | frappe.throw(_("Expense / Difference account ({0}) must be a 'Profit or Loss' account") |
| 238 | .format(item.get("expense_account"))) |
Anand Doshi | 496123a | 2014-06-19 19:25:19 +0530 | [diff] [blame] | 239 | if is_expense_account and not item.get("cost_center"): |
| 240 | frappe.throw(_("{0} {1}: Cost Center is mandatory for Item {2}").format( |
| 241 | _(self.doctype), self.name, item.get("item_code"))) |
Anand Doshi | 2ce39cf | 2014-04-07 18:51:58 +0530 | [diff] [blame] | 242 | |
| 243 | def get_sl_entries(self, d, args): |
Nabin Hait | 5288bde | 2014-11-03 15:08:21 +0530 | [diff] [blame] | 244 | sl_dict = frappe._dict({ |
Nabin Hait | 296d626 | 2014-05-02 17:36:13 +0530 | [diff] [blame] | 245 | "item_code": d.get("item_code", None), |
Nabin Hait | dc82d4f | 2014-04-07 12:02:57 +0530 | [diff] [blame] | 246 | "warehouse": d.get("warehouse", None), |
Anand Doshi | f78d1ae | 2014-03-28 13:55:00 +0530 | [diff] [blame] | 247 | "posting_date": self.posting_date, |
| 248 | "posting_time": self.posting_time, |
Valmik Jangla | d89dcf6 | 2016-03-04 14:33:49 +0530 | [diff] [blame] | 249 | 'fiscal_year': get_fiscal_year(self.posting_date, company=self.company)[0], |
Anand Doshi | f78d1ae | 2014-03-28 13:55:00 +0530 | [diff] [blame] | 250 | "voucher_type": self.doctype, |
| 251 | "voucher_no": self.name, |
Nabin Hait | 1e2f20a | 2013-08-02 11:42:11 +0530 | [diff] [blame] | 252 | "voucher_detail_no": d.name, |
Nabin Hait | dc82d4f | 2014-04-07 12:02:57 +0530 | [diff] [blame] | 253 | "actual_qty": (self.docstatus==1 and 1 or -1)*flt(d.get("stock_qty")), |
Nabin Hait | c865f22 | 2015-09-21 09:18:43 +0530 | [diff] [blame] | 254 | "stock_uom": frappe.db.get_value("Item", args.get("item_code") or d.get("item_code"), "stock_uom"), |
Nabin Hait | 1e2f20a | 2013-08-02 11:42:11 +0530 | [diff] [blame] | 255 | "incoming_rate": 0, |
Anand Doshi | f78d1ae | 2014-03-28 13:55:00 +0530 | [diff] [blame] | 256 | "company": self.company, |
Nabin Hait | 296d626 | 2014-05-02 17:36:13 +0530 | [diff] [blame] | 257 | "batch_no": cstr(d.get("batch_no")).strip(), |
| 258 | "serial_no": d.get("serial_no"), |
rohitwaghchaure | 93779c2 | 2018-03-21 17:52:41 +0530 | [diff] [blame] | 259 | "project": d.get("project") or self.get('project'), |
Anand Doshi | f78d1ae | 2014-03-28 13:55:00 +0530 | [diff] [blame] | 260 | "is_cancelled": self.docstatus==2 and "Yes" or "No" |
Nabin Hait | 5288bde | 2014-11-03 15:08:21 +0530 | [diff] [blame] | 261 | }) |
Anand Doshi | 2ce39cf | 2014-04-07 18:51:58 +0530 | [diff] [blame] | 262 | |
Nabin Hait | 1e2f20a | 2013-08-02 11:42:11 +0530 | [diff] [blame] | 263 | sl_dict.update(args) |
| 264 | return sl_dict |
Anand Doshi | 2ce39cf | 2014-04-07 18:51:58 +0530 | [diff] [blame] | 265 | |
Anand Doshi | c399709 | 2015-04-06 19:29:16 +0530 | [diff] [blame] | 266 | def make_sl_entries(self, sl_entries, is_amended=None, allow_negative_stock=False, |
Nabin Hait | 54c865e | 2015-03-27 15:38:31 +0530 | [diff] [blame] | 267 | via_landed_cost_voucher=False): |
Rushabh Mehta | 1f84799 | 2013-12-12 19:12:19 +0530 | [diff] [blame] | 268 | from erpnext.stock.stock_ledger import make_sl_entries |
Nabin Hait | 54c865e | 2015-03-27 15:38:31 +0530 | [diff] [blame] | 269 | make_sl_entries(sl_entries, is_amended, allow_negative_stock, via_landed_cost_voucher) |
Anand Doshi | 2ce39cf | 2014-04-07 18:51:58 +0530 | [diff] [blame] | 270 | |
Nabin Hait | 3b6dc14 | 2016-08-19 16:39:33 +0530 | [diff] [blame] | 271 | def make_gl_entries_on_cancel(self, repost_future_gle=True): |
Anand Doshi | 2ce39cf | 2014-04-07 18:51:58 +0530 | [diff] [blame] | 272 | if frappe.db.sql("""select name from `tabGL Entry` where voucher_type=%s |
Anand Doshi | f78d1ae | 2014-03-28 13:55:00 +0530 | [diff] [blame] | 273 | and voucher_no=%s""", (self.doctype, self.name)): |
Nabin Hait | 9784d27 | 2016-12-30 16:21:35 +0530 | [diff] [blame] | 274 | self.make_gl_entries(repost_future_gle=repost_future_gle) |
Anand Doshi | 2ce39cf | 2014-04-07 18:51:58 +0530 | [diff] [blame] | 275 | |
Anand Doshi | a740f75 | 2014-06-25 13:31:02 +0530 | [diff] [blame] | 276 | def get_serialized_items(self): |
| 277 | serialized_items = [] |
Nabin Hait | dd38a26 | 2014-12-26 13:15:21 +0530 | [diff] [blame] | 278 | item_codes = list(set([d.item_code for d in self.get("items")])) |
Anand Doshi | a740f75 | 2014-06-25 13:31:02 +0530 | [diff] [blame] | 279 | if item_codes: |
| 280 | serialized_items = frappe.db.sql_list("""select name from `tabItem` |
Rushabh Mehta | 1e8025b | 2015-07-24 15:16:25 +0530 | [diff] [blame] | 281 | where has_serial_no=1 and name in ({})""".format(", ".join(["%s"]*len(item_codes))), |
Anand Doshi | a740f75 | 2014-06-25 13:31:02 +0530 | [diff] [blame] | 282 | tuple(item_codes)) |
| 283 | |
| 284 | return serialized_items |
Rushabh Mehta | b16b9cd | 2015-08-03 16:13:33 +0530 | [diff] [blame] | 285 | |
Nabin Hait | 20105d8 | 2016-01-19 18:05:28 +0530 | [diff] [blame] | 286 | def get_incoming_rate_for_sales_return(self, item_code, against_document): |
Nabin Hait | 1d21842 | 2015-07-17 15:19:02 +0530 | [diff] [blame] | 287 | incoming_rate = 0.0 |
| 288 | if against_document and item_code: |
Anand Doshi | 602e825 | 2015-11-16 19:05:46 +0530 | [diff] [blame] | 289 | incoming_rate = frappe.db.sql("""select abs(stock_value_difference / actual_qty) |
Nabin Hait | 1d21842 | 2015-07-17 15:19:02 +0530 | [diff] [blame] | 290 | from `tabStock Ledger Entry` |
Rushabh Mehta | 14a908b | 2015-10-15 12:28:20 +0530 | [diff] [blame] | 291 | where voucher_type = %s and voucher_no = %s |
Nabin Hait | 20105d8 | 2016-01-19 18:05:28 +0530 | [diff] [blame] | 292 | and item_code = %s limit 1""", |
| 293 | (self.doctype, against_document, item_code)) |
Nabin Hait | 1d21842 | 2015-07-17 15:19:02 +0530 | [diff] [blame] | 294 | incoming_rate = incoming_rate[0][0] if incoming_rate else 0.0 |
| 295 | |
| 296 | return incoming_rate |
Rushabh Mehta | ffd80a6 | 2017-01-16 17:23:20 +0530 | [diff] [blame] | 297 | |
Saurabh | 2e29206 | 2015-11-18 17:03:33 +0530 | [diff] [blame] | 298 | def validate_warehouse(self): |
| 299 | from erpnext.stock.utils import validate_warehouse_company |
| 300 | |
| 301 | warehouses = list(set([d.warehouse for d in |
| 302 | self.get("items") if getattr(d, "warehouse", None)])) |
| 303 | |
| 304 | for w in warehouses: |
| 305 | validate_warehouse_company(w, self.company) |
Rushabh Mehta | ffd80a6 | 2017-01-16 17:23:20 +0530 | [diff] [blame] | 306 | |
Anand Doshi | 6b71ef5 | 2016-01-06 16:32:06 +0530 | [diff] [blame] | 307 | def update_billing_percentage(self, update_modified=True): |
Nabin Hait | bdab0ee | 2015-12-30 19:08:11 +0530 | [diff] [blame] | 308 | self._update_percent_field({ |
| 309 | "target_dt": self.doctype + " Item", |
| 310 | "target_parent_dt": self.doctype, |
| 311 | "target_parent_field": "per_billed", |
| 312 | "target_ref_field": "amount", |
| 313 | "target_field": "billed_amt", |
| 314 | "name": self.name, |
Anand Doshi | 6b71ef5 | 2016-01-06 16:32:06 +0530 | [diff] [blame] | 315 | }, update_modified) |
Anand Doshi | a740f75 | 2014-06-25 13:31:02 +0530 | [diff] [blame] | 316 | |
Nabin Hait | 8af429d | 2016-11-16 17:21:59 +0530 | [diff] [blame] | 317 | def validate_inspection(self): |
Manas Solanki | cc90241 | 2016-11-10 19:15:11 +0530 | [diff] [blame] | 318 | '''Checks if quality inspection is set for Items that require inspection. |
| 319 | On submit, throw an exception''' |
Rushabh Mehta | ffd80a6 | 2017-01-16 17:23:20 +0530 | [diff] [blame] | 320 | |
Manas Solanki | 60db98a | 2016-11-18 14:52:13 +0530 | [diff] [blame] | 321 | inspection_required_fieldname = None |
Nabin Hait | 8af429d | 2016-11-16 17:21:59 +0530 | [diff] [blame] | 322 | if self.doctype in ["Purchase Receipt", "Purchase Invoice"]: |
| 323 | inspection_required_fieldname = "inspection_required_before_purchase" |
| 324 | elif self.doctype in ["Delivery Note", "Sales Invoice"]: |
| 325 | inspection_required_fieldname = "inspection_required_before_delivery" |
Rushabh Mehta | ffd80a6 | 2017-01-16 17:23:20 +0530 | [diff] [blame] | 326 | |
rohitwaghchaure | 4e8fdf7 | 2018-02-22 11:03:48 +0530 | [diff] [blame] | 327 | if ((not inspection_required_fieldname and self.doctype != "Stock Entry") or |
| 328 | (self.doctype == "Stock Entry" and not self.inspection_required) or |
| 329 | (self.doctype in ["Sales Invoice", "Purchase Invoice"] and not self.update_stock)): |
Nabin Hait | 8af429d | 2016-11-16 17:21:59 +0530 | [diff] [blame] | 330 | return |
Rushabh Mehta | ffd80a6 | 2017-01-16 17:23:20 +0530 | [diff] [blame] | 331 | |
Manas Solanki | cc90241 | 2016-11-10 19:15:11 +0530 | [diff] [blame] | 332 | for d in self.get('items'): |
rohitwaghchaure | 4e8fdf7 | 2018-02-22 11:03:48 +0530 | [diff] [blame] | 333 | raise_exception = False |
| 334 | if (inspection_required_fieldname and not d.quality_inspection and |
| 335 | frappe.db.get_value("Item", d.item_code, inspection_required_fieldname)): |
| 336 | raise_exception = True |
| 337 | elif self.doctype == "Stock Entry" and not d.quality_inspection and d.t_warehouse: |
| 338 | raise_exception = True |
Rushabh Mehta | ffd80a6 | 2017-01-16 17:23:20 +0530 | [diff] [blame] | 339 | |
rohitwaghchaure | 4e8fdf7 | 2018-02-22 11:03:48 +0530 | [diff] [blame] | 340 | if raise_exception: |
Manas Solanki | cc90241 | 2016-11-10 19:15:11 +0530 | [diff] [blame] | 341 | frappe.msgprint(_("Quality Inspection required for Item {0}").format(d.item_code)) |
| 342 | if self.docstatus==1: |
| 343 | raise frappe.ValidationError |
| 344 | |
Nabin Hait | b2d3c0f | 2018-06-14 15:54:34 +0530 | [diff] [blame] | 345 | def update_blanket_order(self): |
Nabin Hait | d1f40ad | 2018-06-14 17:09:55 +0530 | [diff] [blame] | 346 | blanket_orders = list(set([d.blanket_order for d in self.items if d.blanket_order])) |
Nabin Hait | b2d3c0f | 2018-06-14 15:54:34 +0530 | [diff] [blame] | 347 | for blanket_order in blanket_orders: |
| 348 | frappe.get_doc("Blanket Order", blanket_order).update_ordered_qty() |
Manas Solanki | e5e87f7 | 2018-05-28 20:07:08 +0530 | [diff] [blame] | 349 | |
Nabin Hait | adeb976 | 2014-10-06 11:53:52 +0530 | [diff] [blame] | 350 | def update_gl_entries_after(posting_date, posting_time, for_warehouses=None, for_items=None, |
Nabin Hait | f1a07ff | 2014-10-15 12:23:35 +0530 | [diff] [blame] | 351 | warehouse_account=None): |
Nabin Hait | becf75d | 2014-03-27 17:18:29 +0530 | [diff] [blame] | 352 | def _delete_gl_entries(voucher_type, voucher_no): |
Anand Doshi | 2ce39cf | 2014-04-07 18:51:58 +0530 | [diff] [blame] | 353 | frappe.db.sql("""delete from `tabGL Entry` |
Nabin Hait | becf75d | 2014-03-27 17:18:29 +0530 | [diff] [blame] | 354 | where voucher_type=%s and voucher_no=%s""", (voucher_type, voucher_no)) |
Anand Doshi | 2ce39cf | 2014-04-07 18:51:58 +0530 | [diff] [blame] | 355 | |
Nabin Hait | becf75d | 2014-03-27 17:18:29 +0530 | [diff] [blame] | 356 | if not warehouse_account: |
Nabin Hait | 6d7b0ce | 2017-06-15 11:09:27 +0530 | [diff] [blame] | 357 | warehouse_account = get_warehouse_account_map() |
Nabin Hait | b9e0481 | 2014-09-26 14:22:18 +0530 | [diff] [blame] | 358 | |
| 359 | future_stock_vouchers = get_future_stock_vouchers(posting_date, posting_time, for_warehouses, for_items) |
Nabin Hait | becf75d | 2014-03-27 17:18:29 +0530 | [diff] [blame] | 360 | gle = get_voucherwise_gl_entries(future_stock_vouchers, posting_date) |
Rushabh Mehta | ffd80a6 | 2017-01-16 17:23:20 +0530 | [diff] [blame] | 361 | |
Nabin Hait | becf75d | 2014-03-27 17:18:29 +0530 | [diff] [blame] | 362 | for voucher_type, voucher_no in future_stock_vouchers: |
| 363 | existing_gle = gle.get((voucher_type, voucher_no), []) |
Rushabh Mehta | 0a0f249 | 2014-03-31 17:27:06 +0530 | [diff] [blame] | 364 | voucher_obj = frappe.get_doc(voucher_type, voucher_no) |
Nabin Hait | becf75d | 2014-03-27 17:18:29 +0530 | [diff] [blame] | 365 | expected_gle = voucher_obj.get_gl_entries(warehouse_account) |
| 366 | if expected_gle: |
Nabin Hait | 99d4ff4 | 2016-08-08 14:12:16 +0530 | [diff] [blame] | 367 | if not existing_gle or not compare_existing_and_expected_gle(existing_gle, expected_gle): |
| 368 | _delete_gl_entries(voucher_type, voucher_no) |
Nabin Hait | 9784d27 | 2016-12-30 16:21:35 +0530 | [diff] [blame] | 369 | voucher_obj.make_gl_entries(gl_entries=expected_gle, repost_future_gle=False, from_repost=True) |
Nabin Hait | becf75d | 2014-03-27 17:18:29 +0530 | [diff] [blame] | 370 | else: |
| 371 | _delete_gl_entries(voucher_type, voucher_no) |
Anand Doshi | 2ce39cf | 2014-04-07 18:51:58 +0530 | [diff] [blame] | 372 | |
Nabin Hait | becf75d | 2014-03-27 17:18:29 +0530 | [diff] [blame] | 373 | def compare_existing_and_expected_gle(existing_gle, expected_gle): |
| 374 | matched = True |
| 375 | for entry in expected_gle: |
robert schouten | 6465711 | 2016-09-12 11:17:14 +0800 | [diff] [blame] | 376 | account_existed = False |
Nabin Hait | becf75d | 2014-03-27 17:18:29 +0530 | [diff] [blame] | 377 | for e in existing_gle: |
robert schouten | 6465711 | 2016-09-12 11:17:14 +0800 | [diff] [blame] | 378 | if entry.account == e.account: |
| 379 | account_existed = True |
| 380 | if entry.account == e.account and entry.against_account == e.against_account \ |
| 381 | and (not entry.cost_center or not e.cost_center or entry.cost_center == e.cost_center) \ |
| 382 | and (entry.debit != e.debit or entry.credit != e.credit): |
| 383 | matched = False |
| 384 | break |
| 385 | if not account_existed: |
| 386 | matched = False |
| 387 | break |
Nabin Hait | becf75d | 2014-03-27 17:18:29 +0530 | [diff] [blame] | 388 | return matched |
| 389 | |
Nabin Hait | b9e0481 | 2014-09-26 14:22:18 +0530 | [diff] [blame] | 390 | def get_future_stock_vouchers(posting_date, posting_time, for_warehouses=None, for_items=None): |
Nabin Hait | becf75d | 2014-03-27 17:18:29 +0530 | [diff] [blame] | 391 | future_stock_vouchers = [] |
Anand Doshi | 2ce39cf | 2014-04-07 18:51:58 +0530 | [diff] [blame] | 392 | |
Anand Doshi | 913c51b | 2014-08-27 22:09:03 +0530 | [diff] [blame] | 393 | values = [] |
Nabin Hait | becf75d | 2014-03-27 17:18:29 +0530 | [diff] [blame] | 394 | condition = "" |
| 395 | if for_items: |
Anand Doshi | 913c51b | 2014-08-27 22:09:03 +0530 | [diff] [blame] | 396 | condition += " and item_code in ({})".format(", ".join(["%s"] * len(for_items))) |
| 397 | values += for_items |
Anand Doshi | 2ce39cf | 2014-04-07 18:51:58 +0530 | [diff] [blame] | 398 | |
Nabin Hait | b9e0481 | 2014-09-26 14:22:18 +0530 | [diff] [blame] | 399 | if for_warehouses: |
| 400 | condition += " and warehouse in ({})".format(", ".join(["%s"] * len(for_warehouses))) |
| 401 | values += for_warehouses |
Anand Doshi | 2ce39cf | 2014-04-07 18:51:58 +0530 | [diff] [blame] | 402 | |
| 403 | for d in frappe.db.sql("""select distinct sle.voucher_type, sle.voucher_no |
Nabin Hait | becf75d | 2014-03-27 17:18:29 +0530 | [diff] [blame] | 404 | from `tabStock Ledger Entry` sle |
Anand Doshi | 913c51b | 2014-08-27 22:09:03 +0530 | [diff] [blame] | 405 | where timestamp(sle.posting_date, sle.posting_time) >= timestamp(%s, %s) {condition} |
| 406 | order by timestamp(sle.posting_date, sle.posting_time) asc, name asc""".format(condition=condition), |
| 407 | tuple([posting_date, posting_time] + values), as_dict=True): |
Nabin Hait | becf75d | 2014-03-27 17:18:29 +0530 | [diff] [blame] | 408 | future_stock_vouchers.append([d.voucher_type, d.voucher_no]) |
Anand Doshi | 2ce39cf | 2014-04-07 18:51:58 +0530 | [diff] [blame] | 409 | |
Nabin Hait | becf75d | 2014-03-27 17:18:29 +0530 | [diff] [blame] | 410 | return future_stock_vouchers |
Anand Doshi | 2ce39cf | 2014-04-07 18:51:58 +0530 | [diff] [blame] | 411 | |
Nabin Hait | becf75d | 2014-03-27 17:18:29 +0530 | [diff] [blame] | 412 | def get_voucherwise_gl_entries(future_stock_vouchers, posting_date): |
| 413 | gl_entries = {} |
| 414 | if future_stock_vouchers: |
Anand Doshi | 2ce39cf | 2014-04-07 18:51:58 +0530 | [diff] [blame] | 415 | for d in frappe.db.sql("""select * from `tabGL Entry` |
| 416 | where posting_date >= %s and voucher_no in (%s)""" % |
| 417 | ('%s', ', '.join(['%s']*len(future_stock_vouchers))), |
Nabin Hait | becf75d | 2014-03-27 17:18:29 +0530 | [diff] [blame] | 418 | tuple([posting_date] + [d[1] for d in future_stock_vouchers]), as_dict=1): |
| 419 | gl_entries.setdefault((d.voucher_type, d.voucher_no), []).append(d) |
Anand Doshi | 2ce39cf | 2014-04-07 18:51:58 +0530 | [diff] [blame] | 420 | |
Nabin Hait | 6d7b0ce | 2017-06-15 11:09:27 +0530 | [diff] [blame] | 421 | return gl_entries |