Jamsheer 46b23f8e6e Salary Structure Refactor, Formula on Salary Component Master (#13967) ...

* Salary structure refactor

* Salary Structure Assignment - filters applied

* Formula on Salary Component Master

* Salary Structure - filter updated, Salary Component - fields re-arranged

* Payroll Entry - get_employee_list fix

* Salary Structure Assignment - Validate Duplicate Assignment

* Salary Structure Assignment - filters for salary structure

2018-05-11 21:05:24 +05:30

..

accounts

Removed company from Finance Book and related changes

2018-05-09 15:10:29 +05:30

agriculture

Agriculture module corrections (#13438)

2018-04-02 10:51:53 +05:30

assets

minor fix in asset

2018-04-26 12:16:38 +05:30

buying

Internal Supplier check in Supplier

2018-05-02 14:34:14 +05:30

change_log

Version 10 change log

2017-12-25 12:25:52 +05:30

commands

…

config

minor fixes

2018-05-07 16:11:35 +05:30

controllers

[fix] resolved merge conflicts

2018-04-25 11:32:54 +05:30

crm

Fixed merge conflict

2018-04-13 14:38:57 +05:30

demo

minor fix

2018-04-26 16:32:17 +05:30

docs

Shift Management - Documentation and Tests (#13997)

2018-05-11 21:03:50 +05:30

domains

[ Enhance ] Production to Work Order (#12902)

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

education

Student Account Ledger Button (#13591)

2018-04-24 12:12:11 +05:30

erpnext_integrations

Woocommerce Integration (#13217)

2018-04-03 11:17:03 +05:30

healthcare

resolved merge conflicts

2018-04-24 11:16:13 +05:30

hotels

Use range instead xrange (#13128)

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

hr

Salary Structure Refactor, Formula on Salary Component Master (#13967)

2018-05-11 21:05:24 +05:30

hub

Hub (#10934)

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

hub_node

[hub] add hub settings access regardless

2018-04-05 14:50:42 +05:30

maintenance

Use range instead xrange (#13128)

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

manufacturing

Typo Fix in Work Order

2018-04-25 13:48:47 +05:30

non_profit

[Fixes] Chapter DocType (#13213)

2018-03-07 16:27:30 +05:30

patches

minor fixes

2018-05-07 16:11:35 +05:30

portal

Set the guardian role automatically. (#12136)

2017-12-22 10:50:10 +05:30

projects

Salary Structure Refactor, Formula on Salary Component Master (#13967)

2018-05-11 21:05:24 +05:30

public

Removed company from Finance Book and related changes

2018-05-09 15:10:29 +05:30

regional

[patch] ignore validations while creating custom fields for gst via patch

2018-04-26 10:10:03 +05:30

restaurant

self.assertEqual

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

selling

Merge branch 'multi-company-transations' of https://github.com/shreyashah115/erpnext into shreyashah115-multi-company-transations

2018-05-07 13:12:16 +05:30

setup

Exchange rate revaluation (#13932)

2018-05-05 18:22:56 +05:30

shopping_cart

[Website] Price in items list and sales uom management (#13335)

2018-03-20 14:28:44 +05:30

startup

removed duplicate keys (#13675)

2018-04-17 12:20:57 +05:30

stock

Renamed some salary related fields

2018-04-30 16:21:37 +05:30

support

Email Account field added in Issue

2018-04-13 14:30:26 +05:30

templates

[Website] Price in items list and sales uom management (#13335)

2018-03-20 14:28:44 +05:30

tests

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

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

translations

[Translation] Updated Translations (#13570)

2018-04-12 13:36:55 +05:30

utilities

resolved merge conflicts

2018-04-24 11:16:13 +05:30

__init__.py

bumped to version 10.1.27

2018-04-25 13:16:48 +06:00

exceptions.py

…

hooks.py

Fixed merge conflict

2018-04-04 11:40:16 +05:30

modules.txt

Hotels (#11907)

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

patches.txt

Consolidated financial statement (#13678)

2018-04-26 12:16:18 +05:30