Nabin Hait 42bc399f2a Merge pull request #7890 from KanchanChauhan/hr-page ...

[Minor] Employee Loan Management moved up in  HR Page

2017-03-02 14:14:04 +05:30

..

accounts

Fixed merge conflict

2017-02-27 14:40:53 +05:30

buying

Merge branch 'develop' into link_mrs

2017-02-28 15:55:35 +05:30

change_log

…

config

[Minor] Employee Loan Management moved up in HR Page

2017-02-28 18:01:07 +05:30

controllers

Merge pull request #7576 from RobertSchouten/compact_dev

2017-02-24 13:09:18 +05:30

crm

Merge pull request #7878 from netchampfaris/lead-fix

2017-02-28 15:37:42 +05:30

demo

[fix] add from date field to salary structure in setup demo data

2017-03-02 08:43:08 +05:30

docs

fix lead, customer, opportunity pages

2017-03-01 04:02:50 +05:30

hr

[Minor] Removed Paid status from Salary Slip

2017-03-02 12:59:35 +05:30

hub_node

…

maintenance

…

manufacturing

[Fix] Production order operations scheduling issue

2017-02-24 19:21:40 +05:30

patches

Leave application overlap validation for half day and test cases

2017-02-24 18:53:34 +05:30

portal

…

projects

Merge pull request #7842 from superlack/develop

2017-03-01 17:20:23 +05:30

public

Fixed merge conflict

2017-02-27 14:40:53 +05:30

schools

Make All Assessment Group parent in assessment group tree

2017-02-24 15:30:22 +05:30

selling

Merge pull request #7842 from superlack/develop

2017-03-01 17:20:23 +05:30

setup

Added 'All Assessment Group' to fixtures

2017-02-24 13:16:46 +05:30

shopping_cart

…

startup

…

stock

Fixed merge conflict

2017-02-27 14:40:53 +05:30

support

…

templates

Merge pull request #7576 from RobertSchouten/compact_dev

2017-02-24 13:09:18 +05:30

tests

…

translations

[translations]

2017-02-27 17:46:47 +05:30

utilities

Merge branch 'master' into develop

2017-03-02 12:38:15 +05:30

__init__.py

Merge branch 'master' into develop

2017-03-02 12:38:15 +05:30

exceptions.py

…

hooks.py

Fixed merge conflict

2017-02-27 14:40:53 +05:30

modules.txt

…

patches.txt

Make All Assessment Group parent in assessment group tree

2017-02-24 15:30:22 +05:30