Nabin Hait 406f0a38de Fixed merge conflicts

2016-09-05 15:44:18 +05:30

..

accounts

Fixed merge conflicts

2016-09-05 15:44:18 +05:30

buying

[Enhancement] Purchase return for rejected qty

2016-09-05 00:43:17 +05:30

change_log

Change logs for v7

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

config

Suggested Changes to School (#6223)

2016-09-03 21:05:06 +05:30

controllers

Fixed merge conflicts

2016-09-05 15:44:18 +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 in maintenance schedule

2016-09-05 15:14:26 +05:30

manufacturing

Fixed merge conflicts

2016-09-02 14:29:57 +05:30

patches

fixed version conflict

2016-09-02 16:19:54 +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

Fixed merge conflicts

2016-09-05 15:44:18 +05:30

public

[minor] new global for query report filters

2016-09-01 17:53:42 +05:30

schools

Suggested Changes to School (#6223)

2016-09-03 21:05:06 +05:30

selling

Coded column deleted, column added from UI

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

setup

Suggested Changes to School (#6223)

2016-09-03 21:05:06 +05:30

shopping_cart

[redesign] website routing system

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

startup

Notifications filters for DN, PR and PI

2016-09-05 14:35:40 +05:30

stock

added test cases

2016-09-05 00:43:17 +05:30

support

[fix] Legend in support analytics chart

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

templates

[RFQ] Web form alignment issue

2016-09-01 19:10:58 +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.39

2016-09-05 16:13:48 +06:00

exceptions.py

[Minor]Changed CustomerDisabled and CustomerFrozen to PartyDisabled and PartyFrozen

2016-01-25 21:25:11 +05:30

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

Fixed merge conflicts

2016-09-02 14:29:57 +05:30