Nabin Hait a9ecc0b700 Merge branch 'master' into develop

2016-12-14 14:33:06 +05:30

..

accounts

Merge branch 'master' into develop

2016-12-14 14:33:06 +05:30

buying

Fixed merge conflict

2016-12-09 15:49:24 +05:30

change_log

…

config

[new Feature] Added Training Module

2016-12-13 15:42:12 +05:30

controllers

date is optional in get_exchange_rate

2016-12-09 12:14:47 +05:30

crm

date is optional in get_exchange_rate

2016-12-09 12:14:47 +05:30

demo

date is optional in get_exchange_rate

2016-12-09 12:14:47 +05:30

docs

Merge pull request #7211 from frappe/shachiTakalkar-patch-1

2016-12-14 12:54:58 +05:30

fleet_management

[minor] rename icons as per FontAwesome 4 (#7136)

2016-12-05 14:17:26 +05:30

hr

Merge pull request #6855 from neilLasrado/training

2016-12-14 12:51:51 +05:30

hub_node

…

maintenance

[minor] rename icons as per FontAwesome 4 (#7136)

2016-12-05 14:17:26 +05:30

manufacturing

mendatory hours field

2016-12-14 11:32:23 +05:30

patches

Fixed merge conflict

2016-12-13 14:30:32 +05:30

portal

…

projects

[Minor] Read permissions to Employee on Activity Type and Appraisal Template

2016-12-13 14:16:57 +05:30

public

Merge pull request #7170 from rohitwaghchaure/pos_enhancement_v7_2

2016-12-14 12:52:28 +05:30

schools

[new Feature] Added Training Module

2016-12-13 15:42:12 +05:30

selling

Fixed merge conflict

2016-12-06 16:16:58 +05:30

setup

Merge pull request #7181 from KanchanChauhan/sales-person-status

2016-12-13 11:28:36 +05:30

shopping_cart

Replaced spaces with tabs

2016-12-08 15:44:16 +05:30

startup

Revert "[optimize] remove count(*) from queries"

2016-11-21 21:04:47 +05:30

stock

Fixed merge conflict

2016-12-13 14:30:32 +05:30

support

Fixed merge conflict

2016-12-13 14:30:32 +05:30

templates

[minor] font-awesome fixes

2016-12-05 15:02:24 +05:30

tests

…

translations

Merge branch 'master' into develop

2016-11-17 16:41:52 +05:30

utilities

Merge branch 'master' into develop

2016-12-14 14:33:06 +05:30

__init__.py

bumped to version 7.1.25

2016-12-14 15:03:06 +06:00

exceptions.py

…

hooks.py

[minor] update font awesome icons

2016-12-07 11:09:02 +05:30

modules.txt

…

patches.txt

Fixed merge conflict

2016-12-13 14:30:32 +05:30