3526 Commits

Author	SHA1	Message	Date
Rohit Waghchaure	9665a531fc	fix: item variant test cases	2019-04-11 09:56:00 +05:30
Rohit Waghchaure	f3a9552e48	fix: item variant test cases	2019-04-10 17:57:09 +05:30
Faris Ansari	4da3d0015a	fix: Validate variant attributes only if is_new	2019-04-09 17:40:53 +05:30
Mangesh-Khairnar	16c4fd6733	Merge branch 'develop' of https://github.com/frappe/erpnext into so-on-hold	2019-04-09 12:13:45 +05:30
Mangesh-Khairnar	1934a76cd8	feat: Add status field in multiple reports linked with purchase order and sales order creation (#17107) ... * enhancement: add status field in ordered itemd to be delivered * enhancement: add status field in purchase order itemd to be received * enhancement: add a status column in the billed reports	2019-04-08 16:29:59 +05:30
Nabin Hait	f1698bb2df	fix: unique variant based on	2019-04-08 14:59:43 +05:30
rohitwaghchaure	bc02ee23e0	Merge pull request #17078 from rohitwaghchaure/unlinked_advance_payment_on_cancellation_of_order ... feat: provision to unlink advance payment entry on cancelation of order	2019-04-06 12:30:05 +05:30
Nabin Hait	843e440191	Merge branch 'hotfix' into validate_stock_transaction_v11	2019-04-05 15:41:26 +05:30
Nabin Hait	9302a19d74	Merge pull request #17135 from hrwX/validate_stock_transaction_v12 ... fix(Item): check transactions for batch, serial check	2019-04-05 15:40:19 +05:30
Nabin Hait	603dce428b	Merge pull request #17144 from nabinhait/variant-fix ... fix: Default variant Based on	2019-04-05 15:38:15 +05:30
rohitwaghchaure	e334413b34	Merge pull request #17141 from rohitwaghchaure/incorrect_pos_profile_selected_if ... fix: incorrect auto POS profile selected in the sales invoice	2019-04-05 13:04:05 +05:30
Mangesh-Khairnar	3d667b4c94	Merge branch 'develop' of https://github.com/frappe/erpnext into po-on-hold	2019-04-05 12:11:26 +05:30
Nabin Hait	a3357e4e86	fix: Default variant Based on	2019-04-05 12:10:36 +05:30
Rohit Waghchaure	e8e3fb175d	fix: incorrect POS profile selected	2019-04-05 09:57:52 +05:30
Rohit Waghchaure	f7a83cb4f5	fix: incorrect POS profile selected	2019-04-05 00:42:48 +05:30
Himanshu Warekar	cdd79e3c40	fix: check transactions for batch, serial check	2019-04-04 15:26:35 +05:30
Himanshu Warekar	7f253b679a	pull from hotfix	2019-04-04 15:19:44 +05:30
Himanshu Warekar	28db545947	fix: check transactions for batch, serial check	2019-04-04 15:02:25 +05:30
Nabin Hait	2df623c693	Merge pull request #17072 from kennethsequeira/auto-re-val ... fix: spelling in validation message for Auto-reorder	2019-04-04 11:40:08 +05:30
Nabin Hait	1e5664ba5f	Update item.py	2019-04-04 11:39:55 +05:30
Rushabh Mehta	3720e64506	fix(kaizen): warehouse account description	2019-04-04 09:02:41 +05:30
Rushabh Mehta	1f0edabda8	fix(kaizen): warehouse account description	2019-04-04 08:58:34 +05:30
Rohit Waghchaure	5fa9a7a1b4	feat: unlink advance payment entry on cancelation of order	2019-04-01 00:40:38 +05:30
Nabin Hait	da7a193f11	fix(stock): Fixed stock balance and stock ledger report	2019-03-30 15:53:04 +05:30
Kenneth Sequeira	4f5839eb65	fixed spelling in validation message ... fixed typo in auto-reorder validation message	2019-03-30 15:37:51 +05:30
rohitwaghchaure	725f37cea5	Revert "fix(Delivery Note): Fix issue credit note"	2019-03-30 13:21:50 +05:30
rohitwaghchaure	f3a1fa0bae	Revert "Fix(Delivery Note): Fix issue credit note"	2019-03-30 12:33:54 +05:30
rohitwaghchaure	b6505bddeb	Merge pull request #17025 from hrwX/fix_issue_credit ... fix(Delivery Note): Fix issue credit note	2019-03-30 12:31:29 +05:30
rohitwaghchaure	5fdbdd50f9	Merge pull request #16950 from hrwX/fix-issue-credit ... Fix(Delivery Note): Fix issue credit note	2019-03-30 12:31:18 +05:30
Rushabh Mehta	c4599c21c3	fix(test): item variant	2019-03-29 18:30:00 +05:30
Rushabh Mehta	048e5f44b5	fix(test): item variant	2019-03-29 14:34:14 +05:30
Nabin Hait	d4e038b6ca	Merge branch 'hotfix' of https://github.com/frappe/erpnext into develop	2019-03-29 12:41:48 +05:30
Nabin Hait	0a90ce5cf6	Refactored deferred revenue booking logic	2019-03-28 19:43:02 +05:30
Himanshu Warekar	a86f3a7d80	remove issue credit note	2019-03-27 10:01:18 +05:30
rohitwaghchaure	fa638443bc	Merge pull request #16925 from rohitwaghchaure/stock_entry_enhancements ... feat: stock entry enhancements	2019-03-26 22:50:54 +05:30
Nabin Hait	8aaee57921	fix(uom): Get items as per UOM defined in BOM, fixes #15081	2019-03-26 16:53:13 +05:30
rohitwaghchaure	e196b3120e	Merge pull request #16961 from rohitwaghchaure/stock_ageing_warehouse_wise ... feat: Stock ageing report warehouse wise	2019-03-26 16:21:17 +05:30
Rohit Waghchaure	5816fc2801	Renamed subcontract to Send to Subcontractor	2019-03-26 12:52:49 +05:30
Rohit Waghchaure	ffbeb02428	renamed purpose in stock entry	2019-03-26 12:52:32 +05:30
Rohit Waghchaure	c7b916ac46	fix: test cases	2019-03-26 12:52:32 +05:30
Rohit Waghchaure	9faed1b433	feat: added button get items from material request in stock entry	2019-03-26 12:52:31 +05:30
Rohit Waghchaure	8ce2d50706	Added test cases	2019-03-26 12:52:31 +05:30
Rohit Waghchaure	186c758087	feat: added good in transit feature in the stock entry	2019-03-26 12:52:31 +05:30
Rohit Waghchaure	1f2f9cf360	feat: added stock entry type master to select purpose in the stock entry	2019-03-26 12:52:31 +05:30
Mangesh-Khairnar	324e06cba0	Merge branch 'develop' of https://github.com/frappe/erpnext into so-on-hold	2019-03-25 18:51:13 +05:30
Mangesh-Khairnar	5e474f4664	fix: add server-side validation for closed sales order for linked material request	2019-03-25 17:28:20 +05:30
Rushabh Mehta	5770ad9e8c	Merge pull request #16963 from itusedyetnew/develop ... Fix:stock_values_on removed append function on string	2019-03-25 12:03:53 +05:30
Frappe Bot	b07a5d449d	Merge branch 'master' into develop	2019-03-23 07:25:03 +00:00
Nabin Hait	95705412f3	fix(uom): Get items as per UOM defined in BOM, fixes #15081	2019-03-22 13:19:17 +05:30
Rushabh Mehta	7678c7b179	Merge pull request #16869 from rohitwaghchaure/not_able_to_submit_purchase_receipt ... fix: purchase receipt not able to submit because default inventory account has not selected in another company	2019-03-22 12:47:06 +05:30
Rushabh Mehta	9c43c8f00b	Merge pull request #16554 from SaiFi0102/Brand-Item-Defaults-V12 ... feat: Brand Item Defaults (v12)	2019-03-22 12:46:04 +05:30
Saurabh	3c95387926	Merge branch 'master' into develop	2019-03-20 14:39:49 +05:30
itusedyetnew	8aafbd22de	stock_values_on append function on string	2019-03-20 11:10:41 +05:30
Rohit Waghchaure	ca9f93cdc2	feat: Stock ageing warehouse wise	2019-03-20 02:14:54 +05:30
Rohit Waghchaure	8bfe330b37	feat: pricing rule enhancements	2019-03-19 12:44:30 +05:30
Faris Ansari	5f8b358fd4	Website: Product Configurator and Bootstrap 4 (#15965) ... - Refactored Homepage with customisable Hero Section - New Homepage Section to add content on Homepage as cards or using Custom HTML - Products page at "/all-products" with customisable filters - Item Configure dialog to find an Item Variant filtered by attribute values - Contact Us dialog on Item page - Customisable Item page content using the Website Content field	2019-03-19 11:48:32 +05:30
Himanshu Warekar	2f5f17fcbb	refactor: fix issue credit note	2019-03-18 21:46:26 +05:30
Mangesh-Khairnar	873c579bb4	fix: check for both hold and closed status in po	2019-03-18 12:14:25 +05:30
Mangesh-Khairnar	a1afd78723	feat: add validation for on hold purchase order	2019-03-18 12:14:25 +05:30
rohitwaghchaure	fd33c55760	Merge pull request #16865 from rohitwaghchaure/purchase_invoice_asset_issue_not_able_to_submit ... feat: added provision to disable CWIP accounting in asset settings	2019-03-16 12:18:36 +05:30
Rushabh Mehta	957a3307ae	Merge pull request #16634 from Alchez/hotfix-stock-balance-balance ... fix(stock_balance): Make balance qty and value columns more visible in the Stock Balance report	2019-03-15 09:02:20 +05:30
Rohit Waghchaure	267723f57b	fix: stock ledgre report not working	2019-03-11 14:06:00 +05:30
Rohit Waghchaure	6b33c9b934	fix: purchase receipt not able to submit because default inventory account has not selected in another company	2019-03-08 11:13:35 +05:30
Rohit Waghchaure	821a002125	feat: added provision to disable CWIP accounting in asset settings	2019-03-08 10:51:37 +05:30
Saif Ur Rehman	e62bd893c5	Merge branch 'develop' of https://github.com/frappe/erpnext.git into Brand-Item-Defaults-V12 ... # Conflicts: # erpnext/stock/doctype/item/test_item.py	2019-03-08 01:29:39 +05:00
Jay Parikh	9757a603fa	Fix Company Default to Total Stock Summary Report	2019-03-06 12:44:41 +00:00
Rohan Bansal	e66f59654e	fix(report): Incorrectdata for balance quantity and value in Stock Balance report	2019-03-06 16:04:11 +05:30
Mangesh-Khairnar	86e650c1ed	feat: validate linked sales order on material request creation	2019-03-02 20:48:04 +05:30
Mangesh-Khairnar	1c276e9828	feat: validate on hold sales order	2019-03-02 20:48:04 +05:30
Frappe Bot	1fcae10258	Merge branch 'master' into develop	2019-02-28 10:20:48 +00:00
Rohit Waghchaure	b48effebce	fix: test case	2019-02-27 19:33:22 +05:30
Rohit Waghchaure	cd34c70670	fix: bom cost update is not working	2019-02-27 18:01:30 +05:30
Saurabh	3dd7ddd838	Merge branch 'master' into develop	2019-02-21 18:25:29 +05:30
Nabin Hait	e08cb3a49b	Merge pull request #16745 from nabinhait/manage-returned-qty ... fix: Consider returned qty while making invoice from DN / PR	2019-02-21 18:11:37 +05:30
Suraj Shetty	463a3cf8cf	Merge pull request #16725 from deepeshgarg007/item_dashboard ... fix: Item name display issue fix in item dashboard	2019-02-21 14:42:38 +05:30
Nabin Hait	816a4655a0	fix: Consider returned qty while making invoice from DN / PR	2019-02-21 12:02:36 +05:30
Saurabh	482ebd2c7c	Merge branch 'master' into develop	2019-02-20 18:14:18 +05:30
deepeshgarg007	942c894f93	fix: fetch item name in item dashboard	2019-02-19 19:51:23 +05:30
Rohit Waghchaure	389cd6ad63	fix: stop button not working in material request	2019-02-19 19:18:07 +05:30
Sagar Vora	cc6e51c62d	Merge branch 'master' into develop	2019-02-19 18:09:49 +05:30
Nabin Hait	8e9d947527	Merge branch 'hotfix' into fix-item-variant-settings-barcodes	2019-02-19 15:07:46 +05:30
Nabin Hait	818ead4041	Merge branch 'hotfix' into purchase-qty-fix	2019-02-19 15:06:10 +05:30
deepeshgarg007	de0f59b818	fix: Removed precision from multiple doctypes	2019-02-19 08:40:16 +05:30
deepeshgarg007	9a19e06856	fix: Change Received qty to accepted qty and validation for indicators	2019-02-18 18:42:15 +05:30
Suraj Shetty	cc0222a28a	Remove unwanted barcode field from item	2019-02-16 17:53:23 +05:30
Frappe Bot	74fd5daeb2	Merge branch 'master' into develop	2019-02-15 10:22:33 +00:00
Nabin Hait	b819f104e6	Merge pull request #16653 from nabinhait/item-variants ... fix: Enqueued item variants updation if there are more than 30 variants	2019-02-15 14:51:14 +05:30
Sagar Vora	921f468950	Merge branch 'hotfix' into get-item-details	2019-02-15 13:03:04 +05:30
Nabin Hait	54f8ed1282	Merge branch 'hotfix' into item-variants	2019-02-14 18:50:11 +05:30
Nabin Hait	0d1ccc357f	fix: get item details	2019-02-14 18:30:10 +05:30
Deepesh Garg	4d1bc0ca85	fix: Add total row in analytics report (#16648)	2019-02-13 16:58:46 +05:30
Faris Ansari	a748ca69e7	fix: Validate invalid fields in Item Variant Settings ... - Some fields like barcodes cannot be copied in Item Variants - Wrote a patch that deletes the fields if they exist - Also, validate in controller	2019-02-13 13:02:39 +05:30
rohitwaghchaure	a0aaeafae8	Merge pull request #16644 from rohitwaghchaure/fix_work_order_time_log_msg ... fix: validation message for work order	2019-02-13 09:49:25 +05:30
Nabin Hait	db527bfb24	fix: Enqueued item variants updation if there are more than 30 variants	2019-02-12 18:30:00 +05:30
Sagar Vora	551f52fd25	Merge branch 'master' into develop	2019-02-12 16:41:24 +05:30
Nabin Hait	fdefbdb23b	Merge pull request #16609 from nabinhait/multipel_fixes ... Multiple fixes	2019-02-12 13:56:06 +05:30
Rohit Waghchaure	e0412a177c	fix: validation message for work order	2019-02-12 11:47:16 +05:30
Rohan Bansal	d635f722fc	fix(stock_balance): Make balance qty and value columns more visible	2019-02-11 15:22:01 +05:30
rohitwaghchaure	d95c8cfac3	Merge pull request #16621 from netchampfaris/fix-warehouse-currency ... fix: Set company_currency for Warehouse Tree	2019-02-11 14:58:02 +05:30
Nabin Hait	bb6438af5a	Merge pull request #16537 from nabinhait/stock-balance-fix ... fix: Fixed error on stock balance report	2019-02-11 11:00:01 +05:30
Faris Ansari	453964728d	fix: Set company_currency for Warehouse Tree	2019-02-09 20:27:42 +05:30
Nabin Hait	17e0513270	fix: message if stock reco is enqueued	2019-02-08 16:56:26 +05:30
Nabin Hait	8d4bb3e327	fix: backflush only if transferred item is present in work order	2019-02-08 16:56:26 +05:30
Nabin Hait	450fe309d6	fix: allow updating title of material request	2019-02-08 16:56:26 +05:30
Aditya Hase	6e1bb60b58	fix(py3): Convert filter to list for indexing	2019-02-07 22:21:05 +05:30
Aditya Hase	e1f867f29f	fix(py3): Explicitly convert to float for comparison	2019-02-07 22:21:05 +05:30
Aditya Hase	691c166a56	fix(py3): Use six.text_type instead of unicode	2019-02-07 20:35:52 +05:30
Sagar Vora	da1dc7fa52	Merge branch 'master' into develop	2019-02-05 18:40:39 +05:30
Saif Ur Rehman	590491779a	Merge branch 'develop' of https://github.com/frappe/erpnext.git into Brand-Item-Defaults-V12 ... # Conflicts: # erpnext/stock/doctype/item/item.py	2019-02-02 02:49:04 +05:00
Saif Ur Rehman	00aaa48779	test(Item): test_item_defaults	2019-02-02 02:43:44 +05:00
Saif Ur Rehman	1a441b267d	Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12 ... # Conflicts: # erpnext/patches.txt	2019-02-01 19:17:04 +05:00
Saif Ur Rehman	c8b61007b0	Merge branch 'master' of https://github.com/frappe/erpnext.git into Brand-Item-Defaults ... # Conflicts: # erpnext/setup/doctype/brand/brand.json # erpnext/stock/get_item_details.py	2019-02-01 17:05:46 +05:00
Nabin Hait	f3f4ce9b87	fix: Fetch data based on item group filter in item dashboard stock balance report	2019-02-01 12:01:19 +05:30
Nabin Hait	9ea19b8fe1	fix: Fixed error on stock balance report	2019-01-31 15:53:25 +05:30
Sagar Vora	f97c5dad82	Merge branch 'staging' into develop	2019-01-29 18:39:14 +05:30
Nabin Hait	cc41b876fb	Merge pull request #16497 from nabinhait/bom_price ... BOM raw materials price	2019-01-29 14:58:40 +05:30
Nabin Hait	4e45663297	fix(stock): get item price based on party	2019-01-29 14:02:08 +05:30
Nabin Hait	8ba9545b72	Merge pull request #16498 from nabinhait/stock-ledger-report ... fix(stock): Escaping issue in stock ledger report	2019-01-29 11:30:15 +05:30
Nabin Hait	e8190473f5	Merge branch 'staging-fixes' into unicode	2019-01-29 11:13:04 +05:30
Nabin Hait	1187d61b56	fix(stock): Escaping issue in stock ledger report	2019-01-25 17:07:29 +05:30
Nabin Hait	01ca3e5e36	fix(manufacturing): Get raw materials rate from price list ignoring party	2019-01-25 16:25:15 +05:30
Nabin Hait	fc9e733d7f	Merge pull request #16483 from surajshetty3416/stock-levels-based-on-permission ... fix: Show stock levels in Item master based on user permissions	2019-01-25 09:48:43 +05:30
Saif Ur Rehman	3d275af67b	Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12 ... # Conflicts: # erpnext/buying/doctype/supplier/supplier.json # erpnext/patches.txt # erpnext/selling/doctype/customer/customer.json	2019-01-24 23:40:16 +05:00
Suraj Shetty	7a45887fa1	fix typo	2019-01-24 16:26:48 +05:30
Suraj Shetty	dd0496f7aa	Add missed out field field	2019-01-24 16:18:43 +05:30
Suraj Shetty	c165838228	Filter bin list based on warehouses that are accessible to the user	2019-01-24 15:45:46 +05:30
Frappe Bot	e415cce1a9	Merge branch 'staging' into develop	2019-01-23 08:19:00 +00:00
Aditya Hase	55a08dee78	style: Remove unusued local variable	2019-01-23 00:28:02 +05:30
Aditya Hase	f3c22f342c	fix(unicode): Import unicode_literals in every file	2019-01-22 18:36:10 +05:30
Saif Ur Rehman	74a3370095	Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12 ... # Conflicts: # erpnext/buying/doctype/purchase_order/purchase_order.json # erpnext/patches.txt # erpnext/selling/doctype/quotation/quotation.json # erpnext/selling/doctype/sales_order/sales_order.json	2019-01-22 16:20:40 +05:00
Sagar Vora	4d1a9b10ed	Merge branch 'staging' into develop	2019-01-22 15:56:39 +05:30
Nabin Hait	f0ea152022	Merge pull request #16289 from Anurag810/Quality-inspection-fix ... fix: validated quality inspection for delivery note(DN) and purchase receipt(PR)	2019-01-22 10:49:55 +05:30
Saif Ur Rehman	398f593e5f	Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12 ... # Conflicts: # erpnext/patches.txt	2019-01-18 17:33:19 +05:00
Nabin Hait	bace4d3e6d	Merge pull request #16358 from adityahase/naming-series ... feat(naming): Deferred naming for SLE and GL Entry	2019-01-18 10:55:30 +05:30
Nabin Hait	bef2c22d23	Fix: merge conflict	2019-01-18 10:15:47 +05:30
Nabin Hait	6202d0ed68	fix: NoneType comparison with int error	2019-01-18 09:40:24 +05:30
Nabin Hait	30667c160d	test: Inter company stock transfer for serialised items	2019-01-18 09:36:18 +05:30
Nabin Hait	5a87ac0ad8	fix: Inter company stock transfer for serialised items	2019-01-18 09:36:18 +05:30
Nabin Hait	983d102a19	Merge branch 'staging-fixes' into Quality-inspection-fix	2019-01-16 17:52:30 +05:30
Nabin Hait	3dd5f55412	feat(stock-reco): Fetch items in stock reco based on group warehouse	2019-01-16 16:20:05 +05:30
Nabin Hait	158e7dcd8b	fix(bom-uom_issue)Fetch rate in BOM from Price List based on UOM	2019-01-16 16:00:25 +05:30
Nabin Hait	7686aa9ff6	Merge pull request #16400 from Zlash65/fix-deff ... fix: for deferred settings for Item	2019-01-16 10:16:00 +05:30
Saurabh	7d630b3e29	Merge branch 'master' into staging-fixes	2019-01-15 19:41:09 +05:30
Zlash65	a3dd798bad	clean if conditions	2019-01-15 16:05:42 +05:30
Zlash65	627be1de51	minor fixes for deferred calculations	2019-01-15 14:16:50 +05:30
Nabin Hait	acd7f73d57	Merge branch 'hotfix' into group_warehouse_stock_reco	2019-01-14 20:25:53 +05:30
Nabin Hait	4ed7cfc515	tests(cost-center-company): Validate cost center's company and revent tests	2019-01-14 17:14:39 +05:30
Fisher Yu	2cd49f51e2	fix issue #16284, child table copy (#16285) ... * fix issue #16284, child table copy V11 Child table from Clipboard Excel error, can't multiply sequence by non-int of type 'float' * Update get_item_details.py consider the empty string case * Update get_item_details.py	2019-01-11 15:31:33 +05:30
Nabin Hait	0d208851a4	Fix(stock-reco): Fixed codacy issues	2019-01-10 17:56:11 +05:30
Nabin Hait	afbdaa525e	Merge pull request #16365 from hiousi/patch-1 ... fix: variant can not get its price	2019-01-10 10:36:27 +05:30
Saif Ur Rehman	8d61794540	Merge branch 'Item-Tax-Template' of https://github.com/SaiFi0102/erpnext.git into Item-Tax-Template-V12 ... # Conflicts: # erpnext/patches.txt # erpnext/stock/doctype/item/item.json	2019-01-10 04:23:40 +05:00
Saif Ur Rehman	edd0e2476f	chore: Updated item.json, no changes	2019-01-10 04:16:10 +05:00
Saif Ur Rehman	2689dea72a	fix: Give higher precedence to set_warehouse in get_item_details while setting item level warehouse	2019-01-09 13:43:06 +05:00
Saif Ur Rehman	eb7277d2d4	Merge branch 'staging-fixes' of https://github.com/frappe/erpnext.git into Item-Tax-Template ... # Conflicts: # erpnext/patches.txt	2019-01-09 11:25:53 +05:00
Saif Ur Rehman	091cfba5fc	test: Added test for get_item_tax_template and get_item_tax_map	2019-01-09 11:24:30 +05:00
hiousi	9671438435	Update get_item_details.py	2019-01-08 22:23:45 +01:00
hiousi	1516e29609	[fix] variant can not get its price ... get_price_list_rate() return empty dict before trying to get the item price for a variant.	2019-01-08 18:34:08 +01:00
Saurabh	afec3ca89a	Merge branch 'staging' into develop	2019-01-08 17:09:36 +05:30
rohitwaghchaure	ffdadbf97f	fix: fallback to stock uom if uom is not defined (#16329) ... * [minor] Code cleanup * fix: remove 'or' condition, won't execute	2019-01-08 16:21:25 +05:30
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
Nabin Hait	4c08aaef3d	Merge pull request #16290 from deepeshgarg007/stock-recon ... fix: Unorderable type error while making stock reconciliation entry	2019-01-08 11:55:49 +05:30
Aditya Hase	0c16424d7d	fix(naming): Use creation instead of name to order SLEs	2019-01-08 00:09:36 +05:30
Aditya Hase	7bc692d48d	feat(naming): Deferred naming for Stock Ledger Entry and GL Entry ... For fast lockless insertions use hash as autonaming method for temporarily naming Stock Ledger Entry and GL Entry In an hourly run scheduled job rename these entries using autoname options	2019-01-08 00:07:54 +05:30
Saif	e5091cbc0f	chore: Updated DocType JSON Files to Clean Up Git Diff of Other PRs (#16356) ... * chore: Updated DocType json files to clean up git diff of other PRs * fix: remove auto-generated file	2019-01-07 18:19:30 +05:30
Saif Ur Rehman	7ea6554f1f	Merge branch 'staging' of https://github.com/frappe/erpnext.git into Item-Tax-Template ... # Conflicts: # erpnext/selling/doctype/quotation_item/quotation_item.json # erpnext/stock/doctype/item/item.json	2019-01-06 04:43:13 +05:00
Saif Ur Rehman	b1288b75ba	fix: Test Records	2019-01-06 04:41:13 +05:00
Nabin Hait	47c9826b6f	test(reco-warehouse): Get items for group warehouse	2019-01-03 15:24:59 +05:30
Saif Ur Rehman	648bd15b2a	Force item_tax_rate on setting item details server-side	2019-01-03 04:03:54 +05:00
deepeshgarg007	9c0c633259	fix: Added validation for stock reconciliation in stock ledger entry	2019-01-02 11:31:55 +05:30
deepeshgarg007	9eb99dc61e	Merge branch 'staging-fixes' of https://github.com/frappe/erpnext into stock-recon	2019-01-01 18:40:24 +05:30
Saif Ur Rehman	eeead1d777	fix: Only load transaction's company's tax accounts in item tax map	2018-12-29 02:25:00 +05:00
Anurag Mishra	0c8411d085	test cases sucess	2018-12-28 16:53:00 +05:30
Nabin Hait	fcbe410c2f	feat(stock-reco): Fetch items based on group warehouse	2018-12-28 16:31:05 +05:30
Saif Ur Rehman	1ea98cbbe1	fix: missing line due to conflict resolution	2018-12-28 00:29:43 +05:00
Saif Ur Rehman	7d9ee83d5a	-Fix for updated get_default_cost_center ... -Back to not updating item's defaults child table	2018-12-27 23:10:19 +05:00
Saif Ur Rehman	127b3f552b	At least add a row for old logic to work properly	2018-12-27 23:03:17 +05:00
Saif Ur Rehman	c819ea38a0	-Added Item Default child table for Brand ... -Item Default Precedence: Get defaults from Item Group, if no default, fetch from Brand -Remove auto set Item's Item Defaults from Item Group: Item Default should be manually entered to override both Item Group and Brand defaults	2018-12-27 23:01:54 +05:00
Suraj Shetty	3de12db2b1	Merge branch 'develop' of github.com:frappe/erpnext into general-ui-fixes	2018-12-27 09:05:25 +05:30
Saif Ur Rehman	677866824a	More work on Tax Category and Item Tax Template	2018-12-27 02:11:07 +05:00
Frappe Bot	9e09b3adbe	Merge branch 'staging' into develop	2018-12-26 12:16:20 +00:00
deepeshgarg007	22e05b24f3	Fix for NoneType comparison with int error	2018-12-26 17:16:34 +05:30
Frappe Bot	e8c2fdfb8c	Merge branch 'master' into staging-fixes	2018-12-26 11:44:09 +00:00
rohitwaghchaure	53a38e8edc	Merge pull request #16257 from surajshetty3416/permission-fixes ... Fix user permission checks	2018-12-26 14:49:01 +05:30
Suraj Shetty	b763893f22	Fix quotes issue in item.js	2018-12-24 19:43:31 +05:30
Suraj Shetty	67b311e95e	Make -> Create	2018-12-24 16:16:13 +05:30
Suraj Shetty	146be9f6a6	Merge branch 'develop' of github.com:frappe/erpnext into general-ui-fixes	2018-12-24 16:08:43 +05:30
rohitwaghchaure	7ec5e80b70	[Fix] While making sales invoice from delivery note, system not remove the returned qty (#16141)	2018-12-24 14:55:31 +05:30
Nabin Hait	5a9579bae4	feat(quality): Check quality status before receipt/delivery (#16169)	2018-12-24 14:54:42 +05:30
Valmik	78bc405eeb	fix: set fieldname for frappe prompt (#16198)	2018-12-24 14:54:06 +05:30
KanchanChauhan	1790a6faaa	Set ignore_user_permission 1 for Company field in Item Default (#16167)	2018-12-24 14:48:09 +05:30
Rohan	349040db6d	fix(work_order): Set operations for Work Order when created from MREQ (#16154)	2018-12-24 14:42:34 +05:30
rohitwaghchaure	4265c5a772	Rename BOM and Work order fields (#16209) ... * Rename BOM and Work order fields * Rearranged BOM fields	2018-12-24 14:38:49 +05:30
rohitwaghchaure	1c1798c7f2	[Fix] Warehouse wise item balance age and value report not working (#16258)	2018-12-24 14:19:27 +05:30
Suraj Shetty	83e3c4c0fa	Fix quote error	2018-12-24 11:11:04 +05:30
Suraj Shetty	b2965001d1	Replace 'Make' with 'Create'	2018-12-23 13:25:58 +05:30
Saif Ur Rehman	8ac261750b	Add and Modified DocTypes for Item Tax Template	2018-12-22 02:51:59 +05:00
Frappe Bot	1b7c583c48	Merge branch 'staging' into develop	2018-12-21 05:46:23 +00:00
Suraj Shetty	7ed37ae6c3	Commonify code ... - use get_permitted_documents function to avoid code redundancy	2018-12-19 19:56:42 +05:30
Suraj Shetty	7ae2d59ffd	Merge branch 'staging-fixes' into permission-fixes	2018-12-18 15:41:03 +05:30
Suraj Shetty	a8d9bfdcfd	Fix: currency symbol issue in delivery note list (#16233)	2018-12-18 14:53:17 +05:30
rohitwaghchaure	37d7d25018	Merge pull request #16207 from Zlash65/fix-qi ... [Minor] Make Quality Inspection in query configurable	2018-12-17 13:55:26 +05:30
Nabin Hait	22a1e281a9	fix(variant): Show attribute values on single variant creation (#16204)	2018-12-14 14:22:45 +05:30
Zlash65	9fde660aaf	make quality inspection in query configurable	2018-12-13 13:28:01 +05:30
Frappe Bot	8e1326f22f	Merge branch 'staging' into develop	2018-12-10 16:05:45 +00:00
Rohan	c1eb94d37f	Revert "fix(delivery): update package total on validate (#16131)" ... This reverts commit f43433b43d.	2018-12-10 20:27:14 +05:30
Suraj Shetty	07e5786e1b	Fix user permission checks	2018-12-10 19:10:18 +05:30
Frappe Bot	5b50b2848d	Merge branch 'staging' into develop	2018-12-10 13:08:33 +00:00
Rohan	f43433b43d	fix(delivery): update package total on validate (#16131)	2018-12-10 17:47:31 +05:30
RicardoJohann	bc0ef0beca	Add Serial Number button in Delivery Note and Sales Invoice's Packing List (#16080)	2018-12-10 17:43:03 +05:30
Nabin Hait	2bd6ab9fba	Merge pull request #16140 from KanchanChauhan/staging-fixes ... [Minor]Method path fix in Material Request js	2018-12-07 15:08:44 +05:30
Frappe Bot	7c2a5bddb1	Merge branch 'staging' into develop	2018-12-06 09:50:25 +00:00
Frappe Bot	ee5d7e6d0f	Merge branch 'master' into staging-fixes	2018-12-06 09:26:42 +00:00
deepeshgarg007	114cc810a0	List view currency bug fix	2018-12-03 15:13:06 +05:30
Kanchan Chauhan	9dc85153e0	[Minor]Method path fix in Material Request js	2018-12-03 14:39:43 +05:30
Nabin Hait	3ecb995485	Merge pull request #16006 from gbm001/gbm001-item-barcodes-pull ... fix/feat: Allow extension of barcode types (without validation)	2018-12-03 14:39:14 +05:30
Nabin Hait	0b4ea25f83	Merge pull request #16138 from rohitwaghchaure/user_permissions_issue_item ... [Fix] Permissions issue while making item variants	2018-12-03 14:32:40 +05:30
Rohit Waghchaure	a8003c1af7	[Fix] Permissions issue while making item variants	2018-12-03 11:49:52 +05:30
deepeshgarg007	4c79274054	Fixed patch and deprecated grid reports	2018-11-30 18:01:22 +05:30
Rohit Waghchaure	16b8ecbe05	[Fix] Stock value difference calculation for stock reconciliation	2018-11-30 16:20:52 +05:30
deepeshgarg007	94a3539015	Row check fix in stock analytics	2018-11-30 16:20:48 +05:30
deepeshgarg007	9ed13f4a90	Merge branch 'staging-fixes' of https://github.com/frappe/erpnext into analytics-fix	2018-11-29 12:52:44 +05:30
deepeshgarg007	1a1c013b2a	Analytics report bug fixes and code cleaning	2018-11-29 08:34:47 +05:30
Ameya Shenoy	fe1f532bc0	Merge branch 'staging' into develop	2018-11-28 08:28:37 +00:00
Ameya Shenoy	2806d83362	Merge branch 'master' into staging-fixes	2018-11-28 08:12:48 +00:00
Nabin Hait	dfd79b0349	Merge branch 'staging-fixes' into gbm001-item-barcodes-pull	2018-11-27 14:19:20 +05:30
Nabin Hait	b98d08a2cb	Merge pull request #16049 from rohitwaghchaure/incorrect_stock_value_difference_calculation ... [Fix] Incorrect stock value difference because of negative stock	2018-11-27 13:21:43 +05:30
Nabin Hait	5f7b37ee11	Merge pull request #16093 from rohitwaghchaure/manufacturing_settings_permissions_issue ... [Fix] No permission for Manufacturing Settings	2018-11-27 13:07:44 +05:30
Nabin Hait	15951e6e93	Merge branch 'staging-fixes' into gbm001-item-barcodes-pull	2018-11-26 20:25:29 +05:30
Nabin Hait	c5064069c7	Merge branch 'staging-fixes' into manufacturing_settings_permissions_issue	2018-11-26 20:23:11 +05:30
deepeshgarg007	05c2989698	removed total from graph	2018-11-26 20:19:57 +05:30
Nabin Hait	b32abde2ac	Merge branch 'staging-fixes' into bug-fixes	2018-11-26 20:05:09 +05:30
Nabin Hait	56dc5c1be3	Merge branch 'staging-fixes' into pos-profile-fix	2018-11-26 19:59:07 +05:30
Rohit Waghchaure	15ed7a6351	[Fix] No permission for Manufacturing Settings	2018-11-26 17:31:18 +05:30
Rohit Waghchaure	3893ba302c	If is pos and no pos profile use the item's default warehouse for packing materials	2018-11-26 14:13:24 +05:30
Nabin Hait	2508d11097	fix(test): Test cases fixed	2018-11-26 11:05:28 +05:30
Rohit Waghchaure	6424f47f3b	[Fix] Incorrect stock value difference because of negative stock	2018-11-21 23:18:41 +05:30
Suraj Shetty	1eb098caf9	Add additional condition condition to get_pos_profile ... - If we have any POS Profile related to the user, that profile should be used	2018-11-21 14:36:58 +05:30
Andrew McLeod	f99a68a695	feat: Added unit testing for Item Barcodes in item.py ... Adds three different barcodes and barcodes types to a test item and checks that they are added correctly. Adds a barcode that already exists, and checks a DuplicateEntryError is raised. Adds an invalid EAN barcode and checks InvalidBarcode (a subclass of ValidationError) is raised.	2018-11-16 13:55:55 +00:00
Andrew McLeod	5607762c0f	fix/feat: Allow extension of barcode types (without validation) ... Currently, it is difficult to add new custom barcode types for two reasons, both of which relate to validate_barcode in item.py: - There is a bug where barcode types with a space in, such as Code 128, are split in two (so barcode_type is checked against 'Code' and '128' rather than 'Code 128'). This is fixed by splitting the Options field against a newline, instead of spaces. - All barcodes are validated against the stdnum.ean library. This only handles EAN-8, EAN-13 and UPC-12 barcodes and any other barcode will fail. Barcodes with no type will continue to not be checked. Barcodes with the default barcode_types of EAN, UPC will continue to be checked. The non-default barcode_types of EAN-13 and EAN-8 will also be checked. The barcode_type is cast to upper case before this check is made so ean, upc, ean-13 and ean-8 will also be validated. This allows people to add their own barcode types, such as Code 128 and QR codes. Users can add custom validation of these barcodes using the usual hooks, but they cannot remove the standard validation.	2018-11-16 11:08:39 +00:00
Frappe Bot	eb4969d24f	Merge branch 'staging' into develop	2018-11-15 09:26:03 +00:00
deepeshgarg007	4c366eed23	Minor issue fixes	2018-11-15 12:02:07 +05:30
Deepesh Garg	3b8c84fa75	Merge pull request #15975 from nabinhait/staging-fixes ... fix(test): Fixed item discount amount calculation and test cases related to pricing rule	2018-11-15 12:01:09 +05:30
Frappe Bot	b5c7b96a73	Merge branch 'staging' into develop	2018-11-13 11:33:31 +00:00
Nabin Hait	7fe4124bb8	fix(field property): Made barcode field non-mandatory in item	2018-11-13 16:48:59 +05:30
Frappe Bot	88c88d6e7c	Merge branch 'master' into staging-fixes	2018-11-13 10:59:05 +00:00
Saif	60ec88bcc8	Added Default Warehouse field that sets all item's warehouse (#15462) ... * -Added field def_warehouse that sets warehouse of all items -Grouped warehouse fields together and put raw materies supplied before items table, it will only show if there are any items supplied * Set def_warehouse in test_sales_order.py * Changed from def_warehouse to set_warehouse * Rest of def_warehouse to set_warehouse	2018-11-13 12:37:53 +05:30
Alchez	ce3340903d	Update Delivery Trip status based on visited stops (#15723) ... * feat(delivery_trip_status): Update Delivery Trip status based on visited stops * feat(delivery_trip_status): Fix tests * feat(delivery_trip_status): Fix allow on submit for status * feat(delivery_trip_status): Change status mapping * feat(delivery_trip_status): Fix patch * Update update_delivery_trip_status.py	2018-11-13 12:22:17 +05:30
Alchez	9f87c441b0	feat(delivery_trip): Create a Delivery Trip by selecting multiple Delivery Notes in list view (#15706)	2018-11-13 12:20:05 +05:30
khushalti	fad08e1bcb	[fix] - GL entry not creating on PR if rejected qty mentoned (#15815)	2018-11-13 12:09:32 +05:30
Doridel Cahanap	2b14d6a058	Contract Manufacturing : Customer Provided Items (#15828) ... * Material Request from Production Plan for Customer provided parts * Test cases * Customer web portal for their material requests	2018-11-13 12:07:16 +05:30
Zarrar	6922415d1b	[New Feature]Scan Item Barcode label to quick create/update records in items child table (#15731) ... * Update transaction.js * setup barcode scan stock entry controller not inherited from transaction.js, need to call setup barcode scan from transaction.js * fix bug of item_code change always reset qty to 0 when calling frappe.model.set_value(dt,dn,'item_code',xxx), even qty is set, system always reset qty to 0. * Update transaction.js * Update transaction.js * Update transaction.js * Update transaction.js * Update transaction.js * Update transaction.js * clean up barcode logic for transactions * call scan_barcode method for stock entry * separate out logic for searching serial, batch or barcode number * added scan barcode field in transactions doctype * search barcode-serial-batch sequence, code rectify * hide all barcode related field if disabled from settings * remove print statement * Update stock_entry.py	2018-11-13 11:11:32 +05:30
Deepesh Garg	84483ff776	Stock analytics script report (#15630) ... * Stock analytics script report * Codacy Issue Fixes * Codacy Issue Fixes * Removed Trailing Whitespaces * Code cleaning and optimization * Minor Changes * Code cleaning and spacing * Added link for stock analytics in stock.py * Refactoring and code cleaning * Codacy issue fixes	2018-11-12 17:05:31 +05:30
Frappe Bot	1ff9c691b7	Merge branch 'staging' into develop	2018-11-09 10:21:07 +00:00
Alchez	068ba191e7	[Feature] Route optimization for Delivery Trip stops (#15566) ... * Minor improvements * [Feature] Route optimization for Delivery Trip stops * Process and optimize the entire route, with or without locks * Form sets of routes for optimization based on applied lock positions * Re-arrange stops based on the optimized routes and lock positions * Set delay times between stops - offset estimation times by delays cumulatively * Fix codacy errors * Fix travis * feat(route_optimization): Set estimated route distance from Google Maps * feat(route_optimization): Add tests for route lists * feat(route_optimization): Fix tests	2018-11-08 11:57:05 +05:30
Ameya Shenoy	ea42980de6	Merge branch 'staging' into develop	2018-11-06 11:17:24 +00:00
Ameya Shenoy	65797bca64	Merge branch 'master' into staging-fixes	2018-11-06 11:02:08 +00:00
Nabin Hait	3e6663d47e	fix(serial no): Set supplier info based on pur invoice if serial no is created from Purchase Invoice (#15820)	2018-11-05 14:01:59 +05:30
Ameya Shenoy	f3f997f232	Merge branch 'staging' into develop	2018-10-31 13:51:52 +00:00
Ameya Shenoy	961849beb4	Merge branch 'master' into staging-fixes	2018-10-31 13:43:12 +00:00
rohitwaghchaure	cd11bdfdbb	[Fix] Supplier wise sales analytics report not showing item details which is added in purchase invoice with update stock (#15869)	2018-10-31 18:02:00 +05:30
Ameya Shenoy	7658bdc00a	Merge branch 'staging' into develop	2018-10-23 08:06:15 +00:00
Ranjith Kurungadam	ac6e3a69f9	fix: Serial No- allow editing SO, track changes (#15741)	2018-10-22 12:06:54 +05:30
Ameya Shenoy	c1231d65fd	Merge branch 'staging' into develop	2018-10-19 13:27:07 +00:00
Nabin Hait	5d1171678e	fix(perpetual inventory): Get warehouse account map only if perpetual inventory enabled (#15743) ... * fix(perpetual inventory): Get warehouse account map only if perpetual inventory enabled * fix(perpetual inventory): Get warehouse account map only if perpetual inventory enabled	2018-10-19 18:03:13 +05:30
Saif	b4cf72c770	Adding "Include UOM" in Reports with Qty and Rates (#15541) ... * Added Include UOM field for Stock Balane, Stock Ledger and Stock Projected Qty * Add columns in result list-of-lists instead of converting reports to list-of-dicts * For requested changes -Merged conversion factor query with item detail queries -Ensuring snail_case -Made columns consistently list-of-dicts	2018-10-18 17:59:47 +05:30
Ameya Shenoy	d1c467bcf5	Merge branch 'staging' into develop	2018-10-17 09:44:39 +00:00
Ameya Shenoy	77b60928bf	Merge branch 'master' into staging-fixes	2018-10-17 09:39:31 +00:00
Ameya Shenoy	4fdbff7456	Merge pull request #15547 from Zlash65/demo-refactor ... Demo data refactor	2018-10-16 17:34:09 +05:30
Shreya Shah	8e71074e1c	fix(report): Add column for Item Name (#15702)	2018-10-16 14:36:49 +05:30
Shreya Shah	e45868a3c6	fix(discount-amount): Print hide discount_amount if print without amount (#15705)	2018-10-16 14:34:56 +05:30
Shreya Shah	ff0deedca9	fix(discount-amount): Print hide discount_amount if print without amount (#15704)	2018-10-16 14:34:30 +05:30
Shreya Shah	bfb88f7839	Merge pull request #15701 from shreyashah115/item-stock ... Add column for Item Name in Item Price Stock report	2018-10-16 14:22:46 +05:30
Shreya	82660913a5	fix(report): Add column for Item Name	2018-10-16 12:15:56 +05:30
Ameya Shenoy	606c504f28	Merge branch 'staging' into develop	2018-10-15 12:25:03 +00:00
Chinmay Pai	905c0ff978	File api (#15637) ... * file-api: major refactor migrate from file_manager.py to file.py Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com> * file-api: migrate to file-api remove file_manager stuff and migrate to file-api Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>	2018-10-15 10:38:53 +05:30
Alchez	a16f0f4423	fix(item_defaults): handle multiple item defaults for a company (#15634)	2018-10-11 16:56:46 +05:30
Ameya Shenoy	f90af80344	Merge branch 'staging' into develop	2018-10-11 06:58:53 +00:00
Sagar Vora	d92f3ac480	Fix 'transporter info' section in Delivery Note (#15565) ... - create is_transporter checkbox in supplier doctype - new field transporter (supplier with is_transporter checked) - created fields driver and driver_name - removed GST India fields from core doctype - removed readonly & allow_on_submit from fields (delivery trip applicable only for in-house delivery) - read_only transporter_name field (kept for backwards compatibility) - made necessary changes in delivery_trip implementation - hidden section's fields from print (preserving v10 convention) - added transporter field to 'Driver' doctype - added queries for transporter and driver fields - GST India fields in regional module - Fix e-waybill report	2018-10-10 14:51:26 +05:30
Zlash65	0309bbee30	function call requires company as parameter	2018-10-10 14:28:16 +05:30
Shreya Shah	8a4bcefec4	fix(accounts-receivable): Column values in Print and PDF (#15621)	2018-10-08 18:34:01 +05:30
Nabin Hait	d2c5b50842	fix(warehouse-account): get warehouse account map fallback handling (#15625) ... * fix(warehouse-account): get warehouse account map fallback handling * fix: import issue	2018-10-08 18:19:53 +05:30
Ameya Shenoy	de5206ff43	Merge branch 'staging' into develop	2018-10-08 07:28:24 +00:00
rohitwaghchaure	5e466bace4	Removed update_job_card_reference method (#15614)	2018-10-08 12:36:45 +05:30
Ameya Shenoy	1d5dc73dfd	Merge branch 'staging' into develop	2018-10-05 09:10:30 +00:00
Shreya Shah	32206029ac	Fix Codacy	2018-10-05 14:14:33 +05:30
Zlash65	2123b97d31	add get_query for revenue and expense account	2018-10-05 12:26:32 +05:30
Saif	00a16a9337	set_item_default was referencing a variable company of "company" (#15576)	2018-10-05 11:54:03 +05:30
Valmik	4c61861163	Add Delivery Trip to Delivery Note dashboard (#15587)	2018-10-05 11:36:31 +05:30
Ameya Shenoy	da10f6ebd8	Merge branch 'staging' into develop	2018-10-04 11:51:30 +00:00
Rohit Waghchaure	18678696db	Fix issue after merging hotfix into staging-fixes	2018-10-04 16:33:43 +05:30
Ameya Shenoy	7d929c508f	Merge branch 'master' into staging-fixes	2018-10-04 09:25:07 +00:00
deepeshgarg007	719701f2a4	Enhancement in Budget Variance and other reports (#15455) ... * Enhanced Budget Variance report and added filters and columns in other reports * Update budget_variance_report.js * Changes in budget variance report * Spacing in column names	2018-10-02 12:52:13 +05:30
Zlash65	6a5e6ed2ff	delivery trip notification to customer fix	2018-10-01 17:28:42 +05:30
Zlash65	9e67b8ec4d	fix driver name selection	2018-10-01 17:27:12 +05:30
Zlash65	622bd10946	add date data [mandatory]	2018-10-01 15:37:31 +05:30
Alchez	6ecb2556b7	Add Delivery Settings + improve 'Notify Customers' functionality (#15322) ... * Add Delivery Settings + improve 'Notify Customers' functionality * Minor improvements * Add patch to create a default dispatch notification template * Fix travis errors	2018-09-30 21:38:47 +05:30
Neil Trini Lasrado	55a53e0bec	Added ability to have a default return warehouse for Sales Returns (#15491)	2018-09-30 21:22:50 +05:30
Saif	83c89346c3	set_item_default was referencing a variable company of "company" (#15534)	2018-09-30 21:12:25 +05:30
Suraj Shetty	4b404c4f1e	Avoid multiple escapes (#15509)	2018-09-27 15:39:34 +05:30
Nabin Hait	7d6d678e8d	purchase receipt return entry in dashboard	2018-09-26 19:04:11 +05:30
Nabin Hait	183972f58f	fix(stock_entry): allow creating stock entry against work order even if item rate is zero	2018-09-26 18:34:07 +05:30
Nabin Hait	1e7c32b909	Payroll fixes and more (#15475) ... * fix(payroll): multiple minor fixes related to salary structure * Added GSTR-1 and GSTR-2 report in Accounts module page * delete asset movement records on cancellation of Purchase Receipt * Update consolidated_financial_statement.py * minor fix * minor fix * add filters on item prices report (#15495)	2018-09-26 18:01:00 +05:30
RicardoJohann	171c7d4128	add filters on item prices report (#15495)	2018-09-26 15:58:06 +05:30
Ameya Shenoy	430c3c88ff	Merge branch 'staging' into develop	2018-09-26 07:32:45 +00:00
Ameya Shenoy	9d3a97fd15	Merge branch 'master' into staging-fixes	2018-09-26 07:28:53 +00:00
rohitwaghchaure	fe1e4a41e6	Validate negative stock serial number (#15492)	2018-09-25 18:36:32 +05:30
Ameya Shenoy	63ebeb432c	Merge branch 'staging' into develop	2018-09-21 11:04:20 +00:00
Zarrar	e83ff38c10	[Enhance] Deferred Expense (#15437) ... * added section for deferred expense in item master * added default expense account field in Company master * added deferred expense section in purchase invoice item * validation and getter code added * scheduler event to book expense every month * codacy, import fix and other minor fixes * rectify debit credit logic for expense * commonify js code for deferred expense and revenue * remove deferred calculation and validation * common file to calculate deferred revenue and expense * codacy fixes * expense account root_type - Asset, specific method naming	2018-09-21 15:45:40 +05:30
Suraj Shetty	bfc195dd8b	Changes to support refactor in frappe pg-poc branch (#15287) ... * Remove quotes from sql to make it compatible with postgres as well * Fix queries - Replace mysql specifc queries with standard ones * Make repo URL chages to test pg-poc * Add root passowrd to test site config * Fix quotes issue * Remove debug flag from a pricing rule query * Remove python 3.6 version from travis.yml * Fix improper query issue * Fix incorrect query * Fix a query - This fix need to be changed when we will start supporting postgres since date_format is not supported by postgres * Get price list map as dict * Convert price_list_currency_map to dict	2018-09-21 10:20:52 +05:30
Ameya Shenoy	a2f0b34147	fix(item, item default): changed the modified date (#15442) ... The patch move_item_defaults_to_child_table_for_multicompany used to fail since the doctypes Item and Item Defaults weren't reloaded properly Signed-off-by: Ameya Shenoy <shenoy.ameya@gmail.com>	2018-09-19 19:02:52 +05:30
Faris Ansari	2ab6e0e39b	fix(translations): Replace translations by keyword with indexed version (#15426) ... * fix(translations): Replace translations by keyword with indexed version Keywords in the translation also gets translated which results in an error because python cannot find the key * Update buying_controller.py	2018-09-19 13:13:59 +05:30
Doridel Cahanap	6d0ae5b23b	Allow Rename for Custom Tariff (#15389)	2018-09-12 17:13:12 +05:30
Nabin Hait	9fde97cdd2	Fixed merge conflict	2018-09-12 15:45:20 +05:30
Saurabh	393dd4286a	[resolved] merge-conflicts	2018-09-12 14:48:30 +05:30
Zarrar	ce6a09ca54	[Staging] Stock Reconciliation (#15382) ... * optimize query and some fixes * add get_query to filter warehouses based on company * minor changes	2018-09-12 10:54:18 +05:30
Nabin Hait	13beb3a008	fix(test): test cases fixed	2018-09-11 19:37:08 +05:30
Sagar Vora	508189eaea	Use default conversion factor if not found in Item (#15369)	2018-09-11 17:22:25 +05:30
Nabin Hait	84ddbc0ac9	fix(test): test cases fixed	2018-09-11 17:11:39 +05:30
Nabin Hait	2236f0aef0	fix(test): multiple test cases fixed	2018-09-11 16:50:46 +05:30
Nagarajan	8be8345b65	Stock Projected Qty Item Group Filter (#15340) ... * Update stock_projected_qty.js * Update stock_projected_qty.js * Update stock_projected_qty.py * Update stock_projected_qty.js	2018-09-07 16:20:18 +05:30
rohitwaghchaure	bd4348db10	[Enhance] Add additional cost of the manufacture stock entry in the project costing (#15341)	2018-09-07 16:16:23 +05:30
Nabin Hait	b479a87031	fix(report): Cost center filters in financial statements and general ledger	2018-09-07 13:17:23 +05:30
rohitwaghchaure	32dc3bf082	[Enhance] Job Card (#15244) ... * [Enhance] Added job card against the work order * removed work order from timesheet * Fixed codacy * Added patch to make job card from the timesheet * Timer in job card * Dates validation in job card * Added button to make job card from work order * Added sub-assembly operation in the work order	2018-09-06 19:21:48 +05:30
Neil Trini Lasrado	6f77abe0dd	Added ability to create a Return Sales Invoice/ Credit Note against a delivery note of type return (#15266) ... * Remove make subscription button on delivery note if it is of type returns * Added 'issue_credit_note' checkbox on delivery note to pass a Sales Inv of type return if checked while creating a return delivery note * Added logic to auto-create Return Sales Invoice/ Credit Note if issue_credit_note checkbox is checked while return delivey note is submited * Update delivery_note.py	2018-09-06 19:17:47 +05:30
Alchez	4b290e5561	Map details from Delivery Trip back to Delivery Note (#15261) ... * Map details from Delivery Trip back to Delivery Note * Add pop-up to indicate changed Delivery Notes	2018-09-06 19:08:19 +05:30
Alchez	f2fe0b2194	Keep Delivery Trip stops unique based on their Delivery Notes (#15264) ... * Keep Delivery Trip stops unique based on their Delivery Notes * Pull single row when making a Trip from Delivery Note	2018-09-06 19:05:09 +05:30
Alchez	e52ae4eacb	[Fix] 'To Bill' status even if the amount is zero (#14784) ... * Fix 'To Bill' status even if the invoice amount is zero * Modify fix to only apply on Delivery Note documents	2018-09-06 18:27:06 +05:30
Faris Ansari	b892cc8b02	fix(item): Remove Hub Category field (#15331)	2018-09-06 18:02:48 +05:30
Nabin Hait	a2a6568b7e	fix(reports): Made gstr1 ready for govt portal	2018-09-06 17:44:31 +05:30
Sanjay Kumar	1b49f3a4e7	Allow cost center in entry of balance sheet accounts (#14972) ... * Allow Cost Center In Entry of Balance Sheet Account * Add parent cost center in get payment entry * Add Tests for Allow Cost Center In Entry of Balance Sheet Account * Add tests for cost center wise account and party balance * set parent cost center in taxes * 1. Remove copy parent cost_center to child 2. Improve update party and account balance functionality on cost_center change 3. Add cost_center filter to get_outstanding_documents * fix Codacy and Travis issue	2018-09-06 14:39:35 +05:30
johnhkelley1	431b4fba72	Allow for 0 valuation rate in Stock Reconciliation (#15313) ... Currently, a valuation rate of 0 gets treated the same as an omitted valuation rate, and gets overwritten during validation. This hotfix allows a Stock Reconciliation Item's valuation rate to be set to 0.	2018-09-05 11:43:28 +05:30
rohitwaghchaure	bcaca85873	[Fix] Meta object has no attribute permissions (#15316)	2018-09-05 11:10:17 +05:30
Valmik	2175b90b8d	Added feature to optimize routes, also cleaned up code (#15193)	2018-08-31 16:39:29 +05:30
Nabin Hait	b259e3eb06	Merge branch 'defer-stop-date' of https://github.com/Zlash65/erpnext into Zlash65-defer-stop-date	2018-08-31 12:39:46 +05:30
Saurabh	5c3590fa8d	Merge branch 'master' into develop	2018-08-31 11:29:14 +05:30
Shreya Shah	ee8f8281b4	[py3] Convert filter object to list (#15260)	2018-08-30 19:22:22 +05:30
rohitwaghchaure	624927bf0b	[Fix] Not able to export the Supplier-Wise Sales Analytics report (#15271)	2018-08-30 19:19:14 +05:30
KanchanChauhan	0cd5313c69	Validate Completed Qty and Produced qty in Stock Entry for Manufacture (#15248)	2018-08-30 19:11:15 +05:30
Nabin Hait	9983d41fb0	Fixed divison error	2018-08-30 19:10:36 +05:30
Rushabh Mehta	49f9747385	major(manufacturing): fixes to ux, material requests to purchase order based on default supplier etc (#15267) ... * major(manufacturing): fixes to ux, material requests to purchase order based on default supplier etc * fix: remove debug	2018-08-30 18:50:48 +05:30
Prateeksha Singh	5797565dd0	Merge with upstream	2018-08-30 16:15:27 +05:30
Zlash65	80f5cb05cc	fixes in setting end_date and manual provision of start&end date	2018-08-30 10:39:48 +05:30
Zlash65	4ce8c7f383	end date should reset if start date is changed	2018-08-30 10:39:48 +05:30
Rushabh Mehta	13bcc4e27e	perms: fix default import, export perms	2018-08-29 17:10:27 +05:30
Nabin Hait	a804d6d487	Fixed merge conflict	2018-08-29 13:34:58 +05:30
Prateeksha Singh	bd7d964848	[hub] Merge Develop	2018-08-28 18:25:07 +05:30
Zarrar	34208cc89d	Revert "Google maps settings"	2018-08-28 17:25:21 +05:30
Saurabh	5b398f293a	[fix] typo fix	2018-08-28 16:28:12 +05:30
Nabin Hait	a626d967c0	[fix] naming series refactor patch	2018-08-28 16:08:22 +05:30
Saurabh	f2caacdf74	[fix] fix google map imports (#15240)	2018-08-28 15:23:35 +05:30
Nabin Hait	04bca58fb7	[fix] missing functions related to google maps	2018-08-28 14:21:48 +05:30
Shreya Shah	e0a47aeb2f	Improve performance for warehouse tree (#15207) ... * Fix conflicts * Modify query structure * Remove whitespaces	2018-08-28 13:46:22 +05:30
Shreya Shah	a5add289bb	Refactor Naming Series (#15070) ... * Patch to create Property Setter for existing naming series * Update existing naming series options with new * Add patch link to patches.txt * Update patch * Fix codacy * Fix as per suggestions * Remove old patch for property setter * Improve as per suggested - Modified the naming - Also refactored naming for doctypes having autoname with series - Added a patch to make property setter for autoname * Fix Travis * Rebase with develop	2018-08-28 13:44:48 +05:30
rohitwaghchaure	2b72d09948	[Fix] Raw materials are not showing in the stock entry if skip transfer is enabled and backflush is based on stock entry (#15187)	2018-08-24 11:28:34 +05:30
rohitwaghchaure	c5cf428d00	[Enhance] Provision to backflush raw materials from WIP warehouse (#15184)	2018-08-24 11:27:41 +05:30
Shreya Shah	be7703387d	Fetch reserved qty (#15182) ... * Fetch reserved qty * Update get_item_details.py	2018-08-22 14:45:22 +05:30
Suraj Shetty	fc7b7b6b97	Allow item list for System Manager	2018-08-22 11:32:49 +05:30
Saif	a09a8c3bf7	Fixed missing DocType info for Purchase Items (#15152) ... * Made Purchase Invoice Items' Batch No and Serial No fields non copyable. * Added appropriate currency field options to Purchase...Items DocFields: -Landed Cost Voucher Amount -Billed Amt	2018-08-20 17:55:18 +05:30
rohitwaghchaure	ecc6af9d2a	[Fix] Total materials consumed cost not consider in the calculation of Gross Margin in project (#15171)	2018-08-20 17:39:54 +05:30
Nabin Hait	9409eddf28	Update __init__.py	2018-08-16 13:58:44 +05:30
Rushabh Mehta	8705371ef0	fix(product-listing): fix variant selection in website	2018-08-16 09:22:45 +05:30
Shreya Shah	0631aed3d9	Discount amount field in all transactions' child tables (#15124) ... * Add discount_amount and base_discount_amount in Sales Invoice Item * Add patch for existing documents * Discount amount field in all child tables of Purchase and Selling * Remove console statements	2018-08-14 10:51:48 +05:30
Nabin Hait	3b5f18231a	fix(item_defaults): Item name was overwriting by child name	2018-08-13 17:45:29 +05:30
Nabin Hait	9a33bc6417	optimizing transactions by caching	2018-08-09 10:47:09 +05:30
Nabin Hait	50238c3049	[optimize] tree conditions for pricing rule	2018-08-08 18:43:04 +05:30
Himanshu Mishra	f56aac65e1	[optimize]: bin updates (#15108)	2018-08-08 18:32:03 +05:30
Rushabh Mehta	708e47aadf	optimize(various)	2018-08-08 16:37:31 +05:30
Nabin Hait	3f142b874a	item defaults based on caching	2018-08-08 13:02:59 +05:30
Doridel Cahanap	59e4c32e9f	Allow Disabling Batch and edit Validations (#15076)	2018-08-06 14:45:18 +05:30
KanchanChauhan	7fb8540b70	Get item defaults from item group (#15089)	2018-08-06 14:29:14 +05:30
Prateeksha Singh	a5f6e54b70	fix merge conflict	2018-08-06 13:56:53 +05:30
Ranjith Kurungadam	752fd5a7a0	Tests SO for Serial No based delivery (#15072) ... * fix remove SO from Serial No only when voucher SE * SO tests - delivery by Serial No	2018-08-03 10:39:51 +05:30
Ranjith Kurungadam	d54991d624	Delivery by Serial No (#15030) ... * fields added for delivery by Serial No * SO - validate item for delivery by Serial No * Stock Entry - add Serial No on production, validate reserved consumption * add item by reservation to transaction if delivery by Serial No * SLE - validate reserved Serial No by SO in Delivery Note, Sale Invoice * Sales Order - validate Ensure Delivery by Serial No * Serial No - remove SO ref on cancel	2018-08-01 17:47:07 +05:30
Nabin Hait	e45ec661ea	Additional fields in Item Price (#14540) ... * [IMPROVEMENT] Item Price New Fields and Features * [IMPROVEMENT] Item Price - Item Price insert against Qty, Supplier/Customer, Validup/Validfrom - Stock Setting to accept Default Price List for Purchase or Sales Item - Move Item Section in Item Price * Fetch default Item Price based on Customer as null * test fixes * Code cleanup and fixed the issue of incorrect item price fetched against the customer * Removed min qty from packing_increment calculation * Removed auto_update_price_list_rate from the stock settings * Revert sales_order.json changes * Removed sales, purchase price list from stock settings because this fields are already available in selling, buying settings * Removed unnecessory file * Fixed item price validation code	2018-08-01 17:44:34 +05:30
rohitwaghchaure	1fa5698798	[minor] Freeze the screen to avoid multiple time clicks (#15047)	2018-07-30 19:11:43 +05:30
Zarrar	89c87fd6a6	[Minor] Patch fix (#15041) ... * update modified date * remove extra parameter from function call	2018-07-30 10:57:47 +05:30
Nabin Hait	fa06ee80e9	Fixed merge conflict	2018-07-27 12:54:00 +05:30
FinByz Tech Pvt. Ltd	f5cc1bd44c	Created Eway Bill Report (#14926) ... * Created Eway Bill Report * Field value changes * Changed module from Stock to Regional * Added comments and minor fix * minor fix	2018-07-27 11:21:42 +05:30
rohitwaghchaure	0fe6ced99d	[Fix] Valuation rate for serialized items (#15017)	2018-07-27 10:33:30 +05:30
Prateeksha Singh	f26177bdbc	[hub] setup publish items flow	2018-07-26 10:38:11 +05:30
Ranjith Kurungadam	e51c175aca	Fix tests (#14991) ... * minor improv in fetching account * pass name field while creating tds doc * create tds fixture after creating tds account * Inpatient Record - Test - Fix * fix batch query	2018-07-24 11:07:28 +05:30
Nabin Hait	0c0c345678	Added index on SLE based on batch_no, item and warehouse	2018-07-23 14:38:50 +05:30
yimesgen	20a80fee45	Update batch.py (#14905) ... * Update batch.py Performance improvements for pos stock availability checks on a particular warehouse due to the slowing down effects of the where clauses combined by the "and". * Update batch.py	2018-07-23 14:36:50 +05:30
rohitwaghchaure	6b862fcae5	[Fix] Rounded total is not working in the purchase receipt (#14984)	2018-07-23 13:02:07 +05:30
Zarrar	a22e0d0c99	return empty if no stock ledger entry found (#14968)	2018-07-23 11:31:04 +05:30
Saurabh	d7897f1c53	Resolved merge conflicts	2018-07-18 17:08:16 +05:30
Shreya Shah	3c9839f832	Defaults in Item Group (#14874) ... * Add Defaults table in Item Group * Fetch defaults from Item group if not found in Item * Add patch * Remove default fields from Item Group * Set query for defaults * Fix Codacy * Modify test records * Modify budget.py and sales_order.py * Remove join from query * Else condition to avoid error if no defaults found * refrain from making item test records before item_group * default cost center fetch correction * Remove tab item group from query	2018-07-17 18:01:44 +05:30
Shreya Shah	663b435919	Update modified time to fix patch (#14931)	2018-07-17 16:47:18 +05:30
Saurabh	e78a877202	patch fixes (#14936)	2018-07-17 16:38:11 +05:30
Shreya Shah	ffd2254944	Make item defaults non-collapsible (#14908)	2018-07-16 14:55:54 +05:30
rohitwaghchaure	526ab2ca30	[enhance] Allow transfer for manufacture in the BOM (#14891) ... * [enhance] Allow transfer for maufacture in the BOM * Added patch * Fix codacy * Fixed typo and added test cases	2018-07-15 20:04:41 +05:30
Nabin Hait	b2da082798	Fixed logic and tests	2018-07-13 17:02:08 +05:30
rohitwaghchaure	2d84945839	[Fix] Stock reconciliation wrong difference amount calculation (#14893)	2018-07-13 11:07:27 +05:30
Zarrar	9a3b785a03	[Minor] Employee Separation Fix (#14867) ... * delete associated task & project forcefully in Employee Seapration cancel trigger * remove leftover print statement * remove console statements	2018-07-11 14:34:55 +05:30
rohitwaghchaure	07d0e9a2b2	Don't show disabled items in the stock balance report (#14851)	2018-07-09 16:56:41 +05:30
Saurabh	1cfcf70905	Resolved merge conflicts	2018-07-06 13:18:44 +05:30
rohitwaghchaure	3f5e80ebe3	Allow bulk edit for the sales invoice item (#14826)	2018-07-06 12:39:04 +05:30
Manas Solanki	da486eeebd	Loyalty Program (#12631) ... * First Cut for the Loyalty Program * finished the collection part * redmeption for the loyalty point update the loyalty point entry in the FIFO style make the accounting entry knocking the debtors account against the expense account selected in the loyalty program update the outstanding balance in the client side * completed for the desk viewe * wrap up for the desk and shopping cart * pos * fix and test the travis	2018-07-06 12:36:57 +05:30
rohitwaghchaure	82a9fde921	Added compact print option for the material request (#14799)	2018-07-06 10:40:51 +05:30
Zarrar	dfe897b888	[ Fix ] UOM Conversion fix (#14768) ... * increase precision for conversion value * inverse the conversion data * update uom data * rectify conversion logic according to inversion of values * rectify test case for uom conversion * patch improv to correct conversion data	2018-07-01 16:45:53 +05:30