Saif Ur Rehman 380b4b0926 Merge branch 'staging-fixes' of https://github.com/frappe/erpnext.git into Item-Tax-Template ...

# Conflicts:
#	erpnext/accounts/doctype/accounts_settings/accounts_settings.json
#	erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
#	erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
#	erpnext/accounts/doctype/sales_invoice/sales_invoice.json
#	erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
#	erpnext/buying/doctype/purchase_order/purchase_order.json
#	erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
#	erpnext/buying/doctype/supplier/supplier.json
#	erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
#	erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json
#	erpnext/selling/doctype/quotation/quotation.json
#	erpnext/selling/doctype/quotation_item/quotation_item.json
#	erpnext/selling/doctype/sales_order/sales_order.json
#	erpnext/selling/doctype/sales_order_item/sales_order_item.json
#	erpnext/setup/doctype/item_group/item_group.json
#	erpnext/stock/doctype/delivery_note/delivery_note.json
#	erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
#	erpnext/stock/doctype/item/item.json
#	erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json

2019-01-08 13:41:46 +05:00

..

agriculture

Agriculture module corrections (#13438)

2018-04-02 10:51:53 +05:30

controllers

fix: Only load transaction's company's tax accounts in item tax map

2018-12-29 02:25:00 +05:00

education

minor fixes in the assessment result tool (#11795)

2017-11-30 11:39:06 +05:30

hub

fix(hub): Prevent registered actions

2018-11-05 19:18:48 +05:30

leaflet

[Agriculture Domain] (#11663)

2017-12-06 18:36:27 +05:30

payment

Allow no ZERO Payment

2018-01-29 15:39:52 +01:00

pos

Merge branch 'master' into staging-fixes

2018-10-23 08:01:13 +00:00

projects

fix: Element selector

2018-11-27 13:11:30 +05:30

templates

Payroll Entry - Validate Attendance (#14738)

2018-06-28 23:28:07 +05:30

utils

Fix tests

2019-01-06 18:14:18 +05:00

account_tree_grid.js

Remove unnecessary columns Analytics Reports (#13344)

2018-03-22 11:12:02 +05:30

communication.js

[fix] primary button color for make

2018-01-23 16:08:52 +05:30

conf.js

Rename 'Chat' to 'Gitter Chat'

2018-12-12 21:29:55 +05:30

event.js

Events in timeline (#15485)

2018-10-03 10:41:26 +05:30

financial_statements.js

fix(report): Cost center filters in financial statements and general ledger

2018-09-07 13:17:23 +05:30

help_links.js

Email alert renamed to Notification (#14618)

2018-06-21 09:17:52 +05:30

purchase_trends_filters.js

controller and other changes

2018-05-14 11:45:38 +05:30

queries.js

[gst] adde reports + docs

2017-06-22 22:32:08 +05:30

sales_trends_filters.js

Lint and fix JS files

2017-05-30 12:54:42 +05:30

setup_wizard.js

Merge branch 'master' into staging-fixes

2018-12-26 11:44:09 +00:00

shopping_cart.js

Update shopping_cart.js

2018-03-09 16:28:25 +05:30

sms_manager.js

Removal of SMS Settings and SMS Parameters from ERPNext (#10033)

2017-08-08 14:55:30 +05:30

stock_analytics.js

Remove unnecessary columns Analytics Reports (#13344)

2018-03-22 11:12:02 +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

fix: Codacy issues and added test case

2019-01-01 20:28:49 +05:30

website_utils.js

Newsletter moved to Frappe

2016-06-28 17:28:40 +05:30