Nabin Hait 448acf6f46 Merge branch 'master' into develop

2017-01-13 17:30:46 +05:30

..

accounts

Fixed merge conflict

2017-01-13 14:34:54 +05:30

buying

fixed conflict

2017-01-09 17:21:34 +05:30

change_log

changed version to beta

2016-12-15 19:37:53 +05:30

config

Changes to Salary Register

2017-01-11 19:45:01 +05:30

controllers

Fixed merge conflict

2017-01-13 14:34:54 +05:30

crm

Email ID renamed to Email Address

2017-01-03 16:45:38 +05:30

demo

[fix] paging for products (support)

2016-12-19 11:55:10 +05:30

docs

Update step-8-customer-names.md

2017-01-05 08:34:58 +05:30

fleet_management

Optimization to reduce GLE reposting time for future stock transactions

2016-12-30 16:21:35 +05:30

hr

Merge pull request #7453 from KanchanChauhan/salary-register-report

2017-01-13 11:51:48 +05:30

hub_node

…

maintenance

[Minor] Field type of Description field changed to Text Editor

2017-01-11 12:03:15 +05:30

manufacturing

Fixed spelling errors on Production Planning Tool and manual.

2016-12-28 18:15:45 +08:00

patches

Merge branch 'master' into develop

2017-01-13 17:30:46 +05:30

portal

Fixed view button functionality in homepage

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

projects

Fixed merge conflict

2017-01-13 14:34:54 +05:30

public

Email inbox based off of frappe email inbox pr (#7308)

2017-01-13 14:51:09 +05:30

schools

fixed conflict

2017-01-09 17:21:34 +05:30

selling

fixed conflict

2017-01-09 17:21:34 +05:30

setup

fixed conflict

2017-01-09 17:21:34 +05:30

shopping_cart

Replaced spaces with tabs

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

startup

[Enhancement] Added letter head for the report (#7250)

2016-12-20 16:54:24 +05:30

stock

Fixed merge conflict

2017-01-13 14:34:54 +05:30

support

Added standard filters

2016-12-15 14:57:20 +05:30

templates

[FIX] Contact form breaks on existing lead

2017-01-12 12:08:20 -05:00

tests

[minor] setting up website optional in setup wizard

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

translations

Email ID renamed to Email Address

2017-01-03 16:45:38 +05:30

utilities

Email inbox based off of frappe email inbox pr (#7308)

2017-01-13 14:51:09 +05:30

__init__.py

bumped to version 7.2.11

2017-01-13 18:00:45 +06:00

exceptions.py

…

hooks.py

Email inbox based off of frappe email inbox pr (#7308)

2017-01-13 14:51:09 +05:30

modules.txt

Fixes 6171 (#6417)

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

patches.txt

Merge branch 'hotfix' into draft_status_issue_after_amend

2017-01-13 13:14:32 +05:30