Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes in purchase invoice

Browse Source
This commit is contained in:
Anand Doshi 2013-03-26 12:13:14 +05:30
parent 6dcee5a1f8
commit fc33ef6bfb
5 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
accounts/doctype/purchase_invoice/purchase_invoice.py
View File

@ -306,6 +306,8 @@ class DocType(BuyingController):
def set_against_expense_account(self): def set_against_expense_account(self):
auto_inventory_accounting = \ auto_inventory_accounting = \
cint(webnotes.defaults.get_global_default("auto_inventory_accounting")) cint(webnotes.defaults.get_global_default("auto_inventory_accounting"))
if auto_inventory_accounting:
stock_not_billed_account = self.get_company_default("stock_received_but_not_billed") stock_not_billed_account = self.get_company_default("stock_received_but_not_billed")
against_accounts = [] against_accounts = []

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

@ -641,7 +641,6 @@ class DocType(SellingController):
self.values.append({ self.values.append({
'item_code' : d['item_code'], 'item_code' : d['item_code'],
'warehouse' : wh, 'warehouse' : wh,
'transaction_date' : getdate(self.doc.modified).strftime('%Y-%m-%d'),
'posting_date' : self.doc.posting_date, 'posting_date' : self.doc.posting_date,
'posting_time' : self.doc.posting_time, 'posting_time' : self.doc.posting_time,
'voucher_type' : 'Sales Invoice', 'voucher_type' : 'Sales Invoice',

8
setup/doctype/email_settings/email_settings.txt
View File

@ -1,10 +1,10 @@
[ [
{ {
"creation": "2012-07-12 23:29:44", "creation": "2013-03-25 17:53:21",
"docstatus": 0, "docstatus": 0,
"modified": "2013-03-25 17:32:05", "modified": "2013-03-25 18:41:27",
"modified_by": "Administrator", "modified_by": "Administrator",
"owner": "harshada@webnotestech.com" "owner": "Administrator"
}, },
{ {
"allow_copy": 1, "allow_copy": 1,
@ -34,9 +34,7 @@
"parenttype": "DocType", "parenttype": "DocType",
"permlevel": 0, "permlevel": 0,
"read": 1, "read": 1,
"report": 0,
"role": "System Manager", "role": "System Manager",
"submit": 0,
"write": 1 "write": 1
}, },
{ {

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

@ -377,7 +377,6 @@ class DocType(SellingController):
self.values.append({ self.values.append({
'item_code' : d['item_code'], 'item_code' : d['item_code'],
'warehouse' : wh, 'warehouse' : wh,
'transaction_date' : getdate(self.doc.modified).strftime('%Y-%m-%d'),
'posting_date' : self.doc.posting_date, 'posting_date' : self.doc.posting_date,
'posting_time' : self.doc.posting_time, 'posting_time' : self.doc.posting_time,
'voucher_type' : 'Delivery Note', 'voucher_type' : 'Delivery Note',

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

@ -776,8 +776,6 @@ def make_return_jv(stock_entry):
from accounts.utils import get_balance_on from accounts.utils import get_balance_on
for r in result: for r in result:
if not r.get("account"):
print result
jv_list.append({ jv_list.append({
"__islocal": 1, "__islocal": 1,
"doctype": "Journal Voucher Detail", "doctype": "Journal Voucher Detail",