Nabin Hait 9f4cb0c097 Fixed merge conflict

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

..

accounts

Fixed merge conflict

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

buying

[minor] added make material request from Stock Entry and removed cur_frm

2017-02-09 17:47:22 +05:30

change_log

changed version to beta

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

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

[Minor] Is group filter removed from Territory in Opportunity

2017-02-15 14:46:08 +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

Merge pull request #7749 from KanchanChauhan/leave-application-cleanup

2017-02-16 14:19:11 +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

Merge pull request #7691 from bcornwellmott/stock_reports

2017-02-19 14:36:35 -08:00

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

Payment entry fields issue, added total billed hours in timesheet

2017-02-17 14:51:57 +05:30

public

Fixed merge conflict

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

schools

Minor fix in assesment

2017-02-17 11:03:44 +05:30

selling

Merge pull request #7662 from nick9822/patch-2

2017-02-09 11:45:30 +05:30

setup

[fix] for setup wizard tests and demo;

2017-02-09 18:06:11 +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

Fixed merge conflict

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

support

[minor] fetched tickets to closed using sql instead of get_all

2017-02-14 08:41:09 +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

[Minor]Changed CustomerDisabled and CustomerFrozen to PartyDisabled and PartyFrozen

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

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