Saurabh 824b388631 Resolved merge conflicts

2018-08-07 13:01:11 +05:30

..

accounts

Resolved merge conflicts

2018-08-07 13:01:11 +05:30

agriculture

[Minor] Fix Crop Cycle test record (#14901)

2018-07-15 20:04:24 +05:30

assets

[Minor] Patch fix (#15041)

2018-07-30 10:57:47 +05:30

buying

Resolved merge conflicts

2018-08-07 13:01:11 +05:30

change_log

Email alert renamed to Notification (#14618)

2018-06-21 09:17:52 +05:30

commands

…

config

add tax withholding & loyalty program in explore view (#15074)

2018-08-06 14:46:16 +05:30

controllers

Resolved merge conflicts

2018-08-07 13:01:11 +05:30

crm

[minor] fixes to moment.defaultDateFormat and daily work summary eplies

2018-06-25 22:38:20 +05:30

demo

Fixed merge conflict

2018-07-27 12:54:00 +05:30

domains

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

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

education

Resolved merge conflicts

2018-08-07 13:01:11 +05:30

erpnext_integrations

Use frappe.utils.md_to_html instead of manual import (#15087)

2018-08-07 11:53:36 +05:30

healthcare

Resolved merge conflicts

2018-08-07 13:01:11 +05:30

hotels

Use range instead xrange (#13128)

2018-02-28 16:12:51 +05:30

hr

Resolved merge conflicts

2018-08-07 13:01:11 +05:30

hub

Hub (#10934)

2017-10-05 11:17:30 +05:30

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

[Minor] Moved mandatory Company field from More Information section to top (#14950)

2018-07-19 14:39:31 +05:30

non_profit

Resolved merge conflicts

2018-07-06 13:18:44 +05:30

patches

Patch fixes

2018-07-31 17:33:14 +05:30

portal

[minor] remove in_dialog old property

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

projects

Resolved merge conflicts

2018-08-07 13:01:11 +05:30

public

Resolved merge conflicts

2018-08-07 13:01:11 +05:30

regional

[Enhancement] Tax Withholding Category (#15064)

2018-08-01 17:45:05 +05:30

restaurant

self.assertEqual

2018-02-28 21:13:51 +05:30

selling

Tests SO for Serial No based delivery (#15072)

2018-08-03 10:39:51 +05:30

setup

Use frappe.utils.md_to_html instead of manual import (#15087)

2018-08-07 11:53:36 +05:30

shopping_cart

Travis (#14354)

2018-06-05 12:56:10 +05:30

startup

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

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

stock

Allow Disabling Batch and edit Validations (#15076)

2018-08-06 14:45:18 +05:30

support

Increase margin (#15016)

2018-07-27 10:57:32 +05:30

templates

prevent jinja exec in search title

2018-08-06 12:33:34 +05:30

tests

Merge the Land Unit doctype with the Location doctype (#14613)

2018-07-13 12:50:04 +05:30

translations

Spelling updated from Maxiumm to Maximum (#15093)

2018-08-06 14:32:46 +05:30

utilities

Correction of the get_price method for pricing rules (#15082)

2018-08-06 14:42:04 +05:30

www

Certfication Application Doctype and webform,Certfied Consultant DocType (#14528)

2018-06-15 10:04:19 +05:30

__init__.py

Resolved merge conflicts

2018-08-07 13:01:11 +05:30

exceptions.py

…

hooks.py

Update staging version to support symentic versioning

2018-07-19 13:36:32 +05:30

modules.txt

Hotels (#11907)

2018-02-12 11:57:12 +05:30

patches.txt

Patch fixes

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