Nabin Hait 036bf6de6e Merge branch 'develop' of https://github.com/frappe/erpnext into develop

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

..

accounts

Fixed merge conflict

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

buying

Merge branch 'develop' of https://github.com/frappe/erpnext into develop

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

change_log

…

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_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

Merge branch 'develop' of https://github.com/frappe/erpnext into develop

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

portal

[Website] Items list and stock (#11480)

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

projects

adding task to root node (#11666)

2017-11-21 16:12:01 +05:30

public

Merge branch 'develop' of https://github.com/frappe/erpnext into develop

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

regional

…

restaurant

…

schools

Course Scheduling Tool (#11676)

2017-11-21 17:28:51 +05:30

selling

Fixed merge conflict

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

setup

Merge branch 'develop' of https://github.com/frappe/erpnext into develop

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

shopping_cart

Fixed merge conflict

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

startup

…

stock

Merge branch 'develop' of https://github.com/frappe/erpnext into develop

2017-11-21 20:19:13 +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' of https://github.com/frappe/erpnext into develop

2017-11-21 20:19:13 +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

Merge branch 'develop' of https://github.com/frappe/erpnext into develop

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