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

Merge branch 'master' into develop

Browse Source
This commit is contained in:
mbauskar
2017-08-08 16:07:57 +05:30
parent 7f476b4528 39ec7dc658
commit 53f0f62f1c
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__init__.py
View File

@@ -4,7 +4,7 @@ import inspect
import frappe import frappe
from erpnext.hooks import regional_overrides from erpnext.hooks import regional_overrides
__version__ = '8.7.3' __version__ = '8.8.0'
def get_default_company(user=None): def get_default_company(user=None):
'''Get default company for user''' '''Get default company for user'''

6
erpnext/demo/setup/setup_data.py
View File

@@ -2,6 +2,7 @@ from __future__ import unicode_literals
import random, json import random, json
import frappe, erpnext import frappe, erpnext
from frappe.utils.nestedset import get_root_of
from frappe.utils import flt, now_datetime, cstr, random_string from frappe.utils import flt, now_datetime, cstr, random_string
from frappe.utils.make_random import add_random_children, get_random from frappe.utils.make_random import add_random_children, get_random
from erpnext.demo.domains import data from erpnext.demo.domains import data
@@ -361,10 +362,13 @@ def setup_pos_profile():
pos.update_stock = 0 pos.update_stock = 0
pos.write_off_account = 'Cost of Goods Sold - '+ company_abbr pos.write_off_account = 'Cost of Goods Sold - '+ company_abbr
pos.write_off_cost_center = 'Main - '+ company_abbr pos.write_off_cost_center = 'Main - '+ company_abbr
pos.customer_group = get_root_of('Customer Group')
pos.territory = get_root_of('Territory')
pos.append('payments', { pos.append('payments', {
'mode_of_payment': frappe.db.get_value('Mode of Payment', {'type': 'Cash'}, 'name'), 'mode_of_payment': frappe.db.get_value('Mode of Payment', {'type': 'Cash'}, 'name'),
'amount': 0.0 'amount': 0.0,
'default': 1
}) })
pos.insert() pos.insert()