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

Merge branch 'develop'

Browse Source
This commit is contained in:
Pratik Vyas
2015-05-22 16:52:25 +05:30
parent 1686876b23 08e04ef01a
commit 866e9047b0
7 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__version__.py
View File

@@ -1,2 +1,2 @@
from __future__ import unicode_literals from __future__ import unicode_literals
__version__ = '5.0.7' __version__ = '5.0.8'

2
erpnext/config/accounts.py
View File

@@ -114,7 +114,7 @@ def get_data():
{ {
"type": "doctype", "type": "doctype",
"name": "POS Profile", "name": "POS Profile",
"label": _("Point-of-Sale Setting"), "label": _("Point-of-Sale Profile"),
"description": _("Rules to calculate shipping amount for a sale") "description": _("Rules to calculate shipping amount for a sale")
}, },
{ {

2
erpnext/hooks.py
View File

@@ -5,7 +5,7 @@ app_publisher = "Frappe Technologies Pvt. Ltd. and Contributors"
app_description = "Open Source Enterprise Resource Planning for Small and Midsized Organizations" app_description = "Open Source Enterprise Resource Planning for Small and Midsized Organizations"
app_icon = "icon-th" app_icon = "icon-th"
app_color = "#e74c3c" app_color = "#e74c3c"
app_version = "5.0.7" app_version = "5.0.8"
error_report_email = "support@erpnext.com" error_report_email = "support@erpnext.com"

23
erpnext/patches/v4_2/party_model.py
View File

@@ -19,20 +19,21 @@ def create_receivable_payable_account():
receivable_payable_accounts = frappe._dict() receivable_payable_accounts = frappe._dict()
def _create_account(args): def _create_account(args):
account_id = frappe.db.get_value("Account", if args["parent_account"]:
{"account_name": args["account_name"], "company": args["company"]}) account_id = frappe.db.get_value("Account",
if not account_id: {"account_name": args["account_name"], "company": args["company"]})
account = frappe.new_doc("Account") if not account_id:
account.is_group = 0 account = frappe.new_doc("Account")
account.update(args) account.is_group = 0
account.insert() account.update(args)
account.insert()
account_id = account.name account_id = account.name
frappe.db.set_value("Company", args["company"], ("default_receivable_account" frappe.db.set_value("Company", args["company"], ("default_receivable_account"
if args["account_type"]=="Receivable" else "default_payable_account"), account_id) if args["account_type"]=="Receivable" else "default_payable_account"), account_id)
receivable_payable_accounts.setdefault(args["company"], {}).setdefault(args["account_type"], account_id) receivable_payable_accounts.setdefault(args["company"], {}).setdefault(args["account_type"], account_id)
for company in frappe.db.sql_list("select name from tabCompany"): for company in frappe.db.sql_list("select name from tabCompany"):
_create_account({ _create_account({

4
erpnext/stock/report/stock_balance/stock_balance.json
View File

@@ -1,12 +1,12 @@
{ {
"add_total_row": 0, "add_total_row": 1,
"apply_user_permissions": 1, "apply_user_permissions": 1,
"creation": "2014-10-10 17:58:11.577901", "creation": "2014-10-10 17:58:11.577901",
"disabled": 0, "disabled": 0,
"docstatus": 0, "docstatus": 0,
"doctype": "Report", "doctype": "Report",
"is_standard": "Yes", "is_standard": "Yes",
"modified": "2014-10-10 17:58:11.577901", "modified": "2015-05-22 02:16:24.614986",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Stock Balance", "name": "Stock Balance",

3
erpnext/utilities/transaction_base.py
View File

@@ -51,7 +51,8 @@ class TransactionBase(StatusUpdater):
event.insert(ignore_permissions=True) event.insert(ignore_permissions=True)
if frappe.db.exists("User", self.contact_by): if frappe.db.exists("User", self.contact_by):
frappe.share.add("Event", event.name, self.contact_by) frappe.share.add("Event", event.name, self.contact_by,
flags={"ignore_share_permission": True})
def validate_uom_is_integer(self, uom_field, qty_fields): def validate_uom_is_integer(self, uom_field, qty_fields):
validate_uom_is_integer(self, uom_field, qty_fields) validate_uom_is_integer(self, uom_field, qty_fields)

2
setup.py
View File

@@ -1,6 +1,6 @@
from setuptools import setup, find_packages from setuptools import setup, find_packages
version = "5.0.7" version = "5.0.8"
with open("requirements.txt", "r") as f: with open("requirements.txt", "r") as f:
install_requires = f.readlines() install_requires = f.readlines()