Nabin Hait 76bb927337 Fixed conflict

2015-08-31 17:28:05 +05:30

..

accounts

Fixed conflict

2015-08-31 17:28:05 +05:30

buying

Fixed conflict

2015-08-31 17:28:05 +05:30

change_log

[fix] returned_qty reapply and change-log

2015-08-27 12:00:16 +05:30

config

Merge pull request #3806 from neilLasrado/item-variants

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

controllers

Multi currency: test case and fixes

2015-08-28 19:24:22 +05:30

crm

Exported all doctypes

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

hr

Exported all doctypes

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

hub_node

Exported all doctypes

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

manufacturing

Exported all doctypes

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

patches

Fixed conflict

2015-08-31 17:28:05 +05:30

projects

Exported all doctypes

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

public

Fixed merge conflict

2015-08-27 14:55:34 +05:30

selling

Fixed conflict

2015-08-31 17:28:05 +05:30

setup

Fixed conflict

2015-08-31 17:28:05 +05:30

shopping_cart

Exported all doctypes

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

startup

Show Communication in CRM

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

stock

Fixed conflict

2015-08-31 17:28:05 +05:30

support

Exported all doctypes

2015-08-27 17:04:39 +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

[hotfix] translation in es.csv

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

utilities

Exported all doctypes

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

__init__.py

…

__version__.py

bumped to version 5.8.2

2015-08-26 18:27:24 +06:00

hooks.py

bumped to version 5.8.2

2015-08-26 18:27:24 +06:00

modules.txt

[cleanup] Party Type deleted

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

patches.txt

Fixed merge conflict

2015-08-27 14:55:34 +05:30

tasks.py

Changed company name from Web Notes to Frappe Technologies

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