Ranjith Kurungadam 1e90dafef8 fixes Benefit Application, Additional Salary (#14971) ...

* fix - add Additional Salary if multiple in one slip

* fix - Benefit Appication, None comparison

2018-07-23 11:32:58 +05:30

..

accounts

columnDef => column

2018-07-20 16:35:51 +05:30

agriculture

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

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

assets

Resolved merge conflicts

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

buying

Resolved merge conflicts

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

change_log

Email alert renamed to Notification (#14618)

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

commands

…

config

Resolved merge conflicts

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

controllers

Resolved merge conflicts

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

crm

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

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

demo

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

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

domains

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

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

education

Query report print (#14935)

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

erpnext_integrations

[Fix] Woocommerce test cases (#14513)

2018-06-14 09:13:39 +05:30

healthcare

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

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

hotels

Use range instead xrange (#13128)

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

hr

fixes Benefit Application, Additional Salary (#14971)

2018-07-23 11:32:58 +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

Merge patch and delete fields from subscription (#14941)

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

portal

[minor] remove in_dialog old property

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

projects

test TDS calculation (#14919)

2018-07-19 14:34:05 +05:30

public

Merge pull request #14969 from netchampfaris/financial-statement-reports

2018-07-21 12:28:31 +05:30

regional

Fix typo

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

restaurant

self.assertEqual

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

selling

Resolved merge conflicts

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

setup

Resolved merge conflicts

2018-07-18 17:08:16 +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

Resolved merge conflicts

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

support

Add Priority field in issue webform and portal (#14967)

2018-07-23 11:14:00 +05:30

templates

Add Priority field in issue webform and portal (#14967)

2018-07-23 11:14:00 +05:30

tests

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

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

translations

[Translation] Updated Translations (#14849)

2018-07-09 16:56:49 +05:30

utilities

[fix] resolve conflicts

2018-05-31 17:32:17 +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-07-18 17:08:16 +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

Merge patch and delete fields from subscription (#14941)

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