Makarand Bauskar 98b52a7245 resolved merge conflicts on develop (#10185) ...

* resolved merge conflicts on develop

* [minor] removed the validate_activity

2017-07-31 15:09:52 +05:30

..

accounts

resolved merge conflicts

2017-07-31 12:30:53 +05:30

buying

[Fix] RFQ list showing to all supplier in the portal (#10023)

2017-07-25 14:12:58 +05:30

change_log

Docs in website (#10149)

2017-07-28 11:44:08 +05:30

commands

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

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

config

Docs in website (#10149)

2017-07-28 11:44:08 +05:30

controllers

resolved merge conflicts

2017-07-31 12:30:53 +05:30

crm

[ui-testing] added test for production order (#10138)

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

demo

Added delivery date in SO parent form. Fixes #10104 (#10155)

2017-07-31 11:25:51 +05:30

docs

Merge branch 'develop' into set_defualt_mode_payment

2017-07-28 21:09:42 +05:30

hr

[ui test] leave application in HR (#10151)

2017-07-28 19:37:15 +05:30

hub_node

removed Is Sales Item and Is Purchase Item

2016-04-15 12:57:00 +05:30

maintenance

fixed merge conflicts

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

manufacturing

resolved merge conflicts

2017-07-31 12:30:53 +05:30

patches

resolved merge conflicts

2017-07-31 12:30:53 +05:30

portal

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

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

projects

resolved merge conflicts on develop (#10185)

2017-07-31 15:09:52 +05:30

public

Merge branch 'develop' into set_defualt_mode_payment

2017-07-28 14:41:48 +05:30

regional

Itemised tax breakup fix in docs other than invoice (#9961)

2017-07-20 13:32:01 +05:30

schools

[ui test] Setting up school course+program and their dependencies (#10142)

2017-07-31 11:05:52 +05:30

selling

resolved merge conflicts on develop (#10185)

2017-07-31 15:09:52 +05:30

setup

[ui-testing] added test for production order (#10138)

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

shopping_cart

[fix] company graph based on base currency (#9950)

2017-07-26 18:17:11 +05:30

startup

Sales Goal by Company (#9723)

2017-07-18 10:35:12 +05:30

stock

[ui-testing] added test for production order (#10138)

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

support

Portal breadcrumbs (#10095)

2017-07-28 18:54:22 +05:30

templates

Portal breadcrumbs (#10095)

2017-07-28 18:54:22 +05:30

tests

resolved merge conflicts

2017-07-31 12:30:53 +05:30

translations

[Translation] Updated Translations (#10047)

2017-07-25 11:46:16 +05:30

utilities

Leaderboard of customers, items, suppliers and sales partner (#9354)

2017-06-20 13:04:45 +05:30

__init__.py

bumped to version 8.6.5

2017-07-31 12:51:35 +06:00

exceptions.py

…

hooks.py

Portal breadcrumbs (#10095)

2017-07-28 18:54:22 +05:30

modules.txt

[wip] GST for India. Pending reports

2017-06-22 22:31:32 +05:30

patches.txt

resolved merge conflicts on develop (#10185)

2017-07-31 15:09:52 +05:30