Saurabh 393dd4286a [resolved] merge-conflicts

2018-09-12 14:48:30 +05:30

..

accounts

return blank if no data found (#15387)

2018-09-12 14:24:23 +05:30

agriculture

Refactor Naming Series (#15070)

2018-08-28 13:44:48 +05:30

assets

Fixed merge conflict

2018-08-29 13:34:58 +05:30

buying

[enhance] Payment order (#15056)

2018-09-11 17:40:37 +05:30

change_log

…

commands

…

config

Adding cashier closing feature (#15273)

2018-09-06 19:02:25 +05:30

controllers

[Fix] 'To Bill' status even if the amount is zero (#14784)

2018-09-06 18:27:06 +05:30

crm

perms: fix default import, export perms

2018-08-29 17:10:27 +05:30

demo

[hub] Merge Develop

2018-08-28 18:25:07 +05:30

domains

Inpatient Billing

2018-09-03 11:26:14 +05:30

education

fix(assessment_result): student must be in group (#15255)

2018-08-31 16:12:49 +05:30

erpnext_integrations

Merge pull request #15349 from sagarvora/py3-fixes

2018-09-09 02:25:10 +05:30

healthcare

Remove print statements - Healthcare utils (#15363)

2018-09-11 17:32:52 +05:30

hotels

Refactor Naming Series (#15070)

2018-08-28 13:44:48 +05:30

hr

[resolved] merge-conflicts

2018-09-12 14:48:30 +05:30

hub

…

hub_node

[resolved] merge-conflicts

2018-09-12 14:48:30 +05:30

maintenance

Refactor Naming Series (#15070)

2018-08-28 13:44:48 +05:30

manufacturing

[resolved] merge-conflicts

2018-09-12 14:48:30 +05:30

non_profit

Refactor Naming Series (#15070)

2018-08-28 13:44:48 +05:30

patches

[resolved] merge-conflicts

2018-09-12 14:48:30 +05:30

portal

Fixed merge conflict

2018-08-29 13:34:58 +05:30

projects

[Enhance] Job Card (#15244)

2018-09-06 19:21:48 +05:30

public

[enhance] Payment order (#15056)

2018-09-11 17:40:37 +05:30

regional

fix(patch): gst state number in address where number is less than 10

2018-09-07 16:14:44 +05:30

restaurant

Refactor Naming Series (#15070)

2018-08-28 13:44:48 +05:30

selling

[enhance] Payment order (#15056)

2018-09-11 17:40:37 +05:30

setup

fix(patch): create healthcare patch only if domain activated

2018-09-07 18:44:14 +05:30

shopping_cart

optimize(various)

2018-08-08 16:37:31 +05:30

startup

[Enhance][Fix] Healthcare - DocType and Fields renaming (#14861)

2018-07-16 18:08:53 +05:30

stock

[resolved] merge-conflicts

2018-09-12 14:48:30 +05:30

support

Refactor Naming Series (#15070)

2018-08-28 13:44:48 +05:30

templates

[resolved] merge-conflicts

2018-09-12 14:48:30 +05:30

tests

Test case for contact references (#15077)

2018-09-05 11:00:14 +05:30

translations

[Translation] Updated Translations (#15375)

2018-09-11 17:21:39 +05:30

utilities

Refactor Naming Series (#15070)

2018-08-28 13:44:48 +05:30

www

…

__init__.py

[resolved] merge-conflicts

2018-09-12 14:48:30 +05:30

exceptions.py

…

hooks.py

Amazon MWS Connector (#15061)

2018-09-05 17:16:57 +05:30

modules.txt

[resolved] merge-conflicts

2018-09-12 14:48:30 +05:30

patches.txt

[resolved] merge-conflicts

2018-09-12 14:48:30 +05:30