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:
Nabin Hait 2016-10-31 15:04:31 +05:30
commit d9b994de91
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__init__.py
View File

@ -2,7 +2,7 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe import frappe
__version__ = '7.1.1' __version__ = '7.1.2'
def get_default_company(user=None): def get_default_company(user=None):
'''Get default company for user''' '''Get default company for user'''

2
erpnext/projects/doctype/timesheet/timesheet.py
View File

@ -369,7 +369,7 @@ def get_events(start, end, filters=None):
conditions = get_conditions(filters) conditions = get_conditions(filters)
return frappe.db.sql("""select `tabTimesheet Detail`.name as name, return frappe.db.sql("""select `tabTimesheet Detail`.name as name,
`tabTimesheet Detail`.docstatus as status, `tabTimesheet Detail`.parent as parent, `tabTimesheet Detail`.docstatus as status, `tabTimesheet Detail`.parent as parent,
from_time, hours, activity_type, project, to_time from_time as start_date, hours, activity_type, project, to_time as end_date
from `tabTimesheet Detail`, `tabTimesheet` from `tabTimesheet Detail`, `tabTimesheet`
where `tabTimesheet Detail`.parent = `tabTimesheet`.name where `tabTimesheet Detail`.parent = `tabTimesheet`.name
and `tabTimesheet`.docstatus < 2 and `tabTimesheet`.docstatus < 2

2
erpnext/setup/setup_wizard/data/country_wise_tax.json
View File

@ -1039,7 +1039,7 @@
} }
}, },
"Russia": { "Russian Federation": {
"Russia VAT 18%": { "Russia VAT 18%": {
"account_name": "VAT 18%", "account_name": "VAT 18%",
"tax_rate": 18.00, "tax_rate": 18.00,

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

@ -247,7 +247,7 @@ def get_fy_details(fy_start_date, fy_end_date):
def create_sales_tax(args): def create_sales_tax(args):
country_wise_tax = get_country_wise_tax(args.get("country")) country_wise_tax = get_country_wise_tax(args.get("country"))
if len(country_wise_tax)>0: if country_wise_tax and len(country_wise_tax) > 0:
for sales_tax, tax_data in country_wise_tax.items(): for sales_tax, tax_data in country_wise_tax.items():
make_tax_account_and_template(args.get("company_name").strip(), make_tax_account_and_template(args.get("company_name").strip(),
tax_data.get('account_name'), tax_data.get('tax_rate'), sales_tax) tax_data.get('account_name'), tax_data.get('tax_rate'), sales_tax)