Nabin Hait 13d8835b75 Fixed merge conflict

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

..

controllers

Fixed merge conflict

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

pos

Outstanding, paid and write-off amount in Invoice

2015-08-27 12:28:36 +05:30

templates

[cleanup] layouts of item, customer, supplier, lead

2015-08-26 10:51:45 +05:30

utils

Changed company name from Web Notes to Frappe Technologies

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

account_tree_grid.js

[rename] group_or_ledger to is_group

2015-04-23 13:14:17 +05:30

conf.js

[fix] [mobile] abs url erpnext icon

2015-08-05 14:49:32 +05:30

feature_setup.js

Sales BOM renamed to Product Bundle

2015-07-13 12:41:27 +05:30

financial_statements.js

Fixed code to consider partial FG entry

2015-08-10 19:14:43 +05:30

purchase_trends_filters.js

Changed company name from Web Notes to Frappe Technologies

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

queries.js

[refactor] added dynamic link in journal entry, #3847

2015-08-12 12:28:33 +05:30

sales_trends_filters.js

Changed company name from Web Notes to Frappe Technologies

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

shopping_cart.js

Changed company name from Web Notes to Frappe Technologies

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

sms_manager.js

Changed company name from Web Notes to Frappe Technologies

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

startup.js

Changed company name from Web Notes to Frappe Technologies

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

stock_analytics.js

[fix] Stock analytics report fixed for fifo stack related to stock reco

2015-06-03 16:44:26 +05:30

stock_grid_report.js

load all js and css like before in desk.html

2015-03-06 13:17:26 +05:30

utils.js

Validate serial no in return entry with against document

2015-08-04 12:18:12 +05:30

website_utils.js

[email] [website] footer cleanup

2015-05-26 12:15:39 +05:30