Nabin Hait f76d63b92a Merge branch 'develop' of https://github.com/frappe/erpnext into multi-currency ...

[fix][patch] delete item variant attributes if no variants exists against that item

2015-09-10 19:26:02 +05:30

..

accounts

Merge branch 'develop' of https://github.com/frappe/erpnext into multi-currency

2015-09-10 19:26:02 +05:30

buying

Fixed conflict

2015-09-09 18:45:41 +05:30

change_log

[change-log]

2015-09-09 15:23:16 +05:30

config

Merge pull request #3806 from neilLasrado/item-variants

2015-08-18 16:13:10 +05:30

controllers

Fixed conflict

2015-09-09 18:45:41 +05:30

crm

Fixed conflict

2015-09-09 18:45:41 +05:30

hr

[minor] Unset Apply User Permissions in default permissions

2015-09-08 19:23:23 +05:30

hub_node

Exported all doctypes

2015-08-27 17:04:39 +05:30

manufacturing

Planned Qty logic fixed and reposted for existing

2015-09-09 11:04:10 +05:30

patches

Merge branch 'develop' of https://github.com/frappe/erpnext into multi-currency

2015-09-10 19:26:02 +05:30

projects

[minor] Unset Apply User Permissions in default permissions

2015-09-08 19:23:23 +05:30

public

Payment Tool changes due to multi currency

2015-08-31 19:01:11 +05:30

selling

Fixed conflict

2015-09-09 18:45:41 +05:30

setup

Merge branch 'develop' of https://github.com/frappe/erpnext into multi-currency

2015-09-10 19:26:02 +05:30

shopping_cart

Exported all doctypes

2015-08-27 16:45:52 +05:30

startup

Show Communication in CRM

2015-08-17 17:58:51 +05:30

stock

Fixed conflict

2015-09-09 18:45:41 +05:30

support

[minor] Unset Apply User Permissions in default permissions

2015-09-08 19:23:23 +05:30

templates

[layout cleanup] in Quotation, Sales Order, Delivery Note

2015-08-26 18:53:37 +05:30

tests

removed client side test cases

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

translations

[translations]

2015-09-08 15:53:54 +05:30

utilities

[minor] Unset Apply User Permissions in default permissions

2015-09-08 19:23:23 +05:30

__init__.py

keep version in separate file

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

__version__.py

bumped to version 6.1.1

2015-09-09 19:12:48 +06:00

hooks.py

bumped to version 6.1.1

2015-09-09 19:12:48 +06:00

modules.txt

[cleanup] Party Type deleted

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

patches.txt

Fixed conflict

2015-09-09 18:45:41 +05:30

tasks.py

Changed company name from Web Notes to Frappe Technologies

2015-03-03 14:56:43 +05:30