Nabin Hait 8ec1b565f5 Merge pull request #7823 from KanchanChauhan/payroll-currency ...

[Minor] Company default currency in Salary Slip and Structure

2017-02-23 16:52:23 +05:30

..

accounts

Fixed merge conflict

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

buying

[Fix] Throw error if item is added multiple time

2017-02-22 10:40:38 +05:30

change_log

changed version to beta

2016-12-15 19:37:53 +05:30

config

Merge branch 'prod_ana' of https://github.com/bcornwellmott/erpnext into bcornwellmott-prod_ana

2017-02-20 17:25:01 +05:30

controllers

Merge branch 'develop' into develop

2017-02-20 19:09:20 +05:30

crm

Merge branch 'develop' into develop

2017-02-20 19:22:03 +05:30

demo

[fix] for setup wizard tests and demo;

2017-02-09 18:06:11 +05:30

docs

Merge pull request #7587 from noussh/develop

2017-02-20 19:33:55 +05:30

hr

Merge pull request #7823 from KanchanChauhan/payroll-currency

2017-02-23 16:52:23 +05:30

hub_node

…

maintenance

Added fields in global search

2017-02-20 13:38:31 +05:30

manufacturing

Fixed merge conflict

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

patches

Fixed merge conflict

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

portal

Fixed view button functionality in homepage

2016-09-28 14:08:47 +05:30

projects

Fixed merge conflict

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

public

Fixed Student Attendence

2017-02-21 18:49:00 +05:30

schools

Fixes for attendance reports

2017-02-22 16:19:57 +05:30

selling

[Fix] Disappearing Dropdown fixed

2017-02-22 15:39:07 +05:30

setup

Fixed merge conflict

2017-02-20 19:01:04 +05:30

shopping_cart

[fix] tax rule test

2017-01-18 14:14:20 +05:30

startup

Fixed counting to correctly reflect all status at each month

2017-02-06 20:58:25 -08:00

stock

[Minor] Landed Cost Voucher test case fixed

2017-02-23 08:44:02 +05:30

support

Merge branch 'develop' into develop

2017-02-20 19:22:03 +05:30

templates

Fixed merge conflict

2017-02-20 19:38:22 +05:30

tests

[fix] tax rule test

2017-01-18 14:14:20 +05:30

translations

Email ID renamed to Email Address

2017-01-03 16:45:38 +05:30

utilities

Merge branch 'master' into develop

2017-02-16 15:59:59 +05:30

__init__.py

Fixed merge conflict

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

exceptions.py

…

hooks.py

Fixed merge conflict

2017-02-20 19:38:22 +05:30

modules.txt

Fleet management moved to HR

2017-01-16 14:38:24 +05:30

patches.txt

Fixed merge conflict

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