Nabin Hait 32a62a02df Fixed merge conflict

2017-11-21 20:18:03 +05:30

..

accounts

Fixed merge conflict

2017-11-21 20:18:03 +05:30

buying

Fixed merge conflict

2017-11-21 20:18:03 +05:30

change_log

change log for version 9

2017-09-26 12:41:43 +05:30

commands

…

config

Variant report (#11618)

2017-11-17 12:00:29 +05:30

controllers

Fixed merge conflict

2017-11-21 20:18:03 +05:30

crm

[enhance] Add Issue Type and Opportunity Type masters (#11598)

2017-11-16 17:03:52 +05:30

demo

[enhance] Add Issue Type and Opportunity Type masters (#11598)

2017-11-16 17:03:52 +05:30

docs

Fixed merge conflict

2017-11-21 20:18:03 +05:30

domains

[patch] Revert Manufacturing User role (#11514)

2017-11-10 19:15:17 +05:30

erpnext_integrations

Add Github Connector (#11259)

2017-11-13 19:19:13 +05:30

healthcare

Healthcare hotfix (#11586)

2017-11-15 13:53:50 +05:30

hr

Merge branch 'develop' into payment-terms

2017-11-17 12:41:56 +05:30

hub

Hub (#10934)

2017-10-05 11:17:30 +05:30

hub_node

Merge branch 'develop' into payment-terms

2017-11-17 12:41:56 +05:30

maintenance

…

manufacturing

Merge branch 'develop' into payment-terms

2017-11-17 12:41:56 +05:30

patches

Fixed merge conflict

2017-11-21 20:18:03 +05:30

portal

[Website] Items list and stock (#11480)

2017-11-17 11:41:07 +05:30

projects

[fix] treeview for tasks (#11515)

2017-11-10 18:52:21 +05:30

public

Fixed merge conflict

2017-11-21 20:18:03 +05:30

regional

Gst doctype roles (#10984)

2017-10-02 11:38:40 +05:30

restaurant

UI test fixed for supplier quotation (#11260)

2017-10-21 10:44:30 +05:30

schools

new report - assessment plan status (#11504)

2017-11-13 18:56:53 +05:30

selling

Fixed merge conflict

2017-11-21 20:18:03 +05:30

setup

Fixed merge conflict

2017-11-21 20:18:03 +05:30

shopping_cart

Fixed merge conflict

2017-11-21 20:18:03 +05:30

startup

[hotfix] User not able to edit exchange rate even if Allow Stale Exchange Rates is disabled in the accounts settings (#11409)

2017-11-02 18:12:14 +05:30

stock

Fixed merge conflict

2017-11-21 20:18:03 +05:30

support

[enhance] Add Issue Type and Opportunity Type masters (#11598)

2017-11-16 17:03:52 +05:30

templates

[Website] Items list and stock (#11480)

2017-11-17 11:41:07 +05:30

tests

Merge branch 'develop' into payment-terms

2017-11-17 12:41:56 +05:30

translations

[Translation] Updated Translations (#11591)

2017-11-15 16:30:08 +05:30

utilities

[Website] Items list and stock (#11480)

2017-11-17 11:41:07 +05:30

__init__.py

bumped to version 9.2.15

2017-11-17 15:25:23 +06:00

exceptions.py

…

hooks.py

[fix] issue #11456 (#11612)

2017-11-17 11:42:24 +05:30

modules.txt

Add Github Connector (#11259)

2017-11-13 19:19:13 +05:30

patches.txt

Fixed merge conflict

2017-11-21 20:18:03 +05:30