Nabin Hait ba03ef775d Fixed merge conflict

2016-09-28 10:47:41 +05:30

..

accounts

Fixed merge conflict

2016-09-28 10:47:41 +05:30

buying

[fix] space

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

change_log

…

config

[translation] [fixes] #5860

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

controllers

[Enhancement] Supplier quotation added on supplier portal

2016-09-21 17:07:25 +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

Update stock-entry.md

2016-09-19 15:38:38 +08:00

hr

added required fields in doctypes for gantt (#6466)

2016-09-26 18:20:14 +05:30

hub_node

…

maintenance

Merge pull request #6267 from PawanMeh/fixes_6254

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

manufacturing

added required fields in doctypes for gantt (#6466)

2016-09-26 18:20:14 +05:30

patches

Fixed version conflict

2016-09-26 18:11:56 +05:30

portal

…

projects

change to link of gantt in project (#6469)

2016-09-27 09:56:17 +05:30

public

Fixed version conflict

2016-09-23 12:16:31 +05:30

schools

[minor] add paid field in Student Applicant

2016-09-23 23:50:55 +05:30

selling

Fixed version conflict

2016-09-23 12:16:31 +05:30

setup

Fixed version conflict

2016-09-26 18:11:56 +05:30

shopping_cart

…

startup

…

stock

Fixed version conflict

2016-09-26 18:11:56 +05:30

support

…

templates

[fix] space

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

tests

…

translations

…

utilities

[translation] [fixes] #5860

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

__init__.py

bumped to version 7.0.50

2016-09-28 11:16:36 +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

…

patches.txt

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

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