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

[Cleanup] Sales Common deprecated

Browse Source
This commit is contained in:
Nabin Hait
2013-10-18 12:29:11 +05:30
parent d05a3b3b5c
commit d1fd1e2d89
42 changed files with 219 additions and 727 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
accounts/doctype/sales_invoice/sales_invoice.js
View File

@@ -11,7 +11,7 @@ cur_frm.pformat.print_heading = 'Invoice';
wn.require('app/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.js');
wn.require('app/utilities/doctype/sms_control/sms_control.js');
wn.require('app/selling/doctype/sales_common/sales_common.js');
wn.require('app/selling/sales_common.js');
wn.require('app/accounts/doctype/sales_invoice/pos.js');
wn.provide("erpnext.accounts");

34
accounts/doctype/sales_invoice/sales_invoice.py
View File

@@ -48,11 +48,7 @@ class DocType(SellingController):
self.validate_proj_cust()
self.validate_with_previous_doc()
self.validate_uom_is_integer("stock_uom", "qty")
sales_com_obj = get_obj('Sales Common')
sales_com_obj.check_stop_sales_order(self)
sales_com_obj.check_active_sales_items(self)
sales_com_obj.validate_max_discount(self, 'entries')
self.check_stop_sales_order("sales_order")
self.validate_customer_account()
self.validate_debit_acc()
self.validate_fixed_asset_account()
@@ -110,8 +106,7 @@ class DocType(SellingController):
if cint(self.doc.update_stock) == 1:
self.update_stock_ledger()
sales_com_obj = get_obj(dt = 'Sales Common')
sales_com_obj.check_stop_sales_order(self)
self.check_stop_sales_order("sales_order")
from accounts.utils import remove_against_link_from_jv
remove_against_link_from_jv(self.doc.doctype, self.doc.name, "against_invoice")
@@ -255,19 +250,7 @@ class DocType(SellingController):
else:
due_date = self.doc.posting_date
return due_date
def get_barcode_details(self, barcode):
return get_obj('Sales Common').get_barcode_details(barcode)
def get_adj_percent(self, arg=''):
"""Fetch ref rate from item master as per selected price list"""
get_obj('Sales Common').get_adj_percent(self)
def get_comm_rate(self, sales_partner):
"""Get Commission rate of Sales Partner"""
return get_obj('Sales Common').get_comm_rate(sales_partner, self)
return due_date
def get_advances(self):
super(DocType, self).get_advances(self.doc.debit_to,
@@ -470,10 +453,6 @@ class DocType(SellingController):
w = ps[0][1]
return w
def make_packing_list(self):
get_obj('Sales Common').make_packing_list(self,'entries')
def on_update(self):
if cint(self.doc.update_stock) == 1:
# Set default warehouse from pos setting
@@ -484,7 +463,8 @@ class DocType(SellingController):
if not d.warehouse:
d.warehouse = cstr(w)
self.make_packing_list()
from stock.doctype.packed_item.packed_item import make_packing_list
make_packing_list(self, 'entries')
else:
self.doclist = self.doc.clear_table(self.doclist, 'packing_details')
@@ -516,8 +496,7 @@ class DocType(SellingController):
def update_stock_ledger(self):
sl_entries = []
items = get_obj('Sales Common').get_item_list(self)
for d in items:
for d in self.get_item_list():
if webnotes.conn.get_value("Item", d.item_code, "is_stock_item") == "Yes" \
and d.warehouse:
sl_entries.append(self.get_sl_entries(d, {
@@ -860,7 +839,6 @@ def send_notification(new_rv):
def notify_errors(inv, owner):
import webnotes
import website
exception_msg = """
Dear User,