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

Merge branch 'master' into develop

Browse Source
This commit is contained in:
mbauskar 2017-07-20 16:49:30 +05:30
commit 6c8d4678db
3 changed files with 9 additions and 10 deletions
Show Stats 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.5.3' __version__ = '8.5.4'
def get_default_company(user=None): def get_default_company(user=None):
'''Get default company for user''' '''Get default company for user'''

8
erpnext/public/js/setup_wizard.js
View File

@ -236,7 +236,7 @@ var erpnext_slides = [
help: __("List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later."), help: __("List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later."),
add_more: 1, add_more: 1,
max_count: 3, max_count: 3,
mandatory_entry: 1, mandatory_entry: 0,
fields: [ fields: [
{fieldtype:"Section Break"}, {fieldtype:"Section Break"},
{fieldtype:"Data", fieldname:"tax", label:__("Tax"), {fieldtype:"Data", fieldname:"tax", label:__("Tax"),
@ -308,8 +308,10 @@ var erpnext_slides = [
options:[__("Unit"), __("Nos"), __("Box"), __("Pair"), __("Kg"), __("Set"), options:[__("Unit"), __("Nos"), __("Box"), __("Pair"), __("Kg"), __("Set"),
__("Hour"), __("Minute"), __("Litre"), __("Meter"), __("Gram")], __("Hour"), __("Minute"), __("Litre"), __("Meter"), __("Gram")],
"default": __("Unit"), static: 1}, "default": __("Unit"), static: 1},
{fieldtype: "Check", fieldname: "is_sales_item", label:__("We sell this Item"), default: 1, static: 1}, {fieldtype: "Check", fieldname: "is_sales_item",
{fieldtype: "Check", fieldname: "is_purchase_item", label:__("We buy this Item"), static: 1}, label:__("We sell this Item"), default: 1, static: 1},
{fieldtype: "Check", fieldname: "is_purchase_item",
label:__("We buy this Item"), default: 1, static: 1},
{fieldtype:"Column Break"}, {fieldtype:"Column Break"},
{fieldtype:"Currency", fieldname:"item_price", label:__("Rate"), static: 1}, {fieldtype:"Currency", fieldname:"item_price", label:__("Rate"), static: 1},
{fieldtype:"Attach Image", fieldname:"item_img", label:__("Attach Image"), is_private: 0, static: 1}, {fieldtype:"Attach Image", fieldname:"item_img", label:__("Attach Image"), is_private: 0, static: 1},

9
erpnext/setup/setup_wizard/setup_wizard.py
View File

@ -287,12 +287,9 @@ def make_tax_account_and_template(company, account_name, tax_rate, template_name
if accounts: if accounts:
make_sales_and_purchase_tax_templates(accounts, template_name) make_sales_and_purchase_tax_templates(accounts, template_name)
except frappe.NameError, e: except frappe.NameError:
if e.args[2][0]==1062: pass
pass except RootNotEditable:
else:
raise
except RootNotEditable, e:
pass pass
def get_tax_account_group(company): def get_tax_account_group(company):