Nabin Hait 7f3da5dbb1 Fixed merge conflict

2016-11-28 14:23:51 +05:30

..

accounts

Fixed merge conflict

2016-11-28 14:23:51 +05:30

buying

Merge pull request #6965 from manassolanki/qa_redesign

2016-11-21 14:49:18 +05:30

change_log

Change Logs for v7.1

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

config

Fixed merge conflict

2016-11-21 19:13:22 +05:30

controllers

Merge pull request #7023 from frappe/revert-7012-remove-count-star

2016-11-24 13:26:38 +05:30

crm

Merge branch 'master' into develop

2016-11-14 12:42:26 +05:30

demo

Fixes for demo

2016-11-01 17:05:53 +05:30

docs

Merge pull request #7052 from saurabh6790/integration_service_document

2016-11-28 12:43:21 +05:30

fleet_management

[minor] added default standard filters (#6854)

2016-11-07 17:19:19 +05:30

hr

[minor] fixes to daily work summary formatting

2016-11-22 21:59:20 +05:30

hub_node

…

maintenance

[minor] added default standard filters (#6854)

2016-11-07 17:19:19 +05:30

manufacturing

Fixed merge conflict

2016-11-28 14:23:51 +05:30

patches

Merge pull request #6699 from rohitwaghchaure/bom_price_list_issue

2016-11-24 13:27:17 +05:30

portal

Fixed view button functionality in homepage

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

projects

Fixed merge conflict

2016-11-28 14:23:51 +05:30

public

[Enhancement] Currency added in the BOM

2016-11-22 12:52:20 +05:30

schools

Merge branch 'master' into develop

2016-11-22 23:18:29 +05:30

selling

Merge pull request #7023 from frappe/revert-7012-remove-count-star

2016-11-24 13:26:38 +05:30

setup

Merge pull request #7050 from nabinhait/coa_based_on_existing_company

2016-11-24 13:28:11 +05:30

shopping_cart

set remember last selected value as true for company field

2016-11-03 16:19:34 +05:30

startup

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

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

stock

Fixed merge conflict

2016-11-28 14:23:51 +05:30

support

Bug due Translation support in Support Analytics

2016-11-24 20:36:40 -06:00

templates

fixed merge conflict

2016-11-17 15:55:11 +05:30

tests

[minor] setting up website optional in setup wizard

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

translations

Merge branch 'master' into develop

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

utilities

Merge branch 'master' into develop

2016-11-23 16:00:22 +05:30

__init__.py

bumped to version 7.1.20

2016-11-28 14:52:54 +06:00

exceptions.py

…

hooks.py

[fix] remove root type selection while created new node and hooks call to initialize payment gateway

2016-11-23 14:06:14 +05:30

modules.txt

Fixes 6171 (#6417)

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

patches.txt

Update patches.txt

2016-11-25 11:15:20 +05:30