Nabin Hait 589f4656ad Merge branch 'develop' into in_global_search

2017-02-20 15:04:52 +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

…

config

Merge pull request #7644 from mbauskar/develop

2017-02-10 12:13:31 +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

…

maintenance

Added fields in global search

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

manufacturing

Added fields in global search

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

patches

Fixed merge conflict

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

portal

…

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

[minor] remove party status as it leads to duplicate notifications fixes #7346, also fix for #7568

2017-01-30 13:22:51 +05:30

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

…

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