Nabin Hait 05245d6328 Merge pull request #6661 from KanchanChauhan/demo-fixed-processpayroll-ss ...

Demo fixed for Process Payroll and Salary Structure

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

..

accounts

[Feature] Countrywise sales tax template

2016-10-20 15:56:07 +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

Demo fixed for Process Payroll and Salary Structure

2016-10-20 16:04:09 +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

[fix] duplicate columns in monthly salary report #6623

2016-10-20 12:55:23 +05:30

hub_node

…

maintenance

Merge pull request #6267 from PawanMeh/fixes_6254

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

manufacturing

Fixed version conflict

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

patches

Set prefered contact email in Employee

2016-10-19 18:26:01 +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 version conflict

2016-10-18 18:35:42 +05:30

selling

Fixed version conflict

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

setup

Create tax template based on country

2016-10-20 15:56:07 +05:30

shopping_cart

…

startup

Notifications filters for DN, PR and PI

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

stock

Fixed version conflict

2016-10-19 16:49:36 +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

…

translations

Fixed merge conflict

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

utilities

Pythonic corrections

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

__init__.py

bumped to version 7.0.62

2016-10-19 17:18:04 +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

Set prefered contact email in Employee

2016-10-19 18:26:01 +05:30