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

Merge pull request #73 from nabinhait/master

Browse Source 
issue fixed
This commit is contained in:
Nabin Hait
2011-09-07 02:48:36 -07:00
parent 8c572e1fb1 9e79aa814a
commit 139456cbd8
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
accounts/DocType Mapper/Sales Order-Receivable Voucher/Sales Order-Receivable Voucher.txt
View File

@@ -5,7 +5,7 @@
{ {
'creation': '2010-08-08 17:09:36', 'creation': '2010-08-08 17:09:36',
'docstatus': 0, 'docstatus': 0,
'modified': '2011-08-08 16:56:40', 'modified': '2011-08-31 16:53:11',
'modified_by': 'Administrator', 'modified_by': 'Administrator',
'owner': 'Administrator' 'owner': 'Administrator'
}, },
@@ -31,7 +31,7 @@
# These values are common for all DocType Mapper # These values are common for all DocType Mapper
{ {
'doctype': 'DocType Mapper', 'doctype': u'DocType Mapper',
'from_doctype': 'Sales Order', 'from_doctype': 'Sales Order',
'module': 'Accounts', 'module': 'Accounts',
'name': '__common__', 'name': '__common__',
@@ -41,7 +41,7 @@
# DocType Mapper, Sales Order-Receivable Voucher # DocType Mapper, Sales Order-Receivable Voucher
{ {
'doctype': 'DocType Mapper', 'doctype': u'DocType Mapper',
'name': 'Sales Order-Receivable Voucher' 'name': 'Sales Order-Receivable Voucher'
}, },
@@ -128,7 +128,7 @@
'match_id': 1, 'match_id': 1,
'to_field': 'entries', 'to_field': 'entries',
'to_table': 'RV Detail', 'to_table': 'RV Detail',
'validation_logic': 'amount > ifnull(billed_amt, 0) and docstatus = 1' 'validation_logic': 'docstatus = 1'
}, },
# Table Mapper Detail # Table Mapper Detail

6
patches/patch.py
View File

@@ -1,7 +1,7 @@
# REMEMBER to update this # REMEMBER to update this
# ======================== # ========================
last_patch = 355 last_patch = 356
#------------------------------------------- #-------------------------------------------
@@ -305,4 +305,6 @@ def execute(patch_no):
elif patch_no == 355: elif patch_no == 355:
reload_doc('hr', 'doctype', 'salary_slip') reload_doc('hr', 'doctype', 'salary_slip')
delete_doc('DocType', 'Salary Control Panel') delete_doc('DocType', 'Salary Control Panel')
elif patch_no == 356:
reload_doc('doctype', 'core', 'doctype')
sql("update `tabDocType` set default_print_format = 'Standard'")

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

@@ -444,7 +444,7 @@ class DocType(TransactionBase):
def update_pack_nett_weight(self): def update_pack_nett_weight(self):
for d in getlist(self.doclist, 'delivery_note_details'): for d in getlist(self.doclist, 'delivery_note_details'):
if d.item_name: if d.item_name:
item_wt = sql("select nett_weight from `tabItem` where item_name = '%s'" % (d.item_name)) item_wt = sql("select nett_weight from `tabItem` where item_name = %s", (d.item_name))
d.pack_nett_wt = item_wt and flt(item_wt[0][0])*flt(d.qty) or 0 d.pack_nett_wt = item_wt and flt(item_wt[0][0])*flt(d.qty) or 0
# ========================================== # ==========================================