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

[issues #437] [fix] pulling terms and conditions

Browse Source
This commit is contained in:
Anand Doshi
2013-06-05 14:11:32 +05:30
parent 8f81623240
commit bf3e54a45b
21 changed files with 37 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
stock/doctype/delivery_note/delivery_note.py
View File

@@ -91,9 +91,6 @@ class DocType(SellingController):
d.actual_qty = actual_qty and flt(actual_qty[0][0]) or 0
def get_tc_details(self):
return get_obj('Sales Common').get_tc_details(self)
def get_barcode_details(self, barcode):
return get_obj('Sales Common').get_barcode_details(barcode)

3
stock/doctype/delivery_note/delivery_note.txt
View File

@@ -2,7 +2,7 @@
{
"creation": "2013-05-24 19:29:09",
"docstatus": 0,
"modified": "2013-05-28 12:26:04",
"modified": "2013-05-28 12:26:10",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -602,7 +602,6 @@
"fieldtype": "Button",
"label": "Get Terms and Conditions",
"oldfieldtype": "Button",
"options": "get_tc_details",
"print_hide": 1,
"read_only": 0
},

5
stock/doctype/material_request/material_request.py
View File

@@ -64,11 +64,6 @@ class DocType(BuyingController):
def validate_fiscal_year(self):
get_obj(dt = 'Purchase Common').validate_fiscal_year(self.doc.fiscal_year,self.doc.transaction_date,'Material Request Date')
# GET TERMS & CONDITIONS
#-----------------------------
def get_tc_details(self):
return get_obj('Purchase Common').get_tc_details(self)
# Validate Schedule Date
#--------------------------------
def validate_schedule_date(self):

5
stock/doctype/material_request/material_request.txt
View File

@@ -2,7 +2,7 @@
{
"creation": "2013-03-07 14:48:38",
"docstatus": 0,
"modified": "2013-04-24 10:47:50",
"modified": "2013-04-24 10:47:55",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -311,8 +311,7 @@
"fieldname": "get_terms",
"fieldtype": "Button",
"label": "Get Terms and Conditions",
"oldfieldtype": "Button",
"options": "get_tc_details"
"oldfieldtype": "Button"
},
{
"doctype": "DocField",

6
stock/doctype/purchase_receipt/purchase_receipt.py
View File

@@ -48,12 +48,6 @@ class DocType(BuyingController):
def validate_fiscal_year(self):
get_obj(dt = 'Purchase Common').validate_fiscal_year(self.doc.fiscal_year,self.doc.posting_date,'Transaction Date')
# GET TERMS & CONDITIONS
# =====================================================================================
def get_tc_details(self):
return get_obj('Purchase Common').get_tc_details(self)
# get available qty at warehouse
def get_bin_details(self, arg = ''):
return get_obj(dt='Purchase Common').get_bin_details(arg)

5
stock/doctype/purchase_receipt/purchase_receipt.txt
View File

@@ -2,7 +2,7 @@
{
"creation": "2013-05-21 16:16:39",
"docstatus": 0,
"modified": "2013-05-28 12:21:17",
"modified": "2013-05-28 12:21:20",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -553,8 +553,7 @@
"fieldname": "get_terms",
"fieldtype": "Button",
"label": "Get Terms and Conditions",
"oldfieldtype": "Button",
"options": "get_tc_details"
"oldfieldtype": "Button"
},
{
"doctype": "DocField",