Nabin Hait 8bf58367b8 Fixed merge conflict

2017-03-27 12:30:01 +05:30

..

accounts

Fixed merge conflict

2017-03-27 12:30:01 +05:30

buying

Fixed merge conflict

2017-03-27 12:30:01 +05:30

change_log

…

config

[Minor] Employee Loan Management moved up in HR Page

2017-02-28 18:01:07 +05:30

controllers

Merge pull request #8053 from umairsy/video-pages

2017-03-23 17:02:34 +05:30

crm

Merge pull request #7991 from mbauskar/develop

2017-03-13 11:19:59 +05:30

demo

added roles in the report

2017-03-06 14:26:09 +05:30

docs

Merge pull request #8053 from umairsy/video-pages

2017-03-23 17:02:34 +05:30

hr

Merge pull request #8086 from KanchanChauhan/read-perm-to-guest

2017-03-23 16:50:45 +05:30

hub_node

…

maintenance

Added fields in global search

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

manufacturing

Project filter in BOM selection in Production Order

2017-03-16 17:09:37 +05:30

patches

minor fix in patch

2017-03-06 18:52:34 +05:30

portal

…

projects

[ui] show assignees in gantt popup frappe/erpnext#6916

2017-03-13 14:52:56 +05:30

public

Fixed merge conflict

2017-03-27 12:30:01 +05:30

schools

[Fix] Enrolling the student

2017-03-15 18:22:57 +05:30

selling

[feature] ability to have variants based on manufacturer

2017-03-21 17:48:34 +01:00

setup

Merge branch 'master' into develop

2017-03-15 11:28:07 +05:30

shopping_cart

Merge pull request #8076 from KanchanChauhan/qty-in-shopping-cart

2017-03-24 13:14:03 +05:30

startup

[fix] Purchase analytics report not loading

2017-03-24 17:37:02 +05:30

stock

Update item.js

2017-03-21 17:49:53 +01:00

support

[feature] ability to have variants based on manufacturer

2017-03-21 17:48:34 +01:00

templates

Merge pull request #8076 from KanchanChauhan/qty-in-shopping-cart

2017-03-24 13:14:03 +05:30

tests

…

translations

fix translations that have to do with term 'close' which was not well translated

2017-03-24 15:24:55 +01:00

utilities

[fixes] for tests

2017-03-14 21:06:15 +05:30

__init__.py

Fixed merge conflict

2017-03-27 12:30:01 +05:30

exceptions.py

…

hooks.py

[minor] custom script to create issue, lead, opportunity from email

2017-03-14 17:57:47 +05:30

modules.txt

…

patches.txt

UOM Conversion in Selling

2017-03-06 16:41:12 +05:30