[selling] [calculations] client side calculations, cleanup, patch fixes

This commit is contained in:
Anand Doshi
2013-05-21 19:35:06 +05:30
parent b5aa8da0dd
commit f309613a7d
23 changed files with 1174 additions and 1318 deletions

View File

@@ -114,16 +114,6 @@ class DocType(SellingController):
def get_rate(self,arg):
return get_obj('Sales Common').get_rate(arg)
def load_default_taxes(self):
self.doclist = get_obj('Sales Common').load_default_taxes(self)
def get_other_charges(self):
"""Pull details from Sales Taxes and Charges Master"""
self.doclist = get_obj('Sales Common').get_other_charges(self)
def so_required(self):
"""check in manage account if sales order required or not"""
if webnotes.conn.get_value('Global Defaults', 'Global Defaults', 'so_required') == 'Yes':
@@ -152,7 +142,6 @@ class DocType(SellingController):
self.validate_warehouse()
sales_com_obj.validate_max_discount(self, 'delivery_note_details')
sales_com_obj.get_allocated_sum(self)
sales_com_obj.check_conversion_rate(self)
# Set actual qty for each item in selected warehouse

View File

@@ -1,8 +1,8 @@
[
{
"creation": "2013-05-06 12:03:30",
"creation": "2013-05-21 16:16:31",
"docstatus": 0,
"modified": "2013-05-06 13:08:13",
"modified": "2013-05-21 18:30:32",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -223,7 +223,8 @@
"oldfieldtype": "Table",
"options": "Delivery Note Item",
"print_hide": 0,
"read_only": 0
"read_only": 0,
"reqd": 1
},
{
"doctype": "DocField",
@@ -443,6 +444,15 @@
"read_only": 1,
"width": "150px"
},
{
"doctype": "DocField",
"fieldname": "other_charges_total_export",
"fieldtype": "Currency",
"label": "Taxes and Charges Total (Export)",
"options": "company",
"print_hide": 1,
"read_only": 1
},
{
"doctype": "DocField",
"fieldname": "calculate_charges",

View File

@@ -1,8 +1,8 @@
[
{
"creation": "2013-04-01 10:49:21",
"creation": "2013-04-19 13:31:02",
"docstatus": 0,
"modified": "2013-04-17 17:20:58",
"modified": "2013-05-21 16:47:16",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -120,7 +120,7 @@
"options": "currency",
"print_hide": 1,
"print_width": "100px",
"read_only": 0,
"read_only": 1,
"reqd": 0,
"width": "100px"
},
@@ -189,7 +189,7 @@
"options": "Company:company:default_currency",
"print_hide": 1,
"print_width": "150px",
"read_only": 0,
"read_only": 1,
"reqd": 0,
"width": "150px"
},