Nabin Hait df61513037 Fixed merge conflict

2016-10-07 17:05:00 +05:30

..

accounts

Fixed merge conflict

2016-10-07 16:53:07 +05:30

buying

Documentation for payments

2016-10-06 16:49:39 +05:30

change_log

Change logs for v7

2016-08-22 15:50:21 +05:30

config

[translation] [fixes] #5860

2016-09-15 15:17:04 +05:30

controllers

Fixed merge conflict

2016-10-07 16:53:07 +05:30

crm

Opportunity, added supplier quotation in the dashboard

2016-09-19 18:36:21 +05:30

demo

rename total_billing_amount to total_billable_amount in timesheet doctype

2016-09-12 19:06:41 +05:30

docs

Fixed merge conflict

2016-10-07 16:53:07 +05:30

hr

Fixed merge conflict

2016-10-07 16:53:07 +05:30

hub_node

…

maintenance

Merge pull request #6267 from PawanMeh/fixes_6254

2016-09-12 13:03:14 +05:30

manufacturing

Fixed version conflict

2016-10-05 17:18:36 +05:30

patches

Fixed merge conflict

2016-10-07 17:05:00 +05:30

portal

Fixed view button functionality in homepage

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

projects

Fixed version conflict

2016-10-05 17:18:36 +05:30

public

Fixed merge conflict

2016-10-07 16:53:07 +05:30

schools

[minor] do not submit after accpeting payment

2016-10-05 19:20:37 +05:30

selling

Documentation for payments

2016-10-06 16:49:39 +05:30

setup

Fixed merge conflict

2016-10-07 16:53:07 +05:30

shopping_cart

[redesign] website routing system

2016-06-24 16:18:07 +05:30

startup

Notifications filters for DN, PR and PI

2016-09-05 14:35:40 +05:30

stock

Fixed merge conflict

2016-10-07 16:53:07 +05:30

support

Set warranty claim resolution date as today only if it is not set

2016-10-05 16:43:20 +05:30

templates

Fixed version conflict

2016-10-05 17:18:36 +05:30

tests

[minor] setting up website optional in setup wizard

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

translations

Fixed merge conflict

2016-10-07 16:53:07 +05:30

utilities

[translation] [fixes] #5860

2016-09-15 15:17:04 +05:30

__init__.py

bumped to version 7.0.57

2016-10-07 17:34:35 +06:00

exceptions.py

…

hooks.py

[enhance] added roles for portal users frappe/frappe#2091 (#6452)

2016-09-23 21:51:51 +05:30

modules.txt

Merge ERPNext Schools into ERPNext

2016-07-20 19:25:02 +05:30

patches.txt

Fixed merge conflict

2016-10-07 16:53:07 +05:30