Nabin Hait 972c25f78d Fixed conflict

2016-04-14 18:25:53 +05:30

..

accounts

Fixed conflict

2016-04-14 18:25:53 +05:30

buying

Fixed conflict

2016-04-14 18:25:53 +05:30

change_log

[change-log]

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

config

[cleanup] link dashboard for customer, supplier, item, employee and hide form by default

2016-04-13 17:22:09 +05:30

controllers

Fixed conflict

2016-04-14 18:25:53 +05:30

crm

Fixed conflict

2016-04-14 18:25:53 +05:30

docs

Update quotation.md

2016-04-08 17:55:04 +07:00

fixtures

[fix] web forms for collaborative pm

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

hr

Fixed conflict

2016-04-14 18:25:53 +05:30

hub_node

[fix] Get defaults based on doctype or fieldname

2015-12-23 16:37:06 +05:30

manufacturing

Fixed conflict

2016-04-14 18:25:53 +05:30

patches

Fixed conflict

2016-04-14 18:25:53 +05:30

projects

Update project.py

2016-04-14 10:53:08 +08:00

public

Fixed conflict

2016-04-14 18:25:53 +05:30

selling

Fixed conflict

2016-04-14 18:25:53 +05:30

setup

Fixed conflict

2016-04-14 18:25:53 +05:30

shopping_cart

[Fixes] Supplier can view their addresses, default buying price list issue

2016-04-11 13:58:33 +05:30

startup

[enhancement] heatmaps on item and notifications for item

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

stock

Fixed conflict

2016-04-14 18:25:53 +05:30

support

Fixed conflict

2016-04-14 18:25:53 +05:30

templates

[Fixes] Supplier can view their addresses, default buying price list issue

2016-04-11 13:58:33 +05:30

tests

removed client side test cases

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

translations

[update] translations

2016-03-21 14:35:36 +05:30

utilities

[test] fixed circular dependencies

2016-04-08 17:55:11 +05:30

__init__.py

keep version in separate file

2014-05-28 16:58:55 +05:30

__version__.py

bumped to version 6.27.8

2016-04-13 16:34:37 +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-04-14 18:25:53 +05:30

modules.txt

[cleanup] Party Type deleted

2015-07-23 11:45:30 +05:30

patches.txt

Fixed conflict

2016-04-14 18:25:53 +05:30