Nabin Hait 3cdb65f782 Merge branch 'prod_ana' of https://github.com/bcornwellmott/erpnext into bcornwellmott-prod_ana

2017-02-20 17:25:01 +05:30

..

accounts

Merge branch 'develop' into in_global_search

2017-02-20 15:04:52 +05:30

buying

Added fields in global search

2017-02-20 13:38:31 +05:30

change_log

changed version to beta

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

config

Merge branch 'prod_ana' of https://github.com/bcornwellmott/erpnext into bcornwellmott-prod_ana

2017-02-20 17:25:01 +05:30

controllers

Fixed merge conflict

2017-02-20 15:00:04 +05:30

crm

Added fields in global search

2017-02-20 13:38:31 +05:30

demo

[fix] for setup wizard tests and demo;

2017-02-09 18:06:11 +05:30

docs

Update install.md

2017-02-14 15:12:07 +05:30

hr

Added fields in global search

2017-02-20 13:38:31 +05:30

hub_node

removed Is Sales Item and Is Purchase Item

2016-04-15 12:57:00 +05:30

maintenance

Added fields in global search

2017-02-20 13:38:31 +05:30

manufacturing

Merge branch 'prod_ana' of https://github.com/bcornwellmott/erpnext into bcornwellmott-prod_ana

2017-02-20 17:25:01 +05:30

patches

Fixed merge conflict

2017-02-20 15:00:04 +05:30

portal

Fixed view button functionality in homepage

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

projects

Added fields in global search

2017-02-20 13:38:31 +05:30

public

Fixed merge conflict

2017-02-20 15:00:04 +05:30

schools

Added fields in global search

2017-02-20 13:38:31 +05:30

selling

Added fields in global search

2017-02-20 13:38:31 +05:30

setup

Added fields in global search

2017-02-20 13:38:31 +05:30

shopping_cart

[fix] tax rule test

2017-01-18 14:14:20 +05:30

startup

Fixed counting to correctly reflect all status at each month

2017-02-06 20:58:25 -08:00

stock

Merge branch 'develop' into in_global_search

2017-02-20 15:04:52 +05:30

support

Added fields in global search

2017-02-20 13:38:31 +05:30

templates

[minor] minor fixes for contact us page

2017-02-20 12:41:48 +05:30

tests

[fix] tax rule test

2017-01-18 14:14:20 +05:30

translations

Email ID renamed to Email Address

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

utilities

Merge branch 'master' into develop

2017-02-16 15:59:59 +05:30

__init__.py

Fixed merge conflict

2017-02-20 15:00:04 +05:30

exceptions.py

…

hooks.py

Merge branch 'develop' into remove-party-status

2017-02-02 15:42:04 +05:30

modules.txt

Fleet management moved to HR

2017-01-16 14:38:24 +05:30

patches.txt

Fixed merge conflict

2017-02-20 15:00:04 +05:30