Nabin Hait f4068fd6f1 Fixed merge conflict

2016-11-01 15:06:55 +05:30

..

accounts

Fixed merge conflict

2016-11-01 15:06:55 +05:30

buying

Update purchase_order_item.json

2016-10-26 12:47:35 +05:30

change_log

Change Logs for v7.1

2016-10-26 16:28:54 +05:30

config

[gantt] Gantt fixes (#6490)

2016-10-10 14:32:35 +05:30

controllers

[fix] Validate if warehouse is not linked to any account

2016-10-24 18:17:57 +05:30

crm

Contact by and contact date validations

2016-10-24 13:51:13 +05:30

demo

Fixes for demo

2016-10-31 17:13:30 +05:30

docs

Fixed merge conflict

2016-11-01 15:06:55 +05:30

fleet_management

Fixes 6171 (#6417)

2016-10-17 17:02:12 +05:30

hr

Merge pull request #6683 from KanchanChauhan/multiple-active-salary-slio

2016-10-24 11:23:57 +05:30

hub_node

…

maintenance

Merge pull request #6267 from PawanMeh/fixes_6254

2016-09-12 13:03:14 +05:30

manufacturing

Add description, stock UOM and Min Order Qty to MRs

2016-10-25 14:21:26 -07:00

patches

Fixed merge conflict

2016-11-01 15:06:55 +05:30

portal

Fixed view button functionality in homepage

2016-09-28 14:08:47 +05:30

projects

Fix calendar view for Timesheet

2016-10-26 11:02:48 -07:00

public

[minor] link formatter fixes for Item and Employee

2016-10-27 09:49:22 +05:30

schools

Added naming series to Course Schedule

2016-10-27 15:37:03 +05:30

selling

Update test_customer.py

2016-10-24 11:27:56 +05:30

setup

[Fix] country wise tax, country name issue

2016-10-28 18:01:43 +05:30

shopping_cart

…

startup

Notifications filters for DN, PR and PI

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

stock

Fixed merge conflict

2016-11-01 15:06:55 +05:30

support

Set warranty claim resolution date as today only if it is not set

2016-10-05 16:43:20 +05:30

templates

Fixed version conflict

2016-10-19 16:49:36 +05:30

tests

[minor] setting up website optional in setup wizard

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

translations

[translations]

2016-10-26 17:45:06 +05:30

utilities

Pythonic corrections

2016-10-18 17:30:24 +05:30

__init__.py

bumped to version 7.1.4

2016-11-01 15:35:53 +06:00

exceptions.py

…

hooks.py

[enhance] added roles for portal users frappe/frappe#2091 (#6452)

2016-09-23 21:51:51 +05:30

modules.txt

Fixes 6171 (#6417)

2016-10-17 17:02:12 +05:30

patches.txt

Fixed merge conflict

2016-11-01 15:06:55 +05:30