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
..
accounts	Merge branch 'staging-fixes' of https://github.com/frappe/erpnext.git into Item-Tax-Template	2019-01-08 13:41:46 +05:00
agriculture	Doctypes in domains that are in beta are now restricted to that domain	2018-11-04 08:39:52 -05:00
assets	Merge pull request #15796 from Alsum/set_current_asset_value	2018-11-13 12:42:28 +05:30
buying	Merge branch 'staging-fixes' of https://github.com/frappe/erpnext.git into Item-Tax-Template	2019-01-08 13:41:46 +05:00
change_log	Email alert renamed to Notification (#14618)	2018-06-21 09:17:52 +05:30
commands
config	Merge branch 'staging' of https://github.com/frappe/erpnext.git into Item-Tax-Template	2019-01-06 04:43:13 +05:00
controllers	Merge branch 'staging-fixes' of https://github.com/frappe/erpnext.git into Item-Tax-Template	2019-01-08 13:41:46 +05:00
crm	Do not display gender for companies (#15728)	2018-10-18 16:49:49 +05:30
demo	fix(pos-profile): Cleanup Form for POS Profile (#16208)	2018-12-14 14:19:14 +05:30
domains	[fix] Healthcare field and desktop icon (#15638)	2018-10-10 14:44:36 +05:30
education	fix: remove paid_amount and modify query	2018-12-17 16:47:17 +05:30
erpnext_integrations	[Feature] ERPNext Quickbooks Migrator (#15718)	2018-10-17 17:50:00 +05:30
healthcare	Merge branch 'staging-fixes' into pr_staging_fixes	2018-11-26 20:25:34 +05:30
hotels	Doctypes in domains that are in beta are now restricted to that domain	2018-11-04 08:39:52 -05:00
hr	Merge branch 'staging-fixes' into fixed_salary_structure_employee_reqd	2019-01-07 14:30:23 +05:30
hub
hub_node	fix(hub): Prevent registered actions	2018-11-05 19:18:48 +05:30
maintenance	Refactor Naming Series (#15070)	2018-08-28 13:44:48 +05:30
manufacturing	[Fix] Duplicate fieldnames operation and allow_alternative_item in BOM Item	2018-12-28 16:46:36 +05:30
non_profit	Doctypes in domains that are in beta are now restricted to that domain	2018-11-04 08:39:52 -05:00
patches	Added patch for Item Tax Template	2019-01-07 05:32:38 +05:00
portal	Fixed merge conflict	2018-08-29 13:34:58 +05:30
projects	fix: leave application and timesheet tests	2019-01-02 21:28:11 +05:30
public	Merge branch 'staging-fixes' of https://github.com/frappe/erpnext.git into Item-Tax-Template	2019-01-08 13:41:46 +05:00
regional	[Fix] FEC: Correction of the export function (#16252)	2018-12-24 14:20:35 +05:30
restaurant	Refactor Naming Series (#15070)	2018-08-28 13:44:48 +05:30
selling	Merge branch 'staging-fixes' of https://github.com/frappe/erpnext.git into Item-Tax-Template	2019-01-08 13:41:46 +05:00
setup	Merge branch 'staging-fixes' of https://github.com/frappe/erpnext.git into Item-Tax-Template	2019-01-08 13:41:46 +05:00
shopping_cart	Fix tests	2019-01-06 18:14:18 +05:00
startup	[Enhance][Fix] Healthcare - DocType and Fields renaming (#14861)	2018-07-16 18:08:53 +05:30
stock	Merge branch 'staging-fixes' of https://github.com/frappe/erpnext.git into Item-Tax-Template	2019-01-08 13:41:46 +05:00
support	Refactor Naming Series (#15070)	2018-08-28 13:44:48 +05:30
templates	feat(quality): Check quality status before receipt/delivery (#16169)	2018-12-24 14:54:42 +05:30
tests	Test case for contact references (#15077)	2018-09-05 11:00:14 +05:30
translations	[Translation] Updated Translations (#15414)	2018-09-17 16:54:30 +05:30
utilities	[Fix] Not able to delete department	2019-01-01 14:06:40 +05:30
www	Certfication Application Doctype and webform,Certfied Consultant DocType (#14528)	2018-06-15 10:04:19 +05:30
__init__.py	Merge branch 'master' into staging-fixes	2018-12-26 11:44:09 +00:00
exceptions.py
hooks.py	bumped to version 11.0.3-beta.33	2019-01-05 09:11:14 +00:00
modules.txt	Re-add Hub Node module	2018-09-12 16:36:10 +05:30
patches.txt	Added patch for Item Tax Template	2019-01-07 05:32:38 +05:00