3967 Commits

Author	SHA1	Message	Date
Saqib	2e45076dcf	Merge branch 'develop' into asset-cat-validation	2020-04-12 13:39:43 +05:30
Deepesh Garg	5e274965cc	Merge pull request #21201 from marination/serial-no-status ... fix: Added Status field in Serial No for filter and report builder	2020-04-10 20:48:06 +05:30
Shivam Mishra	ebcc46d837	feat: updated desk pages (#21138)	2020-04-10 18:52:05 +05:30
rohitwaghchaure	cf17809c3f	Merge pull request #21156 from marination/mr-customer-provided-to-stock-entry ... fix: Mapping Customer Provided Material Request to Stock Entry	2020-04-09 13:18:25 +05:30
vishdha	0b34b90e71	fix: item_name added for message	2020-04-09 11:46:46 +05:30
marination	86e8b2a1c6	fix: Status field in Serial No for filter and report builder	2020-04-08 15:38:28 +05:30
Saqib	562fd0eab0	fix: purchase return are allowed even when assets are not cancelled (#20797) ... * fix: purchase return are allowed even when assets are not cancelled * chore: test case * fix: error message Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-04-08 12:11:40 +05:30
rohitwaghchaure	47c8ddb29b	Merge pull request #20962 from marination/pick-list-enhance ... fix: Pick List Enhancements	2020-04-08 12:09:10 +05:30
Suraj Shetty	da6806e6bc	fix: Translation strings with trailing spaces (#21192)	2020-04-08 09:32:41 +05:30
marination	3e7a8abf29	feat: Provision to set Default Item Manufacturer ... - Is Default checkbox added in Item Manufacturer - Default Item Manufacturer and Part No fields added to Item Master - Manufacturer Part No field editable in all child tables with validation - Manufacturer and Part No auto fetched via get_item_details in child table	2020-04-07 21:00:57 +05:30
rohitwaghchaure	36459c052f	Merge branch 'develop' into pick-list-enhance	2020-04-07 18:04:39 +05:30
rohitwaghchaure	0672b6b2e8	Merge pull request #21170 from rohitwaghchaure/get_serial_nos_based_on_posting_date_and_time_develop ... fix: get serial nos based on posting date and time	2020-04-07 18:02:49 +05:30
Nabin Hait	c9f08bed2b	fix: set batch qty in batch master and test cases	2020-04-07 17:33:10 +05:30
Rohan Bansal	f92a5f32bd	fix: set batch ID as title instead of item code	2020-04-07 17:33:10 +05:30
Rohan Bansal	d2d73e6cb7	fix: prioritize empty over expired as batch status	2020-04-07 17:33:10 +05:30
Rohan Bansal	ba03853b2a	fix: update Batch schema	2020-04-07 17:33:10 +05:30
Rohan Bansal	ced78cf116	fix(stock): make requested changes	2020-04-07 17:33:10 +05:30
Rohan Bansal	92669eae66	fix(stock): batch list view statuses	2020-04-07 17:33:10 +05:30
Rohan Bansal	4a50c99867	fix(stock): Update batch quantity whenever stock in it is moved	2020-04-07 17:33:10 +05:30
Rohan Bansal	1bd7ea99f4	fix(batch): Only consider valid stock ledger entries	2020-04-07 17:33:10 +05:30
Rohan Bansal	658ed14e40	feat(batch): Add total quantity and dashboard to Batch	2020-04-07 17:33:10 +05:30
rohitwaghchaure	d313a239de	Merge pull request #21065 from marination/bin-requested-qty ... fix: Updated Bin Requested Qty logic	2020-04-07 14:50:19 +05:30
Rohit Waghchaure	560f822dbf	fix: get serial nos based on posting date and time	2020-04-07 14:42:02 +05:30
rohitwaghchaure	55ea142afd	Merge pull request #21181 from marination/purchase-receipt-scan-barcode ... feat: Scan Barcode in Purchase Receipt	2020-04-07 14:36:56 +05:30
Marica	c732e9967d	fix: Validate Serial/Batch No naming series in Item itself (#21167) ... * fix: Validate Serial/Batch No naming series in Item itself * fix: Consider '#' too	2020-04-07 14:16:14 +05:30
Marica	048de30cb5	Merge branch 'develop' into pick-list-enhance	2020-04-07 14:05:05 +05:30
rohitwaghchaure	f8e8333d77	Merge pull request #21174 from rohitwaghchaure/material_request_incorrect_filter_issue_develop ... fix: material request type manufacture shows items with Is Purchase I…	2020-04-07 12:06:18 +05:30
marination	e05013ede3	feat: Scan Barcode in Purchase Receipt	2020-04-06 22:13:13 +05:30
Rohit Waghchaure	5317907e15	fix: material request type manufacture shows items with Is Purchase Item enabled	2020-04-06 17:53:16 +05:30
Marica	e58d1b1b9f	Merge branch 'develop' into bin-requested-qty	2020-04-06 15:54:51 +05:30
Saqib Ansari	474222074b	fix: tests	2020-04-06 12:40:41 +05:30
Deepesh Garg	aa775f87b2	fix: Setting to toggle customer and supplier warehouse for inter warehouse transfer (#21142) ... * fix: Setting to toggle customer and supplier warehouse for inter warehouse transfer * fix: Use cint	2020-04-06 10:23:06 +05:30
marination	2a9a5352bb	fix: Test Cases and block expense on outward entry ... - Throw error if rate present against Customer Provided Item in DN and SI - Added test cases for Sales Invoice and Delivery Note - Allow SI and DN with 0 rate in Test	2020-04-03 18:25:21 +05:30
marination	fd04e96bdd	fix: Mapping Customer Provided Material Request to Stock Entry ... - Fixed inability to map Material Request to Stock Entry - Commonified Customer Provided Item validation	2020-04-03 15:46:48 +05:30
Marica	66c4a08703	fix: Update Received Qty in Material Request as per Stock UOM (#21054) ... * fix: Update Received Qty in Material Request as per Stock UOM * fix: Process each PR only once * fix: minor suggested changes Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-04-03 10:07:06 +05:30
Saqib	438e0433a3	fix: cannot set warehouse on deleting all so items and updating them (#21078) ... * fix: cannot set warehouse on deleting all so items and updating them * fix: travis * fix: docname is editable in update items dialog	2020-04-03 10:02:56 +05:30
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