Nabin Hait 6cb44133c3 Fixed version conflict

2016-10-18 16:18:34 +05:30

..

accounts

Fixed merge conflict

2016-10-18 15:37:33 +05:30

buying

Fixed merge conflict

2016-10-18 15:37:33 +05:30

change_log

Change logs for v7

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

config

[gantt] Gantt fixes (#6490)

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

controllers

Fixed merge conflict

2016-10-18 15:37:33 +05:30

crm

Fixed merge conflict

2016-10-18 15:37:33 +05:30

demo

rename total_billing_amount to total_billable_amount in timesheet doctype

2016-09-12 19:06:41 +05:30

docs

Fixed merge conflict

2016-10-18 15:37:33 +05:30

fleet_management

Fixes 6171 (#6417)

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

hr

Fixed merge conflict

2016-10-18 15:37:33 +05:30

hub_node

…

maintenance

Merge pull request #6267 from PawanMeh/fixes_6254

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

manufacturing

Fixed merge conflict

2016-10-18 15:37:33 +05:30

patches

[gantt] Gantt fixes (#6490)

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

portal

Fixed view button functionality in homepage

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

projects

Fixed merge conflict

2016-10-18 15:37:33 +05:30

public

Fixed merge conflict

2016-10-17 16:42:49 +05:30

schools

Fixed merge conflict

2016-10-18 15:37:33 +05:30

selling

Fixed version conflict

2016-10-18 16:18:34 +05:30

setup

[fix] install issue

2016-10-13 11:00:00 +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-10-18 15:37:33 +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

[refactor] has_website_permission parameters

2016-10-12 10:53:34 +05:30

tests

…

translations

Fixed merge conflict

2016-10-07 16:53:07 +05:30

utilities

[translation] [fixes] #5860

2016-09-15 15:17:04 +05:30

__init__.py

bumped to version 7.0.60

2016-10-18 16:48:17 +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

Patch fixed for Employee

2016-10-18 11:29:41 +05:30