Nabin Hait a55090dc88 Fixed merge conflict

2018-06-04 11:14:50 +05:30

..

accounts

[fix] resolve conflicts

2018-05-31 17:32:17 +05:30

agriculture

Treeview permission (#14232)

2018-05-26 09:12:59 +05:30

assets

Test case fixes (#14219)

2018-05-26 09:09:02 +05:30

buying

[fix] resolve conflicts

2018-05-31 17:32:17 +05:30

change_log

…

commands

…

config

Rename - Additional Salary Component to Additional Salary (#14302)

2018-06-04 11:02:53 +05:30

controllers

[fix] resolve conflicts

2018-05-31 17:32:17 +05:30

crm

Test case fixes (#14219)

2018-05-26 09:09:02 +05:30

demo

Create demo data for salary structure

2018-05-29 11:04:11 +05:30

docs

Add docs for Inter Company Invoice creation (#14314)

2018-06-03 10:28:51 +05:30

domains

[ Enhance ] Production to Work Order (#12902)

2018-03-20 12:38:43 +05:30

education

[Enhance] Department added wherever applicable (#14121)

2018-05-23 11:11:36 +05:30

erpnext_integrations

Refactor shopify (#13588)

2018-05-16 11:33:47 +05:30

healthcare

[fix] resolve conflicts

2018-05-31 17:32:17 +05:30

hotels

…

hr

Fixed merge conflict

2018-06-04 11:14:50 +05:30

hub

…

hub_node

[hub][minor] remove links #14309

2018-06-04 10:26:49 +05:30

maintenance

[Enhance] Department added wherever applicable (#14121)

2018-05-23 11:11:36 +05:30

manufacturing

[Enhance] Provision to set overproduction percentage for work order (#14248)

2018-05-30 15:28:09 +05:30

non_profit

[Enhance] Department added wherever applicable (#14121)

2018-05-23 11:11:36 +05:30

patches

[fix] resolve conflicts

2018-05-31 17:32:17 +05:30

portal

[minor] remove in_dialog old property

2018-05-16 12:51:22 +05:30

projects

minor test fixes

2018-05-29 10:58:57 +05:30

public

Merge pull request #14329 from pratu16x7/hub-fixes

2018-06-04 10:28:47 +05:30

regional

Address filter in gstr1 report (#14290)

2018-05-31 09:33:36 +05:30

restaurant

…

selling

typo fix

2018-05-31 18:11:05 +05:30

setup

[fix] set default supplier group in test

2018-05-23 16:14:35 +05:30

shopping_cart

[fix] honour the shopping cart setting when showing the stock and non-stock item (#13988)

2018-05-14 14:30:30 +05:30

startup

Refactor party type (#13831)

2018-05-16 11:02:26 +05:30

stock

[fix] resolve conflicts

2018-05-31 17:32:17 +05:30

support

ran 2to3, evaluation (#13499)

2018-05-23 11:31:24 +05:30

templates

[fix] help page issue listing

2018-05-30 17:26:03 +05:30

tests

Loan Management for the Members (Non Profit Module) (#13149)

2018-04-24 12:19:36 +05:30

translations

[Translation] Updated Translations (#14021)

2018-05-16 10:46:11 +05:30

utilities

[fix] resolve conflicts

2018-05-31 17:32:17 +05:30

__init__.py

[fix] resolve conflicts

2018-05-31 17:32:17 +05:30

exceptions.py

…

hooks.py

Earned Leave (#14143)

2018-06-01 16:09:28 +05:30

modules.txt

…

patches.txt

[fix] resolve conflicts

2018-05-31 17:32:17 +05:30