Shreya Shah 8cad3f12a2 Salary Slip not updating when adding/removing Timesheet links (#11982) ...

* timesheet on salary slip

* changes

* cal total wages

* calculate gross_pay and net_pay

* codacy fix

2017-12-13 18:43:01 +05:30

..

accounts

Project Margin Calculation Improvement (#11911)

2017-12-12 14:59:59 +05:30

agriculture

[Agriculture Domain] (#11663)

2017-12-06 18:36:27 +05:30

assets

[Minor] Update Status based on Asset Maintenance and Asse Repair (#11886)

2017-12-12 15:03:21 +05:30

buying

Fix travis (#11882)

2017-12-08 14:57:38 +05:30

change_log

change log for version 9

2017-09-26 12:41:43 +05:30

commands

[demo] make it faster, do not send user email

2017-06-16 16:55:32 +05:30

config

Update the desktop.py (#11974)

2017-12-13 11:28:18 +05:30

controllers

Merge branch 'master' into develop

2017-12-12 19:17:53 +05:30

crm

[fix] Wrong company's default tax fetch (#11927)

2017-12-11 14:52:28 +05:30

demo

key fix in demo setup completion (#11980)

2017-12-13 18:34:43 +05:30

docs

Project Margin Calculation Improvement (#11911)

2017-12-12 14:59:59 +05:30

domains

[Fix] Restrict domain specific roles (#11975)

2017-12-13 18:36:08 +05:30

education

Fix travis (#11882)

2017-12-08 14:57:38 +05:30

erpnext_integrations

Add Github Connector (#11259)

2017-11-13 19:19:13 +05:30

healthcare

fixed merge-conflicts

2017-11-28 11:02:28 +05:30

hr

Salary Slip not updating when adding/removing Timesheet links (#11982)

2017-12-13 18:43:01 +05:30

hub

Hub (#10934)

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

hub_node

[fix] hub connection, fixes #11357

2017-12-11 23:22:30 +05:30

maintenance

Added maintenance to Asset and enhanced maintenance for Asset Maintenance

2017-11-28 15:14:56 +05:30

manufacturing

Merge branch 'master' into develop

2017-12-12 19:17:53 +05:30

non_profit

Fix travis (#11882)

2017-12-08 14:57:38 +05:30

patches

[fix] Patch (#11976)

2017-12-13 18:35:22 +05:30

portal

[Website] Items list and stock (#11480)

2017-11-17 11:41:07 +05:30

projects

Project Margin Calculation Improvement (#11911)

2017-12-12 14:59:59 +05:30

public

Merge branch 'master' into develop

2017-12-12 19:17:53 +05:30

regional

[enhance] UAE/KSA VAT/Excise implementation (#11923)

2017-12-12 14:40:52 +05:30

restaurant

Fix travis (#11882)

2017-12-08 14:57:38 +05:30

selling

Merge branch 'master' into develop

2017-12-12 19:17:53 +05:30

setup

[enhance] UAE/KSA VAT/Excise implementation (#11923)

2017-12-12 14:40:52 +05:30

shopping_cart

Fixed merge conflict

2017-11-21 20:18:03 +05:30

startup

[hotfix] User not able to edit exchange rate even if Allow Stale Exchange Rates is disabled in the accounts settings (#11409)

2017-11-02 18:12:14 +05:30

stock

Merge branch 'master' into develop

2017-12-12 19:17:53 +05:30

support

[enhance] Add Issue Type and Opportunity Type masters (#11598)

2017-11-16 17:03:52 +05:30

templates

[fix] minor changes

2017-12-05 17:19:02 +05:30

tests

Fix travis (#11882)

2017-12-08 14:57:38 +05:30

translations

[Translation] Updated Translations (#11591)

2017-11-15 16:30:08 +05:30

utilities

[multicheck] Select multiple domains in setup (#11709)

2017-12-06 13:28:06 +05:30

__init__.py

Merge branch 'master' into develop

2017-12-12 19:17:53 +05:30

exceptions.py

…

hooks.py

[Fix] Restrict domain specific roles (#11975)

2017-12-13 18:36:08 +05:30

modules.txt

[Agriculture Domain] (#11663)

2017-12-06 18:36:27 +05:30

patches.txt

[enhance] UAE/KSA VAT/Excise implementation (#11923)

2017-12-12 14:40:52 +05:30