Nabin Hait c0c2f75159 fixed conflict

2016-08-31 12:36:03 +05:30

..

accounts

Merge pull request #6211 from rohitwaghchaure/v7.1_fixes

2016-08-31 12:12:48 +05:30

buying

Coded column deleted, column added from UI

2016-08-26 14:32:38 +05:30

change_log

Change logs for v7

2016-08-22 15:50:21 +05:30

config

Merge pull request #5963 from neilLasrado/assessment

2016-08-08 12:50:10 +05:30

controllers

Merge pull request #6178 from nabinhait/status_updater_fix

2016-08-26 12:09:39 +05:30

crm

docs updated

2016-08-16 18:13:12 +05:30

demo

Fixed Demo

2016-08-25 18:31:42 +05:30

docs

fixed conflict

2016-08-31 12:36:03 +05:30

hr

Merge pull request #6202 from KanchanChauhan/component-type-added

2016-08-29 16:19:05 +05:30

hub_node

removed Is Sales Item and Is Purchase Item

2016-04-15 12:57:00 +05:30

maintenance

[minor][fix] end date should not be less or equal to start date

2016-07-26 17:18:45 +05:30

manufacturing

Coded column deleted, column added from UI

2016-08-26 14:32:38 +05:30

patches

[Patch] Fixed error unknown column 'type' in 'field list'

2016-08-30 01:41:35 +05:30

portal

[minor] validate permission in Process Payroll and all products fix for home page

2016-08-29 11:03:10 +05:30

projects

[Fix] Billing Hours showing blank on sales invoice

2016-08-29 13:37:13 +05:30

public

Fixed version conflict

2016-08-29 11:47:50 +05:30

schools

Fixed Demo

2016-08-25 18:31:42 +05:30

selling

Coded column deleted, column added from UI

2016-08-26 14:32:38 +05:30

setup

docs updated

2016-08-16 18:13:12 +05:30

shopping_cart

[redesign] website routing system

2016-06-24 16:18:07 +05:30

startup

Rename Time Sheet doctype

2016-07-06 20:38:50 +05:30

stock

dont run duplicate set status on submit

2016-08-30 08:21:20 +08:00

support

[fix] Legend in support analytics chart

2016-08-18 16:14:23 +05:30

templates

[minor] validate permission in Process Payroll and all products fix for home page

2016-08-29 11:03:10 +05:30

tests

[minor] setting up website optional in setup wizard

2016-08-09 16:44:37 +05:30

translations

New Languages added:

2016-08-25 15:23:40 +05:30

utilities

[fix] quick entry

2016-07-25 15:03:39 +05:30

__init__.py

bumped to version 7.0.34

2016-08-29 12:17:30 +06:00

exceptions.py

…

hooks.py

Portal settings for schools

2016-08-09 17:08:13 +05:30

modules.txt

Merge ERPNext Schools into ERPNext

2016-07-20 19:25:02 +05:30

patches.txt

'Type' field added to Salary Component

2016-08-29 15:26:57 +05:30