Nabin Hait b81ed45b2b fixed conflict

2016-05-11 12:52:31 +05:30

..

accounts

fixed conflict

2016-05-11 12:52:31 +05:30

buying

Merge pull request #5284 from kickapoo/develop

2016-05-09 16:58:30 +05:30

change_log

[change-log]

2016-03-17 19:26:29 +05:30

config

Asset Movement

2016-04-28 18:01:32 +05:30

controllers

fixed conflict

2016-05-11 12:52:31 +05:30

crm

[fixed] frappe.require is now async 💥

2016-04-29 17:22:42 +05:30

docs

Update concepts-and-terms.md

2016-05-11 09:43:10 +08:00

fixtures

[fix] web forms for collaborative pm

2016-03-30 11:00:42 +05:30

hr

Merge pull request #5298 from neilLasrado/sal-slip

2016-05-09 16:56:51 +05:30

hub_node

removed Is Sales Item and Is Purchase Item

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

manufacturing

fixed conflict

2016-05-11 12:52:31 +05:30

patches

Merge branch 'master' into develop

2016-05-02 15:19:17 +05:30

portal

[minor] added beta for homepage

2016-05-10 17:46:28 +05:30

projects

Merge pull request #5296 from KanchanChauhan/websitemakeover

2016-05-02 15:54:41 +05:30

public

Merge pull request #5329 from KanchanChauhan/shoppingcart-cleanup

2016-05-10 17:35:02 +05:30

selling

Merge pull request #5329 from KanchanChauhan/shoppingcart-cleanup

2016-05-10 17:35:02 +05:30

setup

New look to the website

2016-05-02 11:43:44 +05:30

shopping_cart

New look to the website

2016-05-02 11:43:44 +05:30

startup

[enhancement] heatmaps on item and notifications for item

2016-04-14 17:30:53 +05:30

stock

fixed conflict

2016-05-11 12:52:31 +05:30

support

Merge pull request #5296 from KanchanChauhan/websitemakeover

2016-05-02 15:54:41 +05:30

templates

Shopping Cart error messages issue resolved

2016-05-10 17:19:47 +05:30

tests

removed client side test cases

2015-07-08 18:02:42 +05:30

translations

Merge branch 'master' into develop

2016-04-27 15:44:11 +05:30

utilities

New look to the website

2016-05-02 11:43:44 +05:30

__init__.py

[ux] added opening stock and rate in new Item

2016-04-15 16:44:44 +05:30

__version__.py

bumped to version 6.27.17

2016-05-11 13:13:39 +06:00

exceptions.py

[Minor]Changed CustomerDisabled and CustomerFrozen to PartyDisabled and PartyFrozen

2016-01-25 21:25:11 +05:30

hooks.py

fixed conflict

2016-05-11 12:52:31 +05:30

modules.txt

[css] portal

2016-04-22 18:53:21 +05:30

patches.txt

Merge branch 'master' into develop

2016-05-02 15:19:17 +05:30