Nabin Hait 24ec3c7dcb Fixed merge conflict

2017-09-21 12:53:41 +05:30

..

accounts

Fixed merge conflict

2017-09-21 12:53:41 +05:30

buying

Updated modified timestamp in sales/purchase transaction doctypes

2017-09-20 09:56:06 +05:30

change_log

[change-log] added change log for v9.0.0 (#10756)

2017-09-18 17:03:21 +05:30

commands

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

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

config

add the fee schedule in config

2017-09-19 17:23:03 +05:30

controllers

Rounding Adjustment via a separate field, instead of last tax row (#10659)

2017-09-19 14:53:16 +05:30

crm

Fixes ui tests

2017-09-14 16:45:47 +05:30

demo

[fix] set item valuation rates (#10681)

2017-09-15 16:17:29 +05:30

docs

Move subscription module to accounts (#10772)

2017-09-18 17:23:00 +05:30

healthcare

[domain] Healthcare (#10664)

2017-09-13 12:52:30 +05:30

hr

Show thumbnail image in daily work summary (#10605)

2017-09-18 16:58:24 +05:30

hub_node

…

maintenance

fixed merge conflicts

2017-06-15 13:42:47 +05:30

manufacturing

Fixed merge conflict

2017-09-19 12:06:22 +05:30

patches

[fix] Subscription patch broken if reference document has been cancelled

2017-09-19 12:53:11 +05:30

portal

[hotfix] fixed the recursion error while saving the User (#8696)

2017-05-05 11:53:00 +05:30

projects

Update project.js (#10796)

2017-09-18 15:44:36 +05:30

public

Rounding Adjustment via a separate field, instead of last tax row (#10659)

2017-09-19 14:53:16 +05:30

regional

resolved merge conflicts

2017-09-14 15:32:55 +05:30

schools

only validate party account and ref doc party account in selected case (#10863)

2017-09-21 12:01:20 +05:30

selling

Updated modified timestamp in sales/purchase transaction doctypes

2017-09-20 09:56:06 +05:30

setup

[progress] R/W permission for all roles (#10866)

2017-09-21 12:02:18 +05:30

shopping_cart

[fix] redirect to payment url if paying via web portal (#10265)

2017-08-08 11:29:11 +05:30

startup

resolved merge conflicts

2017-09-14 15:32:55 +05:30

stock

Updated modified timestamp in sales/purchase transaction doctypes

2017-09-20 09:56:06 +05:30

support

Hide "Help Article" button for timeline Communication type "Comment". (#10541)

2017-08-25 12:44:33 +05:30

templates

Move subscription module to accounts (#10772)

2017-09-18 17:23:00 +05:30

tests

Set default customer group and territory after install

2017-09-14 17:26:23 +05:30

translations

[Translation] Updated Translations (#10741)

2017-09-11 16:31:10 +05:30

utilities

Leaderboard cleanup (#10638)

2017-09-18 16:41:04 +05:30

__init__.py

bumped to version 8.11.4

2017-09-19 12:35:39 +06:00

exceptions.py

…

hooks.py

Move subscription module to accounts (#10772)

2017-09-18 17:23:00 +05:30

modules.txt

Fixed merge conflict

2017-09-21 12:53:41 +05:30

patches.txt

Fixed merge conflict

2017-09-19 12:06:22 +05:30