4231 Commits

Author	SHA1	Message	Date
marination	9a39bcd031	fix: Fixed Test Cases for Material Request ... - Reduce quantity on Material Transfer/Issue - No effect on Customer Provided Material Request	2020-04-02 19:36:21 +05:30
marination	686a09620d	fix: Commonified code and added server side validation	2020-04-02 13:51:25 +05:30
marination	6f0dc8257c	fix: Typo in stock level validation in Stock Ledger	2020-04-01 11:04:14 +05:30
rohitwaghchaure	98a91f489d	Merge pull request #21015 from marination/so-mr-mapping-uom ... fix: UOM fixes in Sales Order,Material Request & Production Plan	2020-03-31 16:24:37 +05:30
Deepesh Garg	eeb9ba81d7	Merge branch 'develop' into project-link-for-all-accounts	2020-03-31 16:07:23 +05:30
rohitwaghchaure	7845961d46	Merge pull request #21017 from Alchez/dev-remove-same-item-validation ... feat: allow BOM to use same item as raw material (develop)	2020-03-31 16:04:26 +05:30
rohitwaghchaure	bc415331a2	Merge pull request #21003 from Alchez/dev-stock-entry-fg-validation ... fix: allow target warehouses to be changed for work order stock entries (develop)	2020-03-31 15:44:13 +05:30
Saqib	25846cccbd	fix: warehouse_account_map not getting reset for diff company transac (#20995) ... * fix: warehouse_account_map not getting reset for diff company transaction * fix: potential key errors while fetching warehouse_account_map * fix: travis Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-03-31 15:31:15 +05:30
rohitwaghchaure	86aff0de1f	fix: serial no scan not adding the serial nos in stock entry (#21083)	2020-03-31 15:26:45 +05:30
Deepesh Garg	fbf6e56d86	fix: Expense account currency validation in Landed Cost voucher (#21073) ... * fix: Expense account currency validation in Landed Cost voucher * fix: Remove unused imports	2020-03-31 10:45:32 +05:30
Deepesh Garg	a47e42c515	Merge pull request #21087 from nabinhait/item_defaults_fix_dev ... fix: Add item defaults based on global settings only if default company and warehouse is mentioned	2020-03-29 21:55:25 +05:30
Deepesh Garg	f9f39f5a7e	Merge pull request #21103 from nextchamp-saqib/stock-ledger-warehouse-filter ... chore: [ux] filter warehouse based on company	2020-03-28 21:09:46 +05:30
Saqib Ansari	ed3553f795	chore: [ux] filter warehouse based on company	2020-03-28 19:12:59 +05:30
Deepesh Garg	c12a8040ef	Merge branch 'develop' into item_defaults_fix_dev	2020-03-27 21:51:00 +05:30
Nabin Hait	fe000e20e8	fix: Add item defaults based on global settings only if default company and warehouse is mentioned	2020-03-27 19:24:47 +05:30
marination	815c36a4eb	fix: Updated Bin Requested Qty logic	2020-03-26 15:46:27 +05:30
Marica	38cba153b5	fix: Make shelf life mandatory in Batched Item if it has expiry date (#21044)	2020-03-26 13:29:02 +05:30
Marica	b856aae651	fix: Project field in Stock Entry Detail should be editable (#20999)	2020-03-26 13:23:49 +05:30
Saqib	faea85451f	feat: auto set batch no on serial no selection (#20757) ... * feat: auto set batch no on serial no selection * fix: dialog not shown if set warehouse selected * fix: typo * fix: merge conflict * fix: callback no getting called after serial no selected * fix: available batch qty not fetched without set_warehouse selected * fix: item batch not synced with dialog batch table	2020-03-26 13:18:57 +05:30
rohitwaghchaure	b6bb56e9bf	Merge pull request #21037 from rohitwaghchaure/fixed_batch_selector_popup_develop ... fix: batch selection popup not coming for stock entry	2020-03-24 16:32:21 +05:30
Rohit Waghchaure	5c1404e878	fix: batch selection popup not coming for stock entry	2020-03-24 11:40:03 +05:30
Rohan	7ea79933b3	fix: handle error handling (#20815)	2020-03-23 14:54:33 +05:30
Rohan	879c6bfb44	Merge branch 'develop' into dev-stock-entry-fg-validation	2020-03-23 14:50:02 +05:30
Deepesh Garg	f8b54bd301	Merge pull request #21005 from rohitwaghchaure/qty_must_be_positive_for_stock_entry_develop ... fix: stock entry qty must be positive	2020-03-21 20:46:10 +05:30
Rohan	b7d84725e8	fix: add warehouse check for FG item	2020-03-20 18:49:11 +05:30
marination	73c8d23a79	fix: UOM fixes in Sales Order,Material Request & Production Plan	2020-03-20 17:52:28 +05:30
Rohit Waghchaure	5e4e2dbd03	fix: stock entry qty must be positive	2020-03-19 14:53:37 +05:30
Rohan	ce90848161	fix: allow target warehouses to be changed for work order stock entries	2020-03-19 13:22:58 +05:30
Deepesh Garg	dbeb77e745	fix: Unable to submit landed cost voucher (#20977)	2020-03-19 11:03:03 +05:30
Deepesh Garg	fa6454b9c5	fix: Update is_tree field in Tree doctypes (#20981)	2020-03-19 11:01:23 +05:30
rohitwaghchaure	e4cd12506c	Merge pull request #20991 from rohitwaghchaure/fixed_reserved_qty_for_production_develop ... fix: reserved qty for production issue for partial completion of work…	2020-03-19 09:37:43 +05:30
Deepesh Garg	6b36fae531	Merge pull request #20990 from rohitwaghchaure/fixed_shortage_qty_in_stock_projected_qty_report_develop ... fix: shortage qty in stock projected qty report	2020-03-19 09:33:03 +05:30
Rohit Waghchaure	dd13d0a9a9	fix: reserved qty for production issue for partial completion of work order	2020-03-19 09:29:17 +05:30
Rohit Waghchaure	cd2478a527	fix: shortage qty in stock projected qty report	2020-03-19 09:27:53 +05:30
Nabin Hait	ddc3bb2251	fix: Multiple fixes for travis (#20924) ... * fix: Multiple fixes for travis * fix: Multiple fixes for travis * fix: Run dashboard patch if table already exists * fix: Multiple fixes for travis * fix: deletion of auto-created batch	2020-03-17 17:04:18 +05:30
marination	e1f499ae1b	fix: Pick List Enhancements	2020-03-17 11:47:11 +05:30
Marica	b10adbb161	fix: Item alternative must have similar fields as original item (#20796) ... * fix: Item alternative must have similar fields as orignal item * fix: Using db.get_values and meta instead of get_value and get_doc * fix: Made code more DRY Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-03-17 10:56:59 +05:30
Saqib	1306f5005b	fix: is_pos gets reset on making s_inv from s_ord (#20886) ... * s_inv has is_pos default set as 1	2020-03-16 17:51:00 +05:30
Saqib	de4f6901d6	fix: serial_no_selector showing for non serialized batched item (#20851)	2020-03-16 16:29:10 +05:30
Shivam Mishra	aecf9d6168	Merge branch 'develop' into desk-settings-card	2020-03-12 17:13:03 +05:30
Shivam Mishra	451382e08e	feat: update desk pages	2020-03-12 16:34:34 +05:30
Saqib	6ec4618914	fix: travis (#20903)	2020-03-11 16:04:00 +05:30
Saqib Ansari	706c239cf6	fix: remove enable_allow_cost_center_in_entry_of_bs_account	2020-03-11 15:17:10 +05:30
Saqib Ansari	91b307e7f8	fix: project link not set in accounts other than profilt and loss accounts	2020-03-11 13:59:15 +05:30
Shivam Mishra	1fd1852c6a	Merge branch 'develop' into yet-another-desk	2020-03-10 18:20:27 +05:30
Marica	508ad51d9c	fix: Validate Serial No/Batch No against unserialized Item in Stock Reconciliation (#20858)	2020-03-09 18:13:41 +05:30
Saqib	b978d79573	fix: show uom in print formats instead of stock uom (#20843) ... Co-authored-by: Saqib Ansari <saqibansari@Saqibs-MacBook-Pro.local>	2020-03-06 11:03:46 +05:30
Shivam Mishra	0310366d5a	fix (cleanup): remove incomplete dependencies data	2020-03-05 11:28:40 +05:30
Shivam Mishra	8a8e8d6c5c	feat: added base pages for desk	2020-03-02 16:56:31 +05:30
Marica	ed25ec7ee5	chore: Item Price and Product Bundle Form cleanup (#20772) ... * chore: Item Price and Product Bundle Form cleanup * fix: Trailing comma	2020-03-02 15:51:14 +05:30
Saqib	e9ac3e0d64	feat: link serial no to batch no (#20778) ... * feat: link serial no to batch no * fix: test cases	2020-03-02 15:02:58 +05:30
rohitwaghchaure	b5a670cdb9	fix: serial no material transfer performance issue (#20747)	2020-02-27 18:18:10 +05:30
Lokesh Waingankar	2866617c82	fix: 'Last Purchase Rate' taking wrong on BOM (#20689) ... * fix: 'Last Purchase Rate' taking wrong on BOM. #20228 * fix: Added condition for None purchase order and purchase receipt (#20689) * fix: fetch last purchase rate Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-02-27 13:21:14 +05:30
abhijitkumbharInd	ba8840727a	Create a new item on Material Request showing error Item None not found. #20608 (#20731)	2020-02-26 12:48:36 +05:30
rohitwaghchaure	7229f694ea	fix: rate and amount in material request copying from sales order (#20717)	2020-02-26 11:28:08 +05:30
rohitwaghchaure	1e6788b028	fix: reorder material request not created if doctype has custom mandatory field (#20719)	2020-02-26 11:25:34 +05:30
Andy Zhu	75d9d79fac	fix: missing assign item's expense_account ... As in dict object "ret", missing assign item's expense_account will cause it then fetches the default stock_adjustment_account in 'Company'.	2020-02-26 10:49:48 +13:00
Rucha Mahabal	6071313965	fix: document creation via onboarding slide (#20644) ... * fix: defaults not set in doc created via Onboarding Slide * fix: default company not set in Supplier	2020-02-20 12:57:21 +05:30
Deepesh Garg	23aa5c6332	Merge pull request #20643 from abhijitkumbharInd/develop ... fix: HSN/SAC Error while creating a new item and not selecting the fi…	2020-02-19 19:23:10 +05:30
Deepesh Garg	40546d8af9	Merge pull request #20663 from marination/stock-settings-query ... fix: Set Query on warehouse fields in Stock Settings	2020-02-19 18:57:24 +05:30
marination	120f75026f	fix: Server side validation for Warehouses	2020-02-19 11:17:58 +05:30
marination	bde13b98e0	fix: Set Query on warehouse fields in Stock Settings	2020-02-18 21:35:59 +05:30
Deepesh Garg	15ff6a594b	feat: Inter warehouse stock transfer on valuation rate with taxation (#20083) ... * fix: Validation for target warehouse * feat: Get items on valuation rate in delivery note on Internal transfers * fix: Create Inter company purchase receipt from delivery note * feat: Inter company stock transfer on valuation rate with taxation * fix: Add from warehouse in purchase invoice * fix: Use get_value instead of get_cached_value * fix: Get incoming rate instead of valuation rate * fix: GL entry for from warehouse in purchase receipt * fix: GL Entries fixes in purchase invoice * fix: Address and tax fetching fixes * fix: Add test case for stock transfer via purchase receipt * fix: Code cleanup, added validations and test cases * fix: Validation for supplier warehouse * fix: Test Cases * fix: Change validation condition * fix: Address fixes while creating Purchase Receipt from delivery note * fix: Set taxes while creating Purchase Receipt from Delivery Note * fix: Update set_missing_value function Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-02-18 12:28:41 +05:30
abhijitkumbharIND	0047fcf7ad	fix: HSN/SAC Error while creating a new item and not selecting the field. #20590	2020-02-17 18:12:58 +05:30
Marica	db00270895	feat: Added popup to 'Get Items from Open Material Requests' in Purchase Order (#20371) ... * feat: Added popup to 'Get Items from Open Material Requests' in Purchase Order * fix: Query with filters, UX enhancements and cleanup	2020-02-17 15:58:08 +05:30
Himanshu Mishra	b76d2d4d98	Fix: Syntax error in get_child_warehouses	2020-02-12 13:22:05 +05:30
rohitwaghchaure	490b843ecf	Merge branch 'develop' into fixed_purchase_receipt_time_out_error_develop	2020-02-11 19:56:11 +05:30
rohitwaghchaure	3d98c59585	Merge pull request #20555 from ashish-greycube/fix_actual_qty_for_backflush ... fix: backflush raw material based on - Material Transferred for Manufacture	2020-02-11 19:50:36 +05:30
vishal	998de83d48	fix: filter serial no based on batch no	2020-02-11 12:24:44 +05:30
Rohit Waghchaure	e55a927eee	fix: test cases	2020-02-10 14:39:26 +05:30
ashish-greycube	121636f9bf	fix: backflush raw material based on - Material Transferred for Manufacture	2020-02-10 10:49:50 +05:30
Rohit Waghchaure	f0d27528e3	fix: time out error while submitting the purchase receipt which has more than 100 serial nos	2020-02-07 14:42:33 +05:30
Deepesh Garg	d8e57d3d5a	fix: Unable to submit landed cost voucher (#20493) ... * fix: Unable to submit landed cost voucher * fix: Test case for multiple landed cost voucher against a Purchase receipt * fix: Test Case	2020-02-03 18:53:34 +05:30
Pranav Nachnekar	6c14a08631	fix: disallow quick entry for doctypes with tree view (#20452)	2020-02-03 17:05:26 +05:30
Suraj Shetty	2f67647f7b	Merge branch 'develop' of https://github.com/frappe/erpnext into fix-incorrect-translations	2020-01-29 15:06:50 +05:30
Suraj Shetty	48e9bc3fc9	fix: Incorrect translation syntax	2020-01-29 15:06:18 +05:30
Deepesh Garg	565a810bf7	Merge pull request #20454 from marination/stock-ledger-qty-column ... fix: 'In Qty' and 'Out Qty' columns in Report Stock Ledger	2020-01-29 09:49:55 +05:30
Deepesh Garg	b61b8d7ced	fix: Remove comma	2020-01-29 09:49:26 +05:30
marination	372c5e51d5	fix: 'In Qty' and 'Out Qty' columns in Report Stock Ledger	2020-01-28 16:04:49 +05:30
Deepesh Garg	0c31d62edd	Merge pull request #20447 from Alchez/dev-driver-address-fetch ... fix: only fetch driver address if not set (develop)	2020-01-28 09:20:26 +05:30
rohitwaghchaure	7fda3a12cc	Merge pull request #20445 from rohitwaghchaure/copy_to_warehouse_to_target_warehouse_in_delivery_note_item ... fix: to warehouse not set in the customer warehouse	2020-01-27 19:29:19 +05:30
Rohan Bansal	ce17a546b9	fix: only fetch driver address if not set	2020-01-27 18:08:11 +05:30
Rohit Waghchaure	2dff28498f	fix: to warehouse not set in the customer warehouse	2020-01-27 17:56:25 +05:30
Deepesh Garg	1e77a1374d	Merge pull request #20393 from rohitwaghchaure/unlink_reference_name_from_batch_on_cancel_of_stock_transactions_develop ... fix: unlink references from batch on cancellation of stock transactions	2020-01-23 22:40:26 +05:30
Rohit Waghchaure	8996b7d8a4	delete the auto created batch	2020-01-23 17:44:19 +05:30
Rohit Waghchaure	4f4dbf1996	fix: unlink references from batch on cacnellation of stock transactions	2020-01-23 12:45:45 +05:30
Rohit Waghchaure	0cc4cf2cf5	fix: Zero division error while making finished good entry against the work order	2020-01-21 19:28:08 +05:30
byugandhara	239f0d529e	Fix: Spelling correction in throw message of stock entry(#20337) (#20353)	2020-01-21 15:47:27 +05:30
rohitwaghchaure	6ae61a1693	fix: incorrect number of gl entries issue (#20352)	2020-01-20 17:53:19 +05:30
Marica	7653a8b9fa	fix: 'get_additonal_costs' is not defined (#20344) ... * fix: 'get_additonal_costs' is not defined * fix: Re-added get_items on Work order change.	2020-01-20 15:46:36 +05:30
Nabin Hait	03b116dd01	fix: deprecated fetching item price based on min_qty (#20347)	2020-01-20 15:45:04 +05:30
Nabin Hait	e321fbb0d5	fix: Multiple fixes based on testing on pre-release branch (#20301) ... * fix: Multiple fixes based on testing on pre-release branch * fix: reload hr settings	2020-01-16 13:37:25 +05:30
Vishal Dhayagude	654d785776	fix: Delivery note not able to create sales return (#20264)	2020-01-15 19:28:58 +05:30
Marica	9f6c95549a	fix: Applied query on PO Supplier popup field in Material Request. (#20231)	2020-01-15 19:24:28 +05:30
Rohit Waghchaure	9650c25429	fix: filter issue for the stock and account value comparision report	2020-01-14 12:12:54 +05:30
deepeshgarg007	00746306a3	fix: Item tax template fetching from HSN Code	2020-01-10 15:01:50 +05:30
gavin	12568e4f07	Merge pull request #19514 from gavindsouza/rename-doc-fix ... fix: frappe.rename_doc update	2020-01-09 15:07:05 +05:30
rohitwaghchaure	d4d7d211ea	feat: report to show difference between stock and account value (#20186)	2020-01-09 15:05:05 +05:30
Suraj Shetty	000ac0068b	Merge branch 'develop' into rename-doc-fix	2020-01-09 13:46:08 +05:30
Don-Leopardo	ccdf19314d	fix: min_qty and valid_from for the price selection (#20217)	2020-01-09 12:24:43 +05:30
Marica	c72de6edaa	fix: Added description and title to supplier selection popup in Material Request. (#20179)	2020-01-07 13:06:08 +05:30
Deepesh Garg	ef0d26c161	feat: Validity for Item taxes (#20135) ... * feat: Validity for Item taxes * fix: Trigger for gst hsn code * fix: Sort taxes based on validity * fix: Validation for item tax template and filters based on validity * fix: Add missing semicolon * fix: Validate tax template only if item code available * fix: Do not validate or filter item tax template if no item taxes applied * fix: Consider item group for validating taxes * fix: Test cases for item tax validation * fix: Item tax template filtering fixes * fix: Add missing semicolon * fix: Remove unnecessary query	2020-01-06 15:34:15 +05:30
rohitwaghchaure	055012a7fb	Merge pull request #20170 from nabinhait/inter-company-serial-no-outgoing-rate ... fix: Get outgoing rate of serial no from SLE if serial no already transferred to another company	2020-01-06 12:07:53 +05:30
rohitwaghchaure	fe2afc643e	fix: incorrect valuation rate for finished good entry (#20165)	2020-01-06 11:51:43 +05:30
Marica	159799c238	Merge branch 'develop' into item-min-qty	2020-01-03 12:13:00 +05:30
thefalconx33	7a01367ef1	ux: add description for minimum purchase qty	2020-01-02 19:14:55 +05:30
Nabin Hait	328c4f9b92	fix: Get outgoing rate of serial no from SLE if serial no already transferred to another company	2020-01-02 19:00:47 +05:30
Rohan	938ba3efc4	feat: show item name in Item Price list view (#20156)	2019-12-31 17:21:07 +05:30
Marica	5483f1a27e	fix: Field 'other_charges_calculation' column type changed. (#20141)	2019-12-30 22:20:02 +05:30
rohitwaghchaure	9af557f9d7	fix: incorrect batch fetched for the serialized items (#20119) ... * fix: incorrect batch fetched for the serialized items * Update stock_controller.py Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2019-12-30 13:26:47 +05:30
Ishan Loya	fe0adc8b25	fix: read WIP warehouse from work order (#20131) ... * fix: read wip_warehouse from work order in stock entry even if skip transfer is checked * fix: remove skip_transfer in stock entry Related to #10753	2019-12-30 12:19:08 +05:30
Marica	f4fbdf98d1	fix: Removed unneccesary Duplicate Entry Error. (#20120)	2019-12-27 16:53:05 +05:30
Marica	47ab9850e6	fix: Show both warehouse columns in Stock Entry Grid view. (#20113)	2019-12-27 15:31:07 +05:30
rohitwaghchaure	616431d7c3	fix: incorrect reorder level in stock balance report (#20111)	2019-12-27 12:35:58 +05:30
rohitwaghchaure	a99f926a4b	fix: incorrect validation for scrap items (#20109)	2019-12-27 12:21:15 +05:30
Robin Rosenstock	e6387f9dca	fix to issue #20089	2019-12-26 08:09:47 +00:00
Himanshu	e2ea11c437	fix: remove quote (#20076)	2019-12-25 15:15:35 +05:30
Parth J. Kharwar	8c4cf12c93	Setting preferred driver email in delivery trip (#19832) ... * fix: add driver's preferred contact email in delivery trip * fix: modify driver's preferred email patch and blank field checks * fix: patch file fix * fix: patch changes to improve speed * fix: removal of conflicts Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2019-12-25 15:14:52 +05:30
rohitwaghchaure	6e8a9286c2	fix: multiple stock entry issues for the work order (#18686) ... * fix: multiple stock entry issues for the work order * Update work_order.py * Update work_order.py Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2019-12-24 18:53:32 +05:30
rohitwaghchaure	5c0ea2d7c9	Merge pull request #19708 from Alchez/dev-batch-to-stock-ledger ... feat: drill down on batch transactions (develop)	2019-12-24 15:25:05 +05:30
rohitwaghchaure	08433c2919	fix: supplier email id field not showing in the notification for purchase cycle doctypes (#20071)	2019-12-24 13:03:47 +05:30
Deepesh Garg	55bc26e300	fix: Allow creation of multiple landed cost voucher against a Purchase Document (#20058)	2019-12-24 12:55:01 +05:30
Himanshu	5af4c57ef7	fix: ambihious error (#20068)	2019-12-24 12:31:38 +05:30
Rucha Mahabal	0e83a5754b	fix: remove illustrations from onboarding slides (#19872) ... * fix: remove illustrations from onboarding slides * fix: change Welcome slide's description * fix: justify text in slide	2019-12-23 08:24:46 +05:30
Gavin D'souza	1e4ea466d3	style: update/standardize rename_doc usage	2019-12-19 19:07:29 +05:30
marination	457ca0fe6c	fix: Company None not found in get_valuation_rate	2019-12-19 13:34:29 +05:30
rohitwaghchaure	b500f2ce4c	Merge pull request #19940 from marination/item_manufacturer_table_dev ... fix: Removed 'manufacturers' table from Item Master	2019-12-16 14:44:49 +05:30
marination	5ab823beab	fix: Removed validation from non existent manufacturers table	2019-12-16 12:19:47 +05:30
marination	81990aee9f	fix: Removed 'manufacturers' table from Item Master	2019-12-13 13:18:59 +05:30
Deepesh Garg	57e6bcaf43	Merge pull request #19733 from marination/zero-division-basic-amount ... fix: Division by zero error in Stock Entry	2019-12-13 09:23:44 +05:30
marination	0e33f792d3	fix: Distribute charges based on quantity if Total Basic Amount is Zero.	2019-12-12 16:34:41 +05:30
Rohit Waghchaure	9b0d7b93dd	fix: not able to submit the landed cost voucher	2019-12-12 12:10:25 +05:30
Deepesh Garg	0e10340471	Merge pull request #19899 from rohitwaghchaure/not_able_to_cancel_landed_cost_voucher ... fix: not able to cancel the landed cost voucher	2019-12-11 18:38:23 +05:30
Rohit Waghchaure	37cf096102	fix: not able to cancel the landed cost voucher	2019-12-11 13:50:29 +05:30
Deepesh Garg	6e2c13f4c8	feat(regional): Auto state wise taxation for GST India (#19469) ... * feat(regional): Auto state wise taxation for GST India * fix: Update gst category on addition of GSTIN * fix: Codacy and travis fixes * fix: Travis * fix(test): Update GST category only if GSTIN field available * fix: Test Cases * fix: Do not skip accounts if place of supply is not present * fix: Auto GST taxation for SEZ Party types * fix: Automatic taxation for multi state * fix: Codacy and travis fixes * fix: Auto GST template selection in Sales Order * fix: Move inter state check and source state to tax category * fix: Remove unique check from tax template * fix: Remove unique check from tax template * fix: Address fetching logic in Sales * fix: fecth tax template on company address change * fix: fetch company gstin on address change * fix: company_gstin set value fix * fix: Mutiple fixes and code refactor * fix: Add missing semicolon * fix: Company address fetching in sales invoice * fix: Remove print statement * fix: Import functools * fix: Naming fixes and code cleanup * fix: Iteritems compatibility for python 3	2019-12-10 15:55:05 +05:30
marination	214acc9a42	fix: Changed check condition and added test	2019-12-09 21:38:19 +05:30
Saqib	5998034b02	fix: error message displays asset category as None (#19873) ... * fix: error message displays asset category as None * fix: asset gl_entries doesn't considers asset category's cwip account	2019-12-09 19:07:05 +05:30
Shivam Mishra	9e0b3b29fa	feat: better message for serial number creation (#19863)	2019-12-09 18:21:23 +05:30
Deepesh Garg	da638cd476	fix: NoneType' object has no attribute '__getitem_'_ (#19859)	2019-12-09 11:28:31 +05:30
Rucha Mahabal	690068142b	feat: Continue Slide and New Illustrations for Onboarding Wizard (#19813) ... * feat: added illustrations for onboarding * refactor: change help label for supplier * refactor (breaking): rename Setup Wizard slide to Onboarding Slide * chore: code cleanup for the old doctype Setup Wizard Slide * fix: added a 'Continue' type slide * fix: change text in continue slide * fix: change text for continue slide	2019-12-06 20:58:26 +05:30
Rohan	5161ba787c	Merge branch 'develop' into dev-batch-to-stock-ledger	2019-12-06 14:25:00 +05:30
rohitwaghchaure	cfbf895876	Merge pull request #19498 from marination/stock_entry_bom_fetch ... feat: Provision to fetch items from multiple BOMs in Stock Entry	2019-12-04 21:44:47 +05:30
ronelvcabrera	370cdc0170	feat(Sales/Purchase Order): optional to reference a Blanket Order (#19612)	2019-12-04 16:07:11 +05:30
marination	be88d0f8a3	fix: Custom button conditionally visible in draft condition as well	2019-12-03 18:34:38 +05:30
Anurag Mishra	10017c14f3	feat: HSN Code wise Item Tax (#19478) ... * feat: HSN Code wise Item Tax * feat: enqueued task of updating all items	2019-11-29 17:33:10 +05:30
Saqib	20c31dd579	fix: tax templates from all companies fetching in receipt (#19682) ... * fix: tax templates from all companies fetching in receipt * Update purchase_receipt.js	2019-11-29 16:55:10 +05:30
Suraj Shetty	9d6d95c4a2	fix: valuation of "finished good" item in purchase receipt (#19268) ... * fix: Remove redundant purchase orders and unwanted condition * fix: [WIP] Purchase receipt value * fix: Add raw material cost based on transfered raw material * fix: get_qty_to_be_received * fix: Remove debugger statement * fix: Reset rm_supp_cost before setting subcontracted raw_materials * test: Fix and modify tests for backflush_based_on_stock_entry * fix: Add non stock items to Purchase Receipt from Purchase Order * fix: Ignore valuation rate check for non stock raw material * fix: Rename check all rows * fix: Remove amount from test * test: Fix item rate error * fix: handling of serial nos in backflush * fix: Add serial no. of raw materials * fix: [WIP] Handle Batch nos for purchase reciept backflushed raw material * fix: Raw material batch number selection in purchase receipt * Update test_purchase_order.py	2019-11-29 13:26:52 +05:30
Anurag Mishra	f3b393f5e0	fix: UOM was not fetching in purchase invoice (#19732) ... * fix: UOM was not fetching in purchase invoice * fix: Changes requested Co-authored-by: Marica <maricadsouza221197@gmail.com>	2019-11-28 18:52:16 +05:30
Marica	aff678e376	fix: Changed type of column 'serial_no' in Stock Ledger Entry (#19702)	2019-11-28 18:20:48 +05:30
Marica	f51ccbf5d4	chore: Added Quick Stock Balance to Stock Module (#19726) ... - Also 'Stock Balance Report' button no longer primary button	2019-11-28 16:44:46 +05:30
marination	236140d94c	fix: Division by zero error in Stock Entry	2019-11-28 16:36:24 +05:30
Shivam Mishra	30245a0673	Merge pull request #19677 from ruchamahabal/setup_wizard ... feat: Slides for Onboading Wizard in ERPNext	2019-11-28 14:35:10 +05:30
Rohan Bansal	c7cfc726d7	feat: navigate to stock ledger from batch report	2019-11-27 18:23:31 +05:30
Marica	f0e87f7fdd	fix: get_batch_qty_and_serial_no() requires argument 'stock_qty' (#19693)	2019-11-27 15:49:41 +05:30
Rucha Mahabal	58928e8eae	Merge branch 'develop' into setup_wizard	2019-11-27 11:55:53 +05:30
Rucha Mahabal	e2bb82872c	fix: moved slide json files to respective modules	2019-11-26 18:46:17 +05:30
Rucha Mahabal	3f8c460584	feat: moved slide action functions from onboarding utils to doctypes	2019-11-26 15:22:45 +05:30
rohitwaghchaure	b5991e9264	Merge pull request #19683 from rohitwaghchaure/bom_ux_fixes_version_12 ... fix: BOM UX	2019-11-26 13:15:40 +05:30
Rohit Waghchaure	9326fb78f2	fix: BOM UX	2019-11-25 18:56:18 +05:30
marination	737d8a1e26	fix: Added comments	2019-11-25 09:42:08 +05:30
Saqib	1919af2ff1	Fixed Asset Refactor Review fixes (#19666) ... * fix: fixed asset item creation ux fixes * fix: auto creation of asset ux fixes * fix: [LCV] incorrect condition when checking assets linked with PR * fix: bulk update assets * refac: remove company level cwip enabling * cwip can be enabled only on category level * fix: #19649	2019-11-22 16:32:34 +05:30
Marica	b5c296da9e	fix: Validation Error message on Prepared Report. (#19639) ... Give the user the reason why he has to use filters.	2019-11-22 14:38:58 +05:30
Saqib	290253fdd0	fix: last purchase rate greater than selling price (#19617)	2019-11-22 12:12:29 +05:30
Nabin Hait	046137caa2	fix: Multiple fixes related to landed cost accounting (#19657)	2019-11-22 11:34:50 +05:30
marination	e537cda062	fix: Added conditional check for conversion factor	2019-11-20 12:38:58 +05:30
rohitwaghchaure	a85ddf2fb4	fix: performance issue of sales invoice while save/submit (#19598) ... * fix: performace issue of sales invoice while save/submit * Cached price list data, item group child data, added indexing for blanket order	2019-11-19 18:47:48 +05:30
Deepesh Garg	87c6718d90	fix: Book valuation expense in specified account rather than expense included in valuation account (#19590) ... * fix: Book valuation expense in specified accout rather than expense included in valuation account * fix: Remove undefined variable * fix: Test cases * fix: Test Case	2019-11-18 12:34:30 +05:30
Saqib	d995609ffa	Fixed asset refactor (#19369) ... * refactor: Asset Movement with multiple assets using table * refactor: Create Asset Movement from Asset List & Linking PR/PI with Asset * feat: Auto create asset on Purchase checkbox * refactor: LCV for asset created via PR/PI * refactor: get asset category accounts from item master * refactor: Purchase Receipt for asset purchasing * refactor: Purchase Invoice for asset purchasing * fix: post-refactor delete fixes * refactor: moved asset validation from pr/pi on asset submission * fix: Asset Category should be defined for auto purchasing assets * fix: undo serial_no_update removal (for non asset item) from LCV * fix: remove duplicate calls from item.js * fix: args position of all occurrence of get_asset_category_account() * fix: test cases * fix: landed cost voucher validations * refactor: test case for auto creation of asset * fix: removed invalid assertions * fix: patch errors on travis * fix: codacy fixes * fix: PI Items not fetching details from item * fix: asset movement from list view having default purpose 'Receipt' * chore: msgprint for selecting item code first while creating asset manually * fix: alert messages * minor: asset movement fixes * fix: lcv was made against submitted assets * minor: ux fixes * refac: move specific asset validation to SINV * chore: remove make_purchase_invoice from asset form * make asset movement on asset submission * add PR & PI queries based on item code * refac: not allow last movement cancellation * move asset movement creation on asset submission * asset movement naming series * add tests * fix: code review changes * chore: remove unecessary asset movement updation * refac: setting latest location while making asset movements * Added extra validations * fix: form dashboard make lcv button * fix: auto asset movement creation validation * fix: allow lcv against other items after removing submitted assets * chore: remove unwanted condition * fix: mismatch debit credit on purchase of asset with valuation tax * chore: toggle required field based on movement type * chore: fix lcv error message * fix: travis failing * fix: travis failing test * fix: wrong conditions after merge * fix: cannot cancel assets * fix: travis failing* fix change in deletion of assets * fix: codacy * fix: process cancellation of assets * refac: cancellation of pr only deletes auto created assets * fix: incorrect query	2019-11-18 11:46:55 +05:30
marination	a076bddd83	fix: Show 'Bill of Materials' custom button conditionally	2019-11-15 12:03:06 +05:30
rohitwaghchaure	c74c5d5644	Merge pull request #19583 from rohitwaghchaure/fixed_stock_rec_showing_incorrect_current_qty_and_serial_no ... fix: stock reconciliation showing incorrect current serial no and qty	2019-11-15 10:17:11 +05:30
Rohit Waghchaure	cf55c9c6da	fix: stock reconciliation shwoing incorrect current serial no and qty	2019-11-14 18:22:20 +05:30
rohitwaghchaure	ba8fc21594	fix: merge similar entries for serialized items in stock reconciliation (#19408)	2019-11-13 18:11:58 +05:30
Mangesh-Khairnar	06c8129574	fix(batch): fetch company on splitting the batch (#19558)	2019-11-13 10:51:43 +05:30
Marica	d00c59830e	feat: Disable CWIP Accounting checkbox added in Company and Asset Category (#19262) ... * feat: Disable CWIP Accounting checkbox added in Company and Asset Category Asset Settings is removed completely Disable CWIP Accounting checkbox will give priority to Asset Category * fix: Changed checkbox name to 'Enable Capital Work in Progress Accounting' - checkbox will be disabled by default - Enabling it in Company will globally enable it - When globally disabled , it's value on the asset category will be considered * chore: Added patch to set pre-existing CWIP checkbox value into new checkbox * fix(test): Asset * fix: Asset Test and Patch * fix(test): Opening Invoice Creation Tool * Update asset.py * fix: Patch and other fixes	2019-11-12 19:17:43 +05:30
rohitwaghchaure	001ee5ee1b	fix: dictionary changed size during iteration (#19546)	2019-11-11 17:43:48 +05:30
rohitwaghchaure	b81942404d	fix: incorrect balance qty in stock ledger if batch filter set (#19479)	2019-11-08 14:50:48 +05:30
rohitwaghchaure	d36c6068b2	fix: 'NoneType' object has no attribute 'stock_uom' (#19532)	2019-11-08 14:43:53 +05:30
Deepesh Garg	7a23057eab	feat: Enhancement in landed cost voucher (#19252) ... * feat: Enhancement in landed cost voucher * fix: Make GL entries based on ledgers in Landed cost voucher * fix: Patch to update expense account in Landed Cost Voucher and Stock Entry * fix: Ability to select expense account in Stock Entry * fix: Renaming and test case fixes * fix: Test Cases * fix: Additional cost in Stock Entry * fix: Changed filters and test case fixes * fix: Upadte filters in stokc entry expense account filter * fix: company filter	2019-11-08 12:52:54 +05:30
marination	075f6ea0d5	feat: Provision to fetch items from BOM in Stock Entry ... Items are populated in child table and amounts are calculated Warehouse Fields in popup toggle based on Stock Entry Type	2019-11-04 21:58:13 +05:30
Deepesh Garg	ebf46120ba	Merge pull request #18985 from Alchez/dev-serial-no-statuses ... feat: add statuses for Serial No	2019-11-01 14:16:45 +05:30
deepeshgarg007	c82aed0718	fix: Add missing semicolon	2019-11-01 12:36:33 +05:30
Anurag Mishra	a11e738801	feat: Stock value and account balance sync. (#19233) ... * feat: Allow user to sync stock_value and account_balance jv if perpetual inventory is checked * fix(test): Sales Invoice * fix(test): Purchase Invoice * fix(test): Delivery Note * fix: more test_case * fix(test): Stock Entry * fix(test): Purchase Receipt * fix(more-test): Stock Entries * fix(more-test): Sales Invoice and Delivery Note * fix: tests for delivery note * fix: tests for stock reconciliation * refactor: stock and account balance function * fix(more-test): Warehouse * fix(test): Landed Cost Voucher * fix: changes requested	2019-10-31 15:55:03 +05:30
rohitwaghchaure	139c20a736	Merge pull request #19454 from rohitwaghchaure/fix_item_price_stock_report_not_working_v12 ... fix: item price stock report not working	2019-10-30 22:30:10 +05:30
Rohit Waghchaure	d8b64cd199	replaced frappe.db.sql with frappe.get_all	2019-10-30 16:27:58 +05:30
Rohit Waghchaure	2e01573a40	fix: item price stock report not working	2019-10-30 16:22:30 +05:30
Deepesh Garg	118f2c7d64	Merge pull request #19402 from Mangesh-Khairnar/fix-dn-status ... fix: sync delivery note status in both list view and form view	2019-10-29 14:17:38 +05:30
Rohan	fba7cae2c9	Merge branch 'develop' into dev-serial-no-statuses	2019-10-29 11:25:36 +05:30
Deepesh Garg	9942fcc8cb	fix: Better validation msg for difference account in Stock Entry (#19400) ... * fix: Better validation msg for difference account * fix: Make primary info bold	2019-10-28 12:08:31 +05:30
Mangesh-Khairnar	233c0bc779	fix: sync delivery note status in both list view and form view	2019-10-24 15:46:12 +05:30
Rohan	8522fdc99c	Merge branch 'develop' into dev-serial-no-statuses	2019-10-22 17:11:30 +05:30
Nabin Hait	bebbc6371b	fix: Validation message in work order	2019-10-22 12:35:28 +05:30
Anurag Mishra	eaff541349	fix: query (#19376)	2019-10-22 11:46:17 +05:30
Deepesh Garg	c58d7d8a98	Merge pull request #19363 from rohitwaghchaure/stock_balance_report_not_working_for_stock_recon ... fix: stock balance report not working if actual qty is zero	2019-10-21 15:52:40 +05:30
Rohit Waghchaure	432b03572a	fix: stock balance report not working if actual qty is zero	2019-10-21 13:42:54 +05:30
Nabin Hait	dfc10bb5ae	fix: Fixed consumed qty based on Stock Ledger Entry (#19305) ... * fix: Fixed consumed qty based on Stock Ledger Entry * Update itemwise_recommended_reorder_level.py	2019-10-21 13:41:42 +05:30
Rohan	a77f534f7c	Merge branch 'develop' into dev-serial-no-statuses	2019-10-16 15:08:57 +05:30
rohitwaghchaure	0bb99c15e5	fix: while submitting landed cost voucher user getting negative stock error (#19269)	2019-10-14 15:18:36 +05:30
Anurag Mishra	8e937e9640	fix: packed items child table reset on amending docs (#19157)	2019-10-11 11:50:38 +05:30
Saqib	66762380ed	fixes: internal issues (#19201) ... * fix: Delivery Trip now has editable start address. * fix: default party type not set in Journal Entry * fix: maintainence visit purpose table not fetching item name * fix: maintainence visit purpose table not fetching item name	2019-10-11 11:09:10 +05:30
Rohan	6c8fe5ae02	Merge branch 'develop' into dev-serial-no-statuses	2019-10-10 17:47:30 +05:30
Marica	ccad0a4cf9	feat: Stock Quick Balance (#19123) ... * feat: Stock Quick Balance It will display the stock balance and stock value given the date and warehouse Item code can be fed or barcode can be scanned to retrieve the values * fix: Codacy fixes * fix: Renamed to Quick Stock Balance and minor fixes Refactored code , combined functions to make it DRY Added permissions for Stock User and Manager Added more context to naming	2019-10-09 15:24:58 +05:30
rohitwaghchaure	16b8e7c432	Merge pull request #19248 from rohitwaghchaure/not_able_to_submit_work_order_v12 ... fix: not able to submit the work order	2019-10-05 23:29:44 +05:30
Rohit Waghchaure	484e1fb218	fix: not able to submit the work order	2019-10-04 17:58:21 +05:30
Saqib	d5067b4d73	chore: label changes in retail and stock (#19243)	2019-10-04 16:24:26 +05:30
Mangesh-Khairnar	9351313186	Merge branch 'develop' of https://github.com/frappe/erpnext into fix-stock-ageing-report	2019-10-03 19:21:17 +05:30
Mangesh-Khairnar	ea70c6f696	fix: dynamically filter fifo queue	2019-10-03 19:19:42 +05:30
DeeMysterio	20194c4cc5	rename return/invoice to Purchase return/invoice (#19212)	2019-09-30 16:59:15 +05:30
rohitwaghchaure	ed1cc18ab5	fix: stock ledger report not showing data if the UOM filter has selected (#19179)	2019-09-30 15:15:52 +05:30
Rohan	c86cdd609e	Merge branch 'develop' into dev-serial-no-statuses	2019-09-30 13:08:10 +05:30
Deepesh Garg	7b1b3f0fa8	fix: Allow alternative item in stock entry while transfering material to subcontractor (#19189)	2019-09-30 11:01:05 +05:30
Rucha Mahabal	3564ac7c88	fix: don't create debit/credit note automatically (#19185)	2019-09-30 10:59:28 +05:30
DeeMysterio	5ef26b42a8	feat(delivery note): make the delivery trip plus button fetch data from delivery note (#19046)	2019-09-30 10:57:32 +05:30
Rohan	e19e16fbf1	fix: remove internal fields from print (#19101)	2019-09-30 10:54:01 +05:30
Mangesh-Khairnar	77f22635f2	fix(stock-ageing): filter none values from the fifo queue	2019-09-27 17:50:52 +05:30
Nabin Hait	001edb4464	refactor: Reposting utility of Stock ledger (#19155)	2019-09-26 16:44:35 +05:30
thefalconx33	c15cc8fc28	fix: #18624	2019-09-24 18:49:16 +05:30
Nabin Hait	786d7bd3d4	Merge branch 'develop' into dev-serial-no-statuses	2019-09-24 11:50:33 +05:30
Deepesh Garg	2e7419d78f	fix: Do not validate warehouse in case of Repack (#19050)	2019-09-24 10:05:42 +05:30
Himanshu	fdad33309b	fix: get correct warehouse for product bundle (#19130)	2019-09-24 10:03:34 +05:30
Mangesh-Khairnar	5dcf2c669f	chore: remove unlinked letter head references (#19138)	2019-09-24 09:53:06 +05:30
rohitwaghchaure	8dd4699f10	feat: Allow to make landed cost voucher against the asset item (#19121)	2019-09-23 15:03:52 +05:30
Suraj Shetty	462d9cb331	feat: "Purchase Order items to be Received or Billed" report (#19091) ... * feat: Init "Purchase Order items to be received or billed" report * fix: Rename report * fix: Column name	2019-09-20 18:30:22 +05:30
rohitwaghchaure	6bbc834f8f	Merge pull request #19112 from rohitwaghchaure/fixed_get_bin_details_and_serial_nos_arugument_passing_issue ... fix: get_bin_details_and_serial_nos() takes at least 3 arguments (4 g…	2019-09-19 18:01:03 +05:30
Rohit Waghchaure	6daab3ca89	fix: get_bin_details_and_serial_nos() takes at least 3 arguments (4 given)	2019-09-19 17:01:49 +05:30
Suraj Shetty	28d182af15	fix: Permission issue in Total Stock Summary report (#19110) ... Data in "Total Stock Summary" report were not getting filtered based on applied user permissions because some link fields had wrong options	2019-09-19 11:13:22 +05:30
Rohan	b9c1dad2e6	Merge branch 'develop' into dev-serial-no-statuses	2019-09-18 13:24:28 +05:30
kaviya	9e4f674fb9	fix: indentation error in stock ageing ... fixes https://travis-ci.com/frappe/erpnext/jobs/235815591#L1720	2019-09-17 16:02:11 +05:30
Suraj Shetty	bc001d2d9a	feat: Add stock ageing data to stock balance report (#19036) ... * feat: Add stock ageing data to stock balance report * fix: Use fifo queue warehouse wise * fix: "Stock Ledger Entry" get query * fix: Remove unwanted quotes in item details query * fix: Check if no SLE was passed * fix: Codacy * fix: Add logic to include additional UOM columns * fix: Show stock ageing data optionally	2019-09-16 19:57:04 +05:30
Marica	bac4b93639	fix: Displaying manufacturer part no along with manufacturer and added Manufacturers validation in Item master (#19066) ... Manufacturer Link field options in Items Table of transactions will also display manufacturer part no. Manufacturers table in Item master will check for duplicate entries.	2019-09-16 19:44:28 +05:30
Deepesh Garg	8cc2f83bd5	fix: Fetch scrap items from BOM if purpose is repack (#19056)	2019-09-16 14:49:12 +05:30
Shivam Mishra	a3095c987a	fix: optimized query (#19026) ... Co-authored-by: nabinhait Co-authored-by: sahil28297 <sahilkhan28297@gmail.com>	2019-09-12 17:28:37 +05:30
Rohan Bansal	bf7e012bde	feat: add statuses for Serial No	2019-09-10 15:55:54 +05:30
Mangesh-Khairnar	1853a83453	fix(packing-slip): add a descriptive message (#18981)	2019-09-10 13:21:01 +05:30
rohitwaghchaure	d312d11062	fix: port from hotfix (#18974) ... * fix: '>' not supported between instances of 'int' and 'str' * fix: not able to save item because price list has disabled	2019-09-10 10:47:36 +05:30
Mangesh-Khairnar	cbcede79b1	Merge pull request #18964 from nabinhait/max_carry_forwarded_leaves ... feat: Added input field for max carry forwarded leaves	2019-09-09 14:38:06 +05:30
Faris Ansari	32eccb8fb2	fix: Rename duplicate label Image to Website Image (#18912)	2019-09-09 14:29:01 +05:30
Nabin Hait	fb7c7b53ba	feat: Added input field for max carry forwarded leaves	2019-09-09 12:08:58 +05:30
MorezMartin	ffc4f8f2a5	feat: [stock -> packed_items] Enable modification of Description on packed items (#18907) ... * Change packed item * Remove description field on update_packed_items * add possibility to modify description on packed items	2019-09-09 10:16:23 +05:30
Nabin Hait	4ce38059ac	feat: Company wise credit limit	2019-09-06 14:33:10 +05:30
Nabin Hait	b847731482	Merge branch 'feat-customer-credit-limit' of https://github.com/Mangesh-Khairnar/erpnext into Mangesh-Khairnar-feat-customer-credit-limit	2019-09-05 16:47:08 +05:30
Anurag Mishra	867ac10ffd	fix: handle for product bundle (#18420) ... * fix: handle for product bundle * fix: Requested changes and some general fixes	2019-09-05 15:13:21 +05:30
John Clarke	a7d448dcba	fix: Error "TypeError: unorderable types: int() > str()" When Trying to Create Packing Slip (#18913) ... User report here https://discuss.erpnext.com/t/error-typeerror-unorderable-types-int-str-when-trying-to-create-packing-slip/52445 This has not been noted to github issues and is just a suggested fix, an expert may need to refactor more here? User and traceback does not state whether Python 2 or 3 but perhaps 3 since that apparently does not 'guess' when types do not match? See also https://stackoverflow.com/questions/14886881/unorderable-types-int-str	2019-09-05 14:55:35 +05:30
Rohan	9d77e9f719	fix: error while trying to get directions (#18827)	2019-09-05 14:51:22 +05:30
rohitwaghchaure	f1fab871b8	fix: mismatch between warehouse tree value and warehouse based stock balance report value (#18879)	2019-09-05 14:47:43 +05:30
Nabin Hait	b03fa8a441	Merge branch 'develop' into feat-customer-credit-limit	2019-09-05 12:34:34 +05:30
rohitwaghchaure	805b8634da	fix: incorrect stock value difference when stock move from negative to positive (#18887)	2019-09-05 12:18:33 +05:30
Mangesh-Khairnar	4bcc221ee3	Merge branch 'develop' of https://github.com/frappe/erpnext into feat-customer-credit-limit	2019-09-02 23:18:56 +05:30
deepeshgarg007	8666ecc26f	fix: Purchase receipt test	2019-09-02 17:41:12 +05:30
deepeshgarg007	402d82b4c5	fix: Remove delete_doc from tests	2019-09-02 14:37:18 +05:30
Suraj Shetty	72bea0dff4	test: Add test to check creation of pick list from multiple sales order	2019-08-31 18:34:25 +05:30
Suraj Shetty	736b5e07cc	fix: Maintain the order of Item List	2019-08-31 18:33:23 +05:30
Suraj Shetty	ca58fde552	test: Enable basic tests	2019-08-31 16:58:51 +05:30
Suraj Shetty	bcfec77e2c	style: Use single quotes	2019-08-30 19:44:37 +05:30
Suraj Shetty	744b92d233	fix: Commonify item not available alert ... - Reorganise code - UX fixes	2019-08-30 19:39:28 +05:30
Suraj Shetty	0eed0a9abe	test: Temporarily comment out tests	2019-08-30 19:12:16 +05:30
Suraj Shetty	0df38891a1	fix: Update pick list print format	2019-08-30 15:59:35 +05:30
Suraj Shetty	5e84ce55ae	fix: Add is_stock_item filter for item in locations table	2019-08-30 10:01:49 +05:30
Suraj Shetty	effe53d4ae	fix: Set default value for qty	2019-08-30 09:52:08 +05:30
Suraj Shetty	9641edc562	fix: Set item locations before save	2019-08-29 22:23:13 +05:30
Suraj Shetty	9b42682575	fix: Check parent warehouse for batch as well	2019-08-29 21:14:26 +05:30
Suraj Shetty	a6ab00162e	style: Remove commented code	2019-08-29 20:17:04 +05:30
Mangesh-Khairnar	79525327f0	feat: bypass credit limit check	2019-08-29 19:50:23 +05:30
Suraj Shetty	3e11338ed5	fix: Validate count of serial numbers	2019-08-29 19:46:49 +05:30
Suraj Shetty	acd00df8fb	Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list	2019-08-29 17:24:23 +05:30
Suraj Shetty	ed1ec82d2f	refactor: Item picking logic ... - Fix serial number selection - Get limited item location based on required qty - Store total item count to properly track available locations - Pass missing serial no.	2019-08-29 17:23:09 +05:30
Deepesh Garg	dbe8dab3ce	Merge pull request #18794 from deepeshgarg007/supplier_items ... fix: Enhancement in Purchase Order	2019-08-29 16:29:02 +05:30
Suraj Shetty	1c29c520bd	Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list	2019-08-29 13:18:57 +05:30
Suraj Shetty	66f2bc69a6	fix: Item mapping of stock entry with no reference	2019-08-29 09:23:31 +05:30
Suraj Shetty	55a2699f4c	fix: Update dashboard of doctypes that are linked with pick list	2019-08-29 09:14:27 +05:30
Suraj Shetty	f455c92d02	fix: Remove Pick List Reference Item use Item locations table instead	2019-08-28 17:44:22 +05:30
Rohit Waghchaure	d03d8204ab	fix: incorrect valuation rate calculated because of string replacement issue	2019-08-28 17:22:50 +05:30
Suraj Shetty	1cf7270049	fix: Add picklist dashboard config	2019-08-28 12:40:58 +05:30
Suraj Shetty	be0ae7a430	fix: Doctype changes ... - Check no copy for work order series field - Add dashboard - Set naming_series for pick list	2019-08-28 12:40:26 +05:30
Suraj Shetty	8f32ac0edd	fix: Batch selection logic	2019-08-28 10:16:20 +05:30
Suraj Shetty	c5e0838890	fix: Import get_conversion factor method	2019-08-27 12:14:17 +05:30
Suraj Shetty	974ac3e6ad	fix: Update item detail for items without reference	2019-08-27 10:17:16 +05:30
Suraj Shetty	dc675b1eb0	fix: Re-order stock qty field	2019-08-27 08:06:22 +05:30
Suraj Shetty	d6be8989e4	fix: Remove "Material Issue" purpose from pick list ... - Because in material issue we already define source warehouse	2019-08-26 22:11:49 +05:30
Suraj Shetty	8de8a78235	Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list	2019-08-26 10:51:12 +05:30
Mangesh-Khairnar	5dd1b50802	fix: update show in website on disabling item (#18831)	2019-08-26 10:27:25 +05:30
Suraj Shetty	00f9930fbf	style: Remove leftout print statements	2019-08-26 10:09:07 +05:30
Suraj Shetty	2b9e256002	fix: Rename method name	2019-08-26 10:05:01 +05:30
Suraj Shetty	94d7096c8c	fix: Show create button only if target doc does not exists	2019-08-26 08:40:02 +05:30
Suraj Shetty	ecc801d3d8	fix: Add pick list field to delivery note	2019-08-26 08:39:11 +05:30
Suraj Shetty	be9f4ea487	fix: Add button to create pick list from material request	2019-08-26 08:38:37 +05:30
Suraj Shetty	a1dc152695	fix: Move get items location button below items table	2019-08-26 06:57:43 +05:30
Suraj Shetty	9209570937	feat: Add option to create pick list from material request	2019-08-26 06:33:27 +05:30
Deepesh Garg	98b86ecbc2	Merge branch 'develop' into supplier_items	2019-08-23 15:41:30 +05:30
deepeshgarg007	59432418c6	fix: Consider multiple stock entry against a purchase order	2019-08-23 12:45:48 +05:30
Suraj Shetty	8b4d604cfd	fix: Use purpose field and remove item_base_on field	2019-08-23 11:57:16 +05:30
Deepesh Garg	f3d78dd29c	fix: Duplicate items check in Sales Invoice (#18660) ... * fix: Duplicate items check in sales Invoice * fix: Commonified function for duplicate items check in selling controller * fix: Set valuation rate and transaction date in child tabel	2019-08-23 11:42:35 +05:30
deepeshgarg007	f2798eab50	fix: Conside multiple stock entry against a purchase order	2019-08-23 10:07:52 +05:30
Suraj Shetty	687b1a5b1f	fix: Make pick list submittable and add few fields ... - Add material request & item fields - Add pick_list field to Stock Entry - Add purpose field to pick list	2019-08-22 16:41:14 +05:30
Suraj Shetty	8d55f81baa	fix: Fix raw matterial selection based on finished item qty	2019-08-22 16:37:44 +05:30
Suraj Shetty	c1f25ff9e3	fix: Add option to select qty of finished goods Item	2019-08-22 09:53:44 +05:30
Suraj Shetty	ec92486377	fix: Add option to create Stock Entry from Pick List	2019-08-21 22:10:27 +05:30
Suraj Shetty	298d38cde3	test: Fix existing tests	2019-08-21 16:37:49 +05:30
Suraj Shetty	da2a623e38	Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list	2019-08-21 11:48:27 +05:30
Suraj Shetty	d79a16c9f3	fix: Warehouse selection login ... - Rename item_loactions -> locations, reference_items -> items - Add customer and work_order field - fix "Get Items" button UX - fix get_pending_work_orders query Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2019-08-21 09:03:26 +05:30
Sahil Khan	5f2c030ddc	Merge branch 'version-12-hotfix' into merge_v12_hotfix_1	2019-08-20 16:22:49 +05:30
deepeshgarg007	cb38cc96c3	fix: Enhancement in Purchase Order	2019-08-20 15:00:48 +05:30
Suraj Shetty	5124b2806d	Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list	2019-08-20 12:05:51 +05:30
Suraj Shetty	1a090432d9	fix: Quantity while creating pick list from work order ... - Fix get_mapped_doc config to filter items - Fix erroneous condition in get_mapped_doc used for creation of pick_list in sales order Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2019-08-20 12:04:07 +05:30
Suraj Shetty	6450be5e58	fix: Get Items button	2019-08-19 10:48:21 +05:30
Suraj Shetty	669cff88d1	fix: Get items button	2019-08-19 10:38:01 +05:30
Mangesh-Khairnar	0df513434e	fix: valuation rate in stock ledger (#18744) ... * fix: valuation rate in stock ledger * test: allow zero valuation rate for items	2019-08-19 10:04:52 +05:30
Suraj Shetty	ec1fe9e2ca	Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list	2019-08-16 08:17:26 +05:30
Suraj Shetty	182f4def00	fix: Delivery note creation from pick list ... - Changes in serial no and batch no seletion - Changes in warehouse overrwite logic Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2019-08-16 08:16:22 +05:30
Mangesh-Khairnar	ca55af836b	fix: travis	2019-08-14 16:32:02 +05:30
Mangesh-Khairnar	06ce1f5a40	fix(quality-inspection): fetch all items for inspection type in process (#18716) ... * fix(quality-inspection): fetch all items for inspection type in process * fix(quality-inspection): add server side validation for in process items	2019-08-14 14:25:59 +05:30
DeeMysterio	1c728a7cf8	fix(delivery note): change the text invoice to sales invoice on make button (#18658)	2019-08-12 13:04:25 +05:30
DeeMysterio	cfce53103b	fix(delivery note): change the text invoice to sales invoice on make button (#18666)	2019-08-12 13:03:55 +05:30
Himanshu	19199baf29	fix: miscellaneous fixes (#18615)	2019-08-12 12:17:28 +05:30
Himanshu	ebf38c5ebd	fix: misc fixes (#18616)	2019-08-12 12:17:16 +05:30
Suraj Shetty	e047de854b	Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list	2019-08-09 11:14:14 +05:30
Faris Ansari	99c26e068d	fix: Set Maintenance Status fields as Read Only (#18634) ... Maintenance Status is set based on warranty_expiry_date and amc_expiry_date. Even if they are editable they are set programmatically server side. Better to make them as read only.	2019-08-08 17:45:49 +05:30
Faris Ansari	cfd19afabf	fix: Set Maintenance Status fields as Read Only (#18633) ... Maintenance Status is set based on warranty_expiry_date and amc_expiry_date. Even if they are editable they are set programmatically server side. Better to make them as read only.	2019-08-08 17:45:44 +05:30
Faris Ansari	df7644a96d	fix: Show created serial nos as links in message (#18635) ... Fixes #18623	2019-08-08 15:50:24 +05:30
Faris Ansari	afae8a0c46	fix: Show created serial nos as links in message (#18636) ... Fixes #18623	2019-08-08 15:50:17 +05:30
rohitwaghchaure	9601b6c601	feat: added checkbox 'Update Consumed Material Cost In Project' in work order to don't update the consumed material cost in the project for the subassembely work orders (#18533)	2019-08-05 10:40:23 +05:30
Suraj Shetty	b559bf6de6	Merge branch 'version-12-hotfix' into stock-ledger-fix	2019-08-02 08:43:54 +05:30
Suraj Shetty	c57328669a	feat: Add pick list print format	2019-08-02 08:14:27 +05:30
Suraj Shetty	b35c0410b1	fix: Add option to get items from work order	2019-08-02 08:12:30 +05:30
Suraj Shetty	a7dc3735ae	fix: Move folders to right location	2019-08-01 15:49:29 +05:30
Suraj Shetty	bb7a2dbb6a	fix: Rename file	2019-08-01 12:38:26 +05:30
Suraj Shetty	0c1dbb116f	Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list	2019-08-01 12:06:20 +05:30
Suraj Shetty	fbcc56536b	fix: Rename Pick TIcket -> Pick List	2019-08-01 12:05:20 +05:30
Suraj Shetty	fa9111ebe2	fix: Add and rename some fields ... - Add ability to create delivery note from pick ticket - Minor fix related to create button	2019-08-01 11:07:14 +05:30
rohitwaghchaure	fdb5e6b2e5	Merge pull request #18531 from rohitwaghchaure/scrap_item_not_adding_v12_hotfix ... fix: scrap item not adding while doing finished good entry	2019-07-31 00:47:01 +05:30
Rohit Waghchaure	862363521b	fix: scrap item not adding while doing finished good entry	2019-07-30 23:57:58 +05:30
deepeshgarg007	f9c0ef3eb3	fix: Check zero valuation rate only for valid doctypes	2019-07-30 19:01:53 +05:30
deepeshgarg007	548293ad08	fix: Check zero valuation rate only for valid doctypes	2019-07-30 18:49:19 +05:30
Suraj Shetty	72d03464dc	fix: Show "Get Item Location" only if there are reference items	2019-07-30 11:56:24 +05:30
Suraj Shetty	14fb1600ec	fix: Select location based on group warehouse	2019-07-30 11:47:21 +05:30
Suraj Shetty	341f7733d1	fix: Make item read-only in item location table	2019-07-30 10:02:50 +05:30
Suraj Shetty	e260e8239f	fix: Batch number selection code	2019-07-30 10:02:10 +05:30
Suraj Shetty	55ab31314c	fix: Add code to set batch no ... - And split item based on batch availibility	2019-07-30 09:02:03 +05:30
Suraj Shetty	9ad10cb425	test: Add basic tests	2019-07-29 16:52:26 +05:30
rohitwaghchaure	a55e4e2c03	Merge pull request #18452 from rohitwaghchaure/scrap_item_not_adding ... fix: scrap item not adding while doing finished good entry	2019-07-29 15:30:24 +05:30
Suraj Shetty	7e20324776	Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list	2019-07-29 09:41:08 +05:30
Suraj Shetty	27bdba49d4	test: Add test case statements	2019-07-28 22:04:07 +05:30
Suraj Shetty	d43764c8e5	fix: Use .set method to set serial no.	2019-07-28 22:03:28 +05:30
Saurabh	af19347376	Merge branch 'develop' into scrap_item_not_adding	2019-07-26 15:10:17 +05:30
Deepesh Garg	64968979b2	Merge branch 'version-12-hotfix' into stock-ageing-v12	2019-07-26 14:42:34 +05:30
Suraj Shetty	64f174fcaa	feat: Get item location from reference items ... - Add option to get items from multiple sales order - Add some required fiels to Pick TIcket Reference Item	2019-07-26 13:22:05 +05:30
Deepesh Garg	941e21092c	Merge branch 'develop' into stock_ageing_fix	2019-07-26 12:47:05 +05:30
deepeshgarg007	06f99cae36	fix: Fixes in stock ageing report	2019-07-26 10:32:08 +05:30
deepeshgarg007	15154d4bd0	Merge branch 'develop' of https://github.com/frappe/erpnext into stock_ageing_fix	2019-07-26 10:30:22 +05:30
deepeshgarg007	7fdab021b6	fix: Use get_serial_no and remove batch	2019-07-26 10:26:13 +05:30
deepeshgarg007	1495c9599a	fix: Remove batch	2019-07-26 10:25:54 +05:30
deepeshgarg007	e3a2ab184e	fix: Consider serial no and batches in Stock ageing report	2019-07-26 10:25:15 +05:30
deepeshgarg007	f7733be322	fix: Enhancement in stock ageing report	2019-07-26 10:25:04 +05:30
deepeshgarg007	4d53992b35	fix: Changed columns to new dict form	2019-07-26 10:24:40 +05:30
Aditya Hase	f2fb461e40	perf(tests): Remove unnecessary tearDown code	2019-07-26 05:54:04 +05:30
Aditya Hase	f4314a25b6	perf(travis): Use setUpClass instead of setUp	2019-07-26 05:54:04 +05:30
Aditya Hase	bd69f43322	fix(stock): Fix travis builds	2019-07-26 05:54:04 +05:30
Aditya Hase	1e82638ae8	perf(tests): Remove unnecessary tearDown code	2019-07-26 03:52:17 +05:30
Aditya Hase	ff79463e36	perf(travis): Use setUpClass instead of setUp	2019-07-26 03:08:45 +05:30
Aditya Hase	6bc2988623	fix(stock): Fix travis builds	2019-07-26 03:08:45 +05:30
Suraj Shetty	3b31800533	fix: Add logic to set batch no [WIP] ... - Add pick ticket reference item	2019-07-25 11:22:45 +05:30
Suraj Shetty	0576ad5ef9	fix: Move pick list creation code to picklist.py file	2019-07-24 15:16:03 +05:30
Suraj Shetty	778b4926bf	fix: Fetch warehouse location from Bin	2019-07-24 11:27:32 +05:30
Rohit Waghchaure	bcfbc792b4	fix: scrap item not adding while doing finished good entry	2019-07-23 16:05:29 +05:30
Suraj Shetty	ed4f8cf65d	Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list	2019-07-23 13:29:41 +05:30
deepeshgarg007	a19d1d6926	fix: Fixes in stock ageing report	2019-07-23 08:30:09 +05:30
Nabin Hait	cd1094e1c2	Merge branch 'rohitwaghchaure-stock_reco_for_serialized_items' into develop	2019-07-22 17:01:08 +05:30
Nabin Hait	ca25b925f5	fix: Calcellation logic for reconciliation of serialized items	2019-07-22 17:00:32 +05:30
deepeshgarg007	d9cc84892b	fix: Use get_serial_no and remove batch	2019-07-22 15:56:41 +05:30
deepeshgarg007	3877b5407c	fix: Remove batch	2019-07-22 15:30:18 +05:30
deepeshgarg007	55ca054cb4	Merge branch 'develop' of https://github.com/frappe/erpnext into stock_ageing_fix	2019-07-22 12:46:30 +05:30
Anurag Mishra	305da799a4	Handling case for Material Request type 'Manufacture' v12 (#18365) ... * fix: status for 'material request type == Manufacture' * Patch: for setting status * fix: list view status	2019-07-22 11:35:16 +05:30
Himanshu	73d446023d	fix: file attach via import (#18414)	2019-07-22 11:19:47 +05:30
Deepesh Garg	60a291af8f	fix: Sample qty validation fix in purchase receipt (#18419) ... Co-authored-by: Suraj Shetty <surajshetty3416@gmail.com>	2019-07-22 11:14:14 +05:30
Himanshu	0a8816e053	feat(Google Maps): Google Maps Refactor [Unified Google API Settings] (#18110)	2019-07-19 14:38:04 +05:30
rohitwaghchaure	3403d1cc44	Merge pull request #18095 from scmmishra/remove-move-stock-summary ... refactor: move and add for serialized and batch items in stock summary	2019-07-17 18:50:00 +05:30
Suraj Shetty	6824838ab0	Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list	2019-07-17 15:39:09 +05:30
Deepesh Garg	902e5ab744	Merge branch 'develop' into ac_dim_usability_fixes	2019-07-16 16:17:07 +05:30
deepeshgarg007	4a7f370b15	fix: Consider serial no and batches in Stock ageing report	2019-07-16 16:08:50 +05:30
Shivam Mishra	7339c72208	Update item_dashboard.js	2019-07-16 13:19:13 +05:30
Shivam Mishra	5738c93b8f	style: commonified move and add button handler	2019-07-16 12:52:19 +05:30
Shivam Mishra	7ab6010225	Merge branch 'remove-move-stock-summary' of github.com:scmmishra/erpnext into remove-move-stock-summary	2019-07-16 12:33:13 +05:30
Shivam Mishra	fd6ff62bdb	style: code styling fixes	2019-07-16 12:32:50 +05:30
deepeshgarg007	6ecbd97fbe	Merge branch 'develop' of https://github.com/frappe/erpnext into stock_ageing_fix	2019-07-16 09:02:48 +05:30
Nabin Hait	6e264701cb	Merge branch 'stock_reco_for_serialized_items' of https://github.com/rohitwaghchaure/erpnext_develop into rohitwaghchaure-stock_reco_for_serialized_items	2019-07-15 18:12:49 +05:30
Nabin Hait	868766ddf0	refactor: Refactored over delivery/receipt/billing fields (#17788) ... * refact: Refactored over delivery/receipt/billing fields * fix: test case	2019-07-15 18:02:58 +05:30
deepeshgarg007	1cc46c06b0	Merge branch develop into ac_dim_usability_fixes	2019-07-15 15:34:40 +05:30
Faris Ansari	280fe396b9	fix: Dont rebuild cache on cache bust (#18319) ... - Results in a lot of stale background jobs - Cache will be built when needed	2019-07-15 14:30:21 +05:30
Mangesh-Khairnar	1ac9a8e82e	fix(bin): update requested qty in bin (#18297)	2019-07-15 14:08:47 +05:30
deepeshgarg007	a85db66146	fix: Usability fixes in accounting dimensions	2019-07-14 18:15:19 +05:30
deepeshgarg007	581d931031	fix: Enhancement in stock ageing report	2019-07-13 21:58:32 +05:30
deepeshgarg007	d43d19acfd	Merge branch 'develop' of https://github.com/frappe/erpnext into stock_ageing_fix	2019-07-13 11:40:05 +05:30
Shivam Mishra	5594ea5298	Merge branch 'develop' into remove-move-stock-summary	2019-07-12 16:04:12 +05:30
Deepesh Garg	d73426a3bc	fix: Add status field at parent level in quality inspection and minor UX fix (#18263) ... * fix: Add status field at parent level and minor UX fix * fix: Set default status as Accepted	2019-07-12 14:44:22 +05:30
Deepesh Garg	587bdf09eb	Merge branch 'develop' into feat-manufacturer-is-missing-contacts	2019-07-12 12:30:42 +05:30
Suraj Shetty	ca872381a1	Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list	2019-07-12 12:13:09 +05:30
Anurag Mishra	53e7df078e	fix: set project link in item tables (#18233)	2019-07-12 12:05:39 +05:30
Suraj Shetty	32371c8755	feat: Init Pick Ticket and Pick Ticket Item	2019-07-12 11:56:42 +05:30
Saurabh	acaf76a6de	Merge branch 'develop' into feat-manufacturer-is-missing-contacts	2019-07-12 11:10:12 +05:30
rohitwaghchaure	b390b70ee3	fix: set project in material request when pull items from bom (#18256)	2019-07-11 15:22:03 +05:30
rohitwaghchaure	058787d204	fix: error report for item price (#18212)	2019-07-10 17:03:48 +05:30
deepeshgarg007	1dc124cf75	fix: Changed columns to new dict form	2019-07-10 14:49:25 +05:30
Shivam Mishra	eb7c037bdf	Merge branch 'develop' of https://github.com/frappe/erpnext into remove-move-stock-summary	2019-07-10 10:22:20 +05:30
Shivam Mishra	444091b350	refactor: disable quick entry for batched and serialized items	2019-07-10 10:22:08 +05:30
rohitwaghchaure	8a054e4b36	Merge pull request #18182 from rohitwaghchaure/provision_to_make_debit_credit_note_against_return_entry ... feat: provision to make debit / credit note against the stock returned entry	2019-07-07 00:51:46 +05:30
Bhavishya Sharma	607611ebdc	codacy fix	2019-07-06 15:02:57 +05:30
Bhavishya Sharma	db3c5625ae	feat: Manufacturer is Missing Contacts	2019-07-06 13:54:30 +05:30
rohitwaghchaure	6ea1f7becf	Merge pull request #18177 from scmmishra/po-patch-1 ... refactor: added throw if supplier is not default for any item	2019-07-05 18:12:56 +05:30
Rohit Waghchaure	5d4d70b75f	feat: provision to make debit / credit note against the stock returned entry	2019-07-05 17:06:25 +05:30
Shivam Mishra	6277966105	chore: added check for auto-reorder in stock settings (#18174) ... * chore: added check for auto-reorder in stock settings * style: removed explicit return	2019-07-05 15:58:13 +05:30
Suraj Shetty	83f767b5a3	Merge pull request #18173 from karthikeyan5/develop-add-manufacturing-dashboards ... feat(manufacturing): added dashboard for doctypes	2019-07-05 14:22:13 +05:30
Shivam Mishra	7a7c66e95e	refactor: added throw if supplier is not default for any item	2019-07-05 13:06:53 +05:30
Rohit Waghchaure	cdb75b56c5	fix: removed item manaufacturer child table from item master	2019-07-05 12:24:14 +05:30
karthikeyan5	ad33c19510	fix: converting spaces to tabs on a few lines	2019-07-05 11:28:59 +05:30
Shivam Mishra	38b930b638	refactor: Move and Add buttons open new stock entry	2019-07-05 10:38:48 +05:30
karthikeyan5	830f2b642b	chore(manufacturing): added dashboard for doctypes	2019-07-05 09:48:38 +05:30
Faris Ansari	23c80658ba	fix: Add links in validation message	2019-07-04 18:54:04 +05:30
Shivam Mishra	e528b29eea	Merge branch 'develop' of https://github.com/frappe/erpnext into remove-move-stock-summary	2019-07-04 13:46:30 +05:30
rohitwaghchaure	f078031c60	fix: multiple minor issues in delayed order report (#18134)	2019-07-03 11:43:38 +05:30
Nabin Hait	34c551d9a5	fix: Missing commits from hotfix branch (#17997) ... * fix: merge conflict * fix: restored missing set_gst_state_and_state_number function * fix: style linting as per codacy * fix: Fixes related to customer/lead merging * fix: merge conflict * fix: Fixes related to customer/lead merging * fix: Assign isue/opportunity to user * fix: Assign isue/opportunity to user * fix: Replaced Invoice type by GST Category * fix: merge conflict * fix: merge conflict * fix: test cases * fix: test cases	2019-07-03 10:34:31 +05:30
Shivam Mishra	43cebdff4d	fix: translated title (#18119)	2019-07-01 11:01:28 +00:00
Nabin Hait	f5aff98589	fix: Validate changes in batch, serial nos, val method fields (#18064)	2019-06-28 12:47:44 +05:30
Aditya Hase	ce9cdfb056	fix(ui): better message after creating serial numbers (#18093) ... fix(ui): better message after creating serial numbers	2019-06-27 18:20:13 +05:30
Aditya Hase	7f3ebb1d06	Merge branch 'develop' into stock-ledger-link	2019-06-27 18:19:15 +05:30
Aditya Hase	b9c9ada3f8	Merge pull request #18090 from scmmishra/twelve-fixes ... fix: print message for insufficient stock	2019-06-27 18:18:24 +05:30
Shivam Mishra	c41403c8a9	fix: remove move and add buttons from stock summary	2019-06-27 16:34:38 +05:30
Shivam Mishra	468d5563c6	fix: set serial numbers as data field	2019-06-27 14:13:54 +05:30
Shivam Mishra	e1aec5519b	fix(ui): better message after creating serial numbers	2019-06-27 13:14:41 +05:30
Shivam Mishra	bc777b1732	fix: styling for sort selector	2019-06-27 12:43:39 +05:30
Shivam Mishra	9e07b7d2b8	Merge branch 'develop' into twelve-fixes	2019-06-27 09:44:41 +05:30
Rohit Waghchaure	6de3ed5416	fix: dn test cases	2019-06-26 21:58:42 +05:30
rohitwaghchaure	387ee8f511	fix: returned qty issue while making sales invoice from dn if same item added multiple times (#18076)	2019-06-26 13:40:26 +05:30
Shivam Mishra	9479f7f1ef	fix: print message for insufficient stock	2019-06-26 10:37:00 +05:30
Mangesh-Khairnar	558a5c199f	fix(price list): change the field name	2019-06-24 17:32:04 +05:30
Rushabh Mehta	5162b7457f	Merge pull request #17918 from Alchez/develop-item-code-gen ... fix(stock): Remove hardcoded validation for Item	2019-06-20 14:21:57 +05:30
rohitwaghchaure	40c5fcc9cc	Merge pull request #17967 from Alchez/develop-delivery-email ... fix(delivery): Add items to context for dispatch notification email	2019-06-19 14:37:23 +05:30
Anurag Mishra	3d47a6dbb5	fix: Company filters in Total Stock Summary Report (#17965)	2019-06-17 17:49:04 +05:30
Rohan Bansal	4babfdb987	fix(delivery): Add more context for dispatch notification email + formatting fixes	2019-06-17 16:16:51 +05:30
Rohit Waghchaure	725f56faca	feat: delayed order reports	2019-06-17 12:50:44 +05:30
Rohit Waghchaure	059890ecef	Test cases for batch no	2019-06-14 17:24:47 +05:30
Anurag Mishra	4c1639305f	feat: creating stock entry against purchase receipt	2019-06-14 12:31:08 +05:30
Shivam Mishra	4def9836e0	Merge branch 'develop' into bom-item-fix	2019-06-13 16:17:54 +05:30
Mangesh-Khairnar	b2f266ad10	fix: get bom item when company is not passed	2019-06-13 14:34:40 +05:30
Deepesh Garg	0d7d4879a9	Merge pull request #17920 from Anurag810/stock_balance_report ... fix: fetch item on the base of item group	2019-06-13 10:49:30 +05:30
Anurag Mishra	bbe2c4fb01	fix: fetch item on the base of item group	2019-06-12 19:09:51 +05:30
Rohan Bansal	ddea50fa22	fix(stock): Remove hardcoded validation for Item	2019-06-12 17:59:23 +05:30
rohitwaghchaure	dde4f93137	Merge pull request #17881 from rohitwaghchaure/cogs_only_for_material_issue_in_ste_develop ... fix: set COGS for material issue only	2019-06-10 16:57:23 +05:30
Rohit Waghchaure	9a792c2eed	stock_entry: set COGS for material issue only	2019-06-07 15:20:36 +05:30
Rohit Waghchaure	3cf24366a9	feat: provision to set multiple manufacturer in the item master	2019-06-06 19:53:32 +05:30
Rohit Waghchaure	87c4b06437	Test cases for serial no	2019-06-02 16:29:07 +05:30
Rohit Waghchaure	66aa37f1e2	provision to add batch number in the stock reconciliation	2019-06-02 16:29:07 +05:30
Rohit Waghchaure	05d3bcb63d	stock recon for serial no, batch no	2019-06-02 16:29:06 +05:30
deepeshgarg007	e19abb162a	fix: Resolve merge conflicts in purchase_receipt_item	2019-06-01 23:26:09 +05:30
deepeshgarg007	55b894bfef	Merge branch develop into dimensions	2019-06-01 23:13:36 +05:30
Saurabh	f68bd8f349	Merge pull request #17813 from rohitwaghchaure/allow_import_for_packing_slip_develop ... fix: allow import for packing slip	2019-05-31 14:24:51 +05:30
Saurabh	731986d8ee	Merge pull request #17811 from nabinhait/pr-expense-account-dev ... fix: Added Expense Account field to push value from PO-PR-PI	2019-05-31 14:19:47 +05:30
Rohit Waghchaure	e98d1c1147	fix: allow import for packing slip	2019-05-31 14:16:11 +05:30
deepeshgarg007	2580075583	Merge branch 'develop' of https://github.com/frappe/erpnext into dimensions	2019-05-30 22:11:27 +05:30
Nabin Hait	0e1e37c921	fix: Added Expense Account field to push value from PO-PR-PI	2019-05-30 18:13:41 +05:30
Saif Ur Rehman	7129231dbb	fix(Product Bundle Balance): Update frappe.db.escape for v12	2019-05-30 13:55:32 +05:00
Deepesh Garg	12a9a3ffa3	Merge branch 'develop' into Product-Bundle-Balance	2019-05-29 18:23:21 +05:30
deepeshgarg007	acc2422167	Merge branch develop into dimensions	2019-05-28 12:18:32 +05:30
Anurag Mishra	a69f72988a	fix: requested filters changes	2019-05-28 11:08:14 +05:30
Anurag Mishra	32c23ae274	fix: added read write permission to stock manager	2019-05-27 18:37:04 +05:30
Anurag Mishra	61a7b42aea	fix: added permission and fix filters in stock balance report	2019-05-27 18:37:04 +05:30
Anurag Mishra	7376b4f4f0	feat: added warehouse type master	2019-05-27 18:37:04 +05:30
Nabin Hait	e662be7508	Merge pull request #17697 from nabinhait/po-status-updater-dev-1 ... fix: update received qty in PO from PR and PI	2019-05-27 17:16:40 +05:30
Nabin Hait	99fa813799	Merge branch 'develop' into Product-Bundle-Balance	2019-05-27 14:01:00 +05:30
Nabin Hait	769024e2b6	Merge branch 'develop' into po-status-updater-dev-1	2019-05-27 13:47:15 +05:30
Nabin Hait	f3ccf0e949	Merge branch 'develop' into opening-stock-entry-dev	2019-05-27 13:47:07 +05:30
Deepesh Garg	5f2afb8803	fix: Do not fetch batch items and serialized items in stock reconciliation (#17725)	2019-05-27 13:42:29 +05:30
Nabin Hait	6211e7343c	Merge branch 'develop' into po-status-updater-dev-1	2019-05-27 11:50:29 +05:30
Nabin Hait	ca8dae183a	Merge branch 'develop' into opening-stock-entry-dev	2019-05-27 11:50:16 +05:30
deepeshgarg007	6f6636abfe	fix: Add dimension section in multiple doctypes	2019-05-26 12:31:01 +05:30
deepeshgarg007	d330519f7c	fix: Merge branch develop into dimensions	2019-05-25 18:18:08 +05:30
Nabin Hait	d8496a770a	fix: validate expense account for opening stock reco	2019-05-23 15:32:55 +05:30
rohitwaghchaure	fd4815da53	Merge pull request #17690 from rohitwaghchaure/set_default_warehouse_from_the_stock_settings_v12 ... fix: while making the item, default warehouse not set even if the stock settings has the warehouse	2019-05-23 15:04:43 +05:30
Nabin Hait	5173170be3	fix: validate expense account for opening stock entry	2019-05-23 12:10:51 +05:30
Nabin Hait	79f84e58ba	test: Add test case for opening stock entry gle	2019-05-23 11:16:12 +05:30
Nabin Hait	8770ea2631	fix: Opening accounting entry for stock entry	2019-05-23 11:15:04 +05:30
Saurabh	45cd60dfb2	Merge pull request #17645 from nabinhait/bom-item-rate-dev ... fix: BOM Item rate based on uom conversion factor and exchange rate	2019-05-22 18:58:34 +05:30
Nabin Hait	0ce85735b8	Merge branch 'develop' into set_default_warehouse_from_the_stock_settings_v12	2019-05-22 15:06:04 +05:30
Nabin Hait	ecf25907a5	fix: set schedule date from MR to PO	2019-05-22 13:07:26 +05:30
Nabin Hait	b7bdcc3992	fix: Don't set reqd date in PO based on MR, if less than today	2019-05-22 12:01:17 +05:30
Nabin Hait	915edbf9ce	fix: po status	2019-05-22 12:00:36 +05:30
Nabin Hait	d752051b8d	fix: update received qty in PO from PR	2019-05-22 11:59:19 +05:30
Rohit Waghchaure	c41118bac7	Get default warehouse from the stock settings in the get_item_details	2019-05-21 15:21:13 +05:30
Rohit Waghchaure	5e7b4ca6a4	fix: while making the item, default warehouse not set even if the stock settings has the warehouse	2019-05-21 12:14:16 +05:30
deepeshgarg007	3d11ac0e75	fix: Accounting dimensions for child tables	2019-05-19 00:02:01 +05:30
Deepesh Garg	e796d2844c	fix: Unable to create item variant based on manufacturer (#17652) ... * fix: Unable to create item variant against manufacturer * fix: Spacing fixes * fix: Spacing fixes in item.js	2019-05-17 15:39:22 +05:30
Rohan	a094560b8b	fix(tests): Save batch instead of submitting it (#17637)	2019-05-16 19:44:55 +05:30
Rushabh Mehta	8ec3718aba	Merge pull request #17625 from rmehta/link-preview-item-task ... fix: link preview for item and task	2019-05-16 19:35:05 +05:30
Nabin Hait	06c8cf4321	fix: BOM Item rate based on uom conversion factor and exchange rate	2019-05-16 19:23:00 +05:30
Rohit Waghchaure	cb4e28fb31	fix: changed fieldtype from data to float	2019-05-16 17:01:05 +05:30
Rushabh Mehta	a02ab2d3d7	Merge pull request #17635 from nabinhait/add-multiple-items-dev ... feat: Added 'Add Multiple' options in all sales / purchase transactions	2019-05-16 14:57:03 +05:30
Nabin Hait	3fccfaa7ce	feat: Added 'Add Multiple' options in all sales / purchase transactions	2019-05-16 14:54:05 +05:30
Rushabh Mehta	fd6ae67b16	fix: link preview for item and task	2019-05-16 10:25:27 +05:30
Deepesh Garg	0ae1c293d3	fix: Status updater fixes in PO and SO and test coverage for return (#17491) ... * fix: Status updator fixes in sales and purchase cycle * fix: Test cases for return in so and po * fix: Resolve conflicts	2019-05-15 12:23:24 +05:30
Suraj Shetty	2df91addd7	perf: Index show_in_website field for faster item search	2019-05-09 19:19:34 +05:30
rohitwaghchaure	4d2c307d6d	Merge pull request #17475 from netchampfaris/item-variant-attributes-optional ... fix: Allow variant attributes to be optional	2019-05-09 00:54:45 +05:30
Deepesh Garg	35226b1f32	Merge pull request #17415 from deepeshgarg007/notification ... feat: Track purchase receipt status in material request	2019-05-09 00:03:34 +05:30
Rohit Waghchaure	0cb7024e55	fix: job card issue, added validation in the stock entry	2019-05-08 15:14:12 +05:30
Saurabh	27e7ae6773	Merge branch 'develop' into procurement-tracker	2019-05-08 11:30:38 +05:30
deepeshgarg007	321124aa72	fix: Resolve merge conflict in json files	2019-05-08 10:33:08 +05:30
deepeshgarg007	e13a56cc80	Merge branch develop into notification	2019-05-08 10:16:30 +05:30
Faris Ansari	9a45bd11d6	Merge branch 'develop' into item-variant-attributes-optional	2019-05-07 14:25:03 +05:30
Rohan	174aa24529	fix(stock): Allow expired batches to be flushed out of the system (#17478)	2019-05-04 22:41:05 +05:30
Faris Ansari	14425575b7	fix: Rebuild cache in background (#17487)	2019-05-04 22:38:13 +05:30
Faris Ansari	cb03bb1c00	fix: Allow variant attributes to be optional	2019-05-03 13:41:50 +05:30
Nabin Hait	9ccdf594c3	Merge pull request #17445 from rmehta/refactor-child-tables ... fix(item-tables): add missing "item_tax_template" in purchase order detail and reorganize sequence of all child table	2019-05-01 19:31:00 +05:30
Rushabh Mehta	c3aecb1fbd	fix(item-tables): add missing "item_tax_template" in purchase order detail and reorganize sequence of all child table	2019-05-01 18:04:22 +05:30
deepeshgarg007	bffa060ff6	Merge branch 'develop' of https://github.com/frappe/erpnext into notification	2019-05-01 16:33:11 +05:30
deepeshgarg007	6dfbd2bb64	fix: Delete old report	2019-05-01 14:17:16 +05:30
Suraj Shetty	c87b47a575	fix: Price list conversion for other UOM from stock UOM item price (#17386) ... * fix: Price list for UOM other than stock UOM -Fixes conversion from default UOM item price to other UOMs * fix: Typo	2019-04-29 23:18:47 +05:30
deepeshgarg007	f2fb0e03e6	fix: Add status for partial received	2019-04-29 21:42:48 +05:30
Mangesh-Khairnar	96661ba847	feat: add filters for multiple company operation	2019-04-28 17:11:28 +05:30
deepeshgarg007	c23b70950e	Merge branch 'develop' of https://github.com/frappe/erpnext into notification	2019-04-26 16:43:06 +05:30
Saif Ur Rehman	f1da53ed01	fix(Product Bundle Balance): Remove custom roles	2019-04-25 00:14:14 +05:00
Deepesh Garg	ea9c758648	Merge pull request #17331 from deepeshgarg007/inactive_items ... feat: Inactive items report	2019-04-24 22:30:54 +05:30
Saif Ur Rehman	a012b63f9b	style: linting	2019-04-24 16:17:40 +05:00
Saif Ur Rehman	adc738f55d	style: linting	2019-04-24 14:43:46 +05:00
Saif Ur Rehman	35887f1c0a	feat: Product Bundle Balance Report	2019-04-24 13:37:25 +05:00
Deepesh Garg	7dddc0c5bf	Merge branch 'develop' into fix-stock-entry-feed	2019-04-24 08:14:10 +05:30
Rohan	d12e9426bd	fix(selling): Fix method to also consider return documents (#17340)	2019-04-23 23:08:26 +05:30
Nabin Hait	90bca999dd	Merge branch 'develop' into inactive_items	2019-04-23 21:39:22 +05:30
Nabin Hait	09438562d4	Merge branch 'develop' into fix-stock-entry-feed	2019-04-23 21:39:04 +05:30
Nabin Hait	5e0bc20ab8	Merge pull request #17337 from nabinhait/travis-fix-dev ... fix: Load doc before save	2019-04-23 21:35:18 +05:30
Nabin Hait	1f61a1ecf2	minot fix	2019-04-23 18:44:57 +05:30
Nabin Hait	8bbc0a0c3b	Merge branch 'develop' into inactive_items	2019-04-23 18:38:44 +05:30
Deepesh Garg	cb2c13fa50	fix: Stock Ledger report fix (#17343)	2019-04-23 17:29:59 +05:30
Kanchan Chauhan	253c6f962d	fix: Subject of Stock Entry feed	2019-04-23 14:40:02 +05:30
Nabin Hait	319c912f91	fix: Load doc before save	2019-04-23 13:13:36 +05:30
deepeshgarg007	e3ea806390	fix: Ignore sql injections	2019-04-22 21:08:29 +05:30
deepeshgarg007	a89d1df655	fix: Typo fixes	2019-04-22 17:54:38 +05:30
deepeshgarg007	bf2adae97d	fix: Ordering and datatype fixes in inactive items report	2019-04-22 17:15:23 +05:30
deepeshgarg007	8a5d556f53	Merge branch 'develop' of https://github.com/frappe/erpnext into inactive_items	2019-04-22 16:59:33 +05:30
deepeshgarg007	425699d9f2	fix: Material request list_view status fixes	2019-04-22 16:54:52 +05:30
deepeshgarg007	06c20400ee	feat: Track purchase receipt status in Material Request	2019-04-22 12:25:14 +05:30
Faris Ansari	1d78aae2af	fix: Add index to Item route ... Increases route resolve time if there are lots of Items.	2019-04-19 14:03:25 +05:30
deepeshgarg007	767a00fa8d	feat: Logic for query and report creation for inactive items	2019-04-18 08:45:10 +05:30
deepeshgarg007	4d1df416e9	fix: Reordered and deleted unnecessary filters	2019-04-18 08:29:21 +05:30
Shivam Mishra	f3cc87455a	Merge pull request #17249 from scmmishra/auto-fetch-serial ... feat: Auto fetch serial numbers	2019-04-17 17:15:27 +05:30
Shivam Mishra	63921ebbc9	style: fixed formatting ... Fixed formatting for for auto_fetch_serial_number	2019-04-17 15:29:29 +05:30
deepeshgarg007	cab2d82ea8	Merge branch 'develop' of https://github.com/frappe/erpnext into inactive_items	2019-04-17 11:35:56 +05:30
deepeshgarg007	508e815db0	feat: Added filters and columns for inactive items report	2019-04-16 17:07:13 +05:30
scmmishra	c791c3b24b	fix: Minor bug in serial no auto fetch api	2019-04-16 16:07:32 +05:30
scmmishra	eee5c38911	feat: Use controller for serial no. API	2019-04-16 15:57:51 +05:30
Himanshu	ef848fda2a	fix: let user delete the elements of items	2019-04-16 13:17:20 +05:30
scmmishra	8ec54c2214	feat: Added auto fetch serial numbers API	2019-04-16 12:20:55 +05:30
Himanshu Warekar	810dde2e0b	fix: show get items even if note has been amended	2019-04-16 12:20:35 +05:30
Nabin Hait	29997e2631	fix: Invoice against partially returned DN/PR	2019-04-16 09:55:42 +05:30