Nabin Hait 391eca18c7 Fixed merge conflict

2017-02-20 19:38:22 +05:30

..

__init__.py

Item, Item Group and Partner Web Page generators moved from Shopping Cart to ERPNext

2014-04-18 16:20:07 +05:30

bom.html

[minor] duration bar

2017-02-16 09:27:53 +05:30

item_group.html

[minor] translation fix

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

item.html

[fix] view shopping cart dropdown (#6928)

2016-11-14 13:13:53 +05:30

job_opening.html

[Fix] Apply Now button redirect fixed for Job Opening

2017-02-10 17:58:41 +05:30

sales_partner.html

[minor] font-awesome fixes

2016-12-05 15:02:24 +05:30

student_admission.html

[minor] direct student admission to the list page

2016-10-09 15:19:23 +05:30