Nabin Hait 6e9d2a3c1f fixed conflict

2017-01-09 17:21:34 +05:30

..

accounts

fixed conflict

2017-01-09 17:21:34 +05:30

buying

fixed conflict

2017-01-09 17:21:34 +05:30

change_log

changed version to beta

2016-12-15 19:37:53 +05:30

config

Added Guardian to school module

2016-12-28 16:15:35 +05:30

controllers

Fixed version conflict

2016-12-23 17:43:42 +05:30

crm

Email ID renamed to Email Address

2017-01-03 16:45:38 +05:30

demo

[fix] paging for products (support)

2016-12-19 11:55:10 +05:30

docs

Update step-8-customer-names.md

2017-01-05 08:34:58 +05:30

fleet_management

[minor] rename icons as per FontAwesome 4 (#7136)

2016-12-05 14:17:26 +05:30

hr

[minor] [tests] fix, tests will fail on the 5th of a month!

2017-01-06 17:21:04 +05:30

hub_node

removed Is Sales Item and Is Purchase Item

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

maintenance

[minor] rename icons as per FontAwesome 4 (#7136)

2016-12-05 14:17:26 +05:30

manufacturing

Fixed spelling errors on Production Planning Tool and manual.

2016-12-28 18:15:45 +08:00

patches

fixed conflict

2017-01-09 17:21:34 +05:30

portal

Fixed view button functionality in homepage

2016-09-28 14:08:47 +05:30

projects

fixed conflict

2017-01-09 17:21:34 +05:30

public

fixed conflict

2017-01-09 17:21:34 +05:30

schools

fixed conflict

2017-01-09 17:21:34 +05:30

selling

fixed conflict

2017-01-09 17:21:34 +05:30

setup

fixed conflict

2017-01-09 17:21:34 +05:30

shopping_cart

Replaced spaces with tabs

2016-12-08 15:44:16 +05:30

startup

[Enhancement] Added letter head for the report (#7250)

2016-12-20 16:54:24 +05:30

stock

fixed conflict

2017-01-09 17:21:34 +05:30

support

Added standard filters

2016-12-15 14:57:20 +05:30

templates

Merge pull request #7354 from Scheercuzy/enlarge-item-image-website

2017-01-04 15:58:44 +05:30

tests

[minor] setting up website optional in setup wizard

2016-08-09 16:44:37 +05:30

translations

Email ID renamed to Email Address

2017-01-03 16:45:38 +05:30

utilities

Email ID renamed to Email Address

2017-01-03 16:45:38 +05:30

__init__.py

bumped to version 7.2.7

2017-01-09 17:27:10 +06:00

exceptions.py

…

hooks.py

[minor] update font awesome icons

2016-12-07 11:09:02 +05:30

modules.txt

Fixes 6171 (#6417)

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

patches.txt

[fix] item variants not directly shown in website due to route clash

2016-12-27 12:30:30 +05:30