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

install, web serving, session booting webnotes/wnframework#351

Browse Source
This commit is contained in:
Rushabh Mehta
2013-12-12 19:12:19 +05:30
parent d2dd83c3a3
commit 1f84799f2d
199 changed files with 583 additions and 512 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
erpnext/utilities/transaction_base.py
View File

@@ -2,12 +2,12 @@
# License: GNU General Public License v3. See license.txt
from __future__ import unicode_literals
import webnotes
import webnotes, json
from webnotes import msgprint, _
from webnotes.utils import load_json, cstr, flt, now_datetime, cint
from webnotes.utils import cstr, flt, now_datetime, cint
from webnotes.model.doc import addchild
from controllers.status_updater import StatusUpdater
from erpnext.controllers.status_updater import StatusUpdater
class TransactionBase(StatusUpdater):
def get_default_address_and_contact(self, party_field, party_name=None):
@@ -145,7 +145,7 @@ class TransactionBase(StatusUpdater):
self.doc.fields.update(self.get_lead_defaults())
def get_customer_address(self, args):
args = load_json(args)
args = json.loads(args)
ret = {
'customer_address' : args["address"],
'address_display' : get_address_display(args["address"]),
@@ -170,7 +170,7 @@ class TransactionBase(StatusUpdater):
# -----------------------
def get_default_supplier_address(self, args):
if isinstance(args, basestring):
args = load_json(args)
args = json.loads(args)
address_name = get_default_address("supplier", args["supplier"])
ret = {
@@ -184,7 +184,7 @@ class TransactionBase(StatusUpdater):
# Get Supplier Address
# -----------------------
def get_supplier_address(self, args):
args = load_json(args)
args = json.loads(args)
ret = {
'supplier_address' : args['address'],
'address_display' : get_address_display(args["address"]),
@@ -439,7 +439,7 @@ def validate_conversion_rate(currency, conversion_rate, conversion_rate_label, c
}, raise_exception=True)
def validate_item_fetch(args, item):
from stock.utils import validate_end_of_life
from erpnext.stock.utils import validate_end_of_life
validate_end_of_life(item.name, item.end_of_life)
# validate company