Nabin Hait caf9891075 Fixed merge conflict

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

..

accounts

Fixed merge conflict

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

buying

Fixed merge conflict

2017-09-19 12:06:22 +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

Move subscription module to accounts (#10772)

2017-09-15 16:16:36 +05:30

controllers

Fixed merge conflict

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

crm

[layout] lead and opportunity (#10487)

2017-08-23 18:47:57 +05:30

demo

Python 3 compatibility syntax error fixes (#10519)

2017-08-28 18:17:36 +05:30

docs

Move subscription module to accounts (#10772)

2017-09-15 16:16:36 +05:30

hr

[fix] trainig_feedback.py

2017-09-07 10:43:36 +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

Fixed merge conflict

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

portal

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

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

projects

[Enahance] Provision to select customer, item code while making an invoice from timesheet (#10616)

2017-09-04 10:20:40 +05:30

public

Move subscription module to accounts (#10772)

2017-09-15 16:16:36 +05:30

regional

resolved merge conflicts

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

schools

added filter for grading scale selection (#10639)

2017-09-01 21:45:10 +05:30

selling

Move subscription module to accounts (#10772)

2017-09-15 16:16:36 +05:30

setup

resolved merge conflicts

2017-09-14 15:32:55 +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

Fixed merge conflict

2017-09-19 12:06:22 +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-15 16:16:36 +05:30

tests

Fixed multiple ui test cases

2017-09-07 19:16:38 +05:30

translations

[Translation] Updated Translations (#10669)

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

utilities

[minor] translate the action name in get_slide_settings (#10740)

2017-09-12 10:52:24 +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-15 16:16:36 +05:30

modules.txt

Move subscription module to accounts (#10772)

2017-09-15 16:16:36 +05:30

patches.txt

Fixed merge conflict

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