Nabin Hait 1f9d1bb877 Merge branch 'develop' into assessment

2017-01-20 20:09:44 +05:30

..

accounts

Fixed merge conflict

2017-01-20 15:44:35 +05:30

buying

Merge branch 'rfq_supplier_pull' into develop

2017-01-17 12:26:09 +05:30

change_log

changed version to beta

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

config

Merge branch 'develop' into fleet-moved-to-hr

2017-01-17 11:05:39 +05:30

controllers

Fixed merge conflict

2017-01-20 15:44:35 +05:30

crm

[fix] address queries + tests

2017-01-16 13:06:15 +05:30

demo

Merge pull request #7465 from KanchanChauhan/attendance-enhancement

2017-01-17 11:47:02 +05:30

docs

Fleet management moved to HR

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

hr

Fixed merge conflict

2017-01-20 15:44:35 +05:30

hub_node

removed Is Sales Item and Is Purchase Item

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

maintenance

[fix] address queries + tests

2017-01-16 13:06:15 +05:30

manufacturing

[Minor] Date fix in Production Order

2017-01-19 12:22:04 +05:30

patches

Merge branch 'develop' into assessment

2017-01-20 20:09:44 +05:30

portal

Fixed view button functionality in homepage

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

projects

Fixed merge conflict

2017-01-17 15:52:56 +05:30

public

Fixed merge conflict

2017-01-17 15:52:56 +05:30

schools

Added ability to disable a student in student group/studnet batch

2017-01-20 19:33:09 +05:30

selling

[fix] tax rule test

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

setup

Merge pull request #7477 from rmehta/custom-perms

2017-01-18 17:03:58 +05:30

shopping_cart

[fix] tax rule test

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

startup

[Enhancement] Added letter head for the report (#7250)

2016-12-20 16:54:24 +05:30

stock

Fixed merge conflict

2017-01-20 15:44:35 +05:30

support

[fix] address queries + tests

2017-01-16 13:06:15 +05:30

templates

[FIX] Contact form breaks on existing lead

2017-01-12 12:08:20 -05:00

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

[fix] stop recursion while adding role

2017-01-17 18:46:37 +05:30

__init__.py

Fixed merge conflict

2017-01-20 15:44:35 +05:30

exceptions.py

[Minor]Changed CustomerDisabled and CustomerFrozen to PartyDisabled and PartyFrozen

2016-01-25 21:25:11 +05:30

hooks.py

Merge branch 'develop' into assessment

2017-01-16 12:23:51 +05:30

modules.txt

Fleet management moved to HR

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

patches.txt

Merge branch 'develop' into assessment

2017-01-20 20:09:44 +05:30