brotherton-erpnext

Author	SHA1	Message	Date
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
Nabin Hait	e7e2e93419	Merge pull request #17183 from netchampfaris/duplicate-variant-check-d fix: Validate variant attributes only if is_new	2019-04-15 10:08:28 +05:30
Faris Ansari	581e5fbfda	fix: Set default value for Packing Unit as 0 The default value 1 assumes Items will be always packed in integer quantities. This is not the usual case.	2019-04-12 12:39:12 +05:30
Mangesh-Khairnar	3ab2a18088	Merge branch 'develop' into so-on-hold	2019-04-11 15:49:06 +05:30
Faris Ansari	6472ed2c1e	Merge pull request #16941 from Mangesh-Khairnar/po-on-hold Feature: Purchase order on hold	2019-04-11 15:36:54 +05:30
Nabin Hait	89206e74d0	fixed merge conflict	2019-04-11 12:31:14 +05:30
Rohit Waghchaure	9665a531fc	fix: item variant test cases	2019-04-11 09:56:00 +05:30
Rohit Waghchaure	f3a9552e48	fix: item variant test cases	2019-04-10 17:57:09 +05:30
Faris Ansari	4da3d0015a	fix: Validate variant attributes only if is_new	2019-04-09 17:40:53 +05:30
Mangesh-Khairnar	16c4fd6733	Merge branch 'develop' of https://github.com/frappe/erpnext into so-on-hold	2019-04-09 12:13:45 +05:30
Mangesh-Khairnar	1934a76cd8	feat: Add status field in multiple reports linked with purchase order and sales order creation (#17107 ) * enhancement: add status field in ordered itemd to be delivered * enhancement: add status field in purchase order itemd to be received * enhancement: add a status column in the billed reports	2019-04-08 16:29:59 +05:30
Nabin Hait	f1698bb2df	fix: unique variant based on	2019-04-08 14:59:43 +05:30
rohitwaghchaure	bc02ee23e0	Merge pull request #17078 from rohitwaghchaure/unlinked_advance_payment_on_cancellation_of_order feat: provision to unlink advance payment entry on cancelation of order	2019-04-06 12:30:05 +05:30
Nabin Hait	843e440191	Merge branch 'hotfix' into validate_stock_transaction_v11	2019-04-05 15:41:26 +05:30
Nabin Hait	9302a19d74	Merge pull request #17135 from hrwX/validate_stock_transaction_v12 fix(Item): check transactions for batch, serial check	2019-04-05 15:40:19 +05:30
Nabin Hait	603dce428b	Merge pull request #17144 from nabinhait/variant-fix fix: Default variant Based on	2019-04-05 15:38:15 +05:30
rohitwaghchaure	e334413b34	Merge pull request #17141 from rohitwaghchaure/incorrect_pos_profile_selected_if fix: incorrect auto POS profile selected in the sales invoice	2019-04-05 13:04:05 +05:30
Mangesh-Khairnar	3d667b4c94	Merge branch 'develop' of https://github.com/frappe/erpnext into po-on-hold	2019-04-05 12:11:26 +05:30
Nabin Hait	a3357e4e86	fix: Default variant Based on	2019-04-05 12:10:36 +05:30
Rohit Waghchaure	e8e3fb175d	fix: incorrect POS profile selected	2019-04-05 09:57:52 +05:30
Rohit Waghchaure	f7a83cb4f5	fix: incorrect POS profile selected	2019-04-05 00:42:48 +05:30
Himanshu Warekar	cdd79e3c40	fix: check transactions for batch, serial check	2019-04-04 15:26:35 +05:30
Himanshu Warekar	7f253b679a	pull from hotfix	2019-04-04 15:19:44 +05:30
Himanshu Warekar	28db545947	fix: check transactions for batch, serial check	2019-04-04 15:02:25 +05:30
Nabin Hait	2df623c693	Merge pull request #17072 from kennethsequeira/auto-re-val fix: spelling in validation message for Auto-reorder	2019-04-04 11:40:08 +05:30
Nabin Hait	1e5664ba5f	Update item.py	2019-04-04 11:39:55 +05:30
Rushabh Mehta	3720e64506	fix(kaizen): warehouse account description	2019-04-04 09:02:41 +05:30
Rushabh Mehta	1f0edabda8	fix(kaizen): warehouse account description	2019-04-04 08:58:34 +05:30
Rohit Waghchaure	5fa9a7a1b4	feat: unlink advance payment entry on cancelation of order	2019-04-01 00:40:38 +05:30
Nabin Hait	da7a193f11	fix(stock): Fixed stock balance and stock ledger report	2019-03-30 15:53:04 +05:30
Kenneth Sequeira	4f5839eb65	fixed spelling in validation message fixed typo in auto-reorder validation message	2019-03-30 15:37:51 +05:30
rohitwaghchaure	725f37cea5	Revert "fix(Delivery Note): Fix issue credit note"	2019-03-30 13:21:50 +05:30
rohitwaghchaure	f3a1fa0bae	Revert "Fix(Delivery Note): Fix issue credit note"	2019-03-30 12:33:54 +05:30
rohitwaghchaure	b6505bddeb	Merge pull request #17025 from hrwX/fix_issue_credit fix(Delivery Note): Fix issue credit note	2019-03-30 12:31:29 +05:30
rohitwaghchaure	5fdbdd50f9	Merge pull request #16950 from hrwX/fix-issue-credit Fix(Delivery Note): Fix issue credit note	2019-03-30 12:31:18 +05:30
Rushabh Mehta	c4599c21c3	fix(test): item variant	2019-03-29 18:30:00 +05:30
Rushabh Mehta	048e5f44b5	fix(test): item variant	2019-03-29 14:34:14 +05:30
Nabin Hait	d4e038b6ca	Merge branch 'hotfix' of https://github.com/frappe/erpnext into develop	2019-03-29 12:41:48 +05:30
Nabin Hait	0a90ce5cf6	Refactored deferred revenue booking logic	2019-03-28 19:43:02 +05:30
Himanshu Warekar	a86f3a7d80	remove issue credit note	2019-03-27 10:01:18 +05:30
rohitwaghchaure	fa638443bc	Merge pull request #16925 from rohitwaghchaure/stock_entry_enhancements feat: stock entry enhancements	2019-03-26 22:50:54 +05:30
Nabin Hait	8aaee57921	fix(uom): Get items as per UOM defined in BOM, fixes #15081	2019-03-26 16:53:13 +05:30
rohitwaghchaure	e196b3120e	Merge pull request #16961 from rohitwaghchaure/stock_ageing_warehouse_wise feat: Stock ageing report warehouse wise	2019-03-26 16:21:17 +05:30
Rohit Waghchaure	5816fc2801	Renamed subcontract to Send to Subcontractor	2019-03-26 12:52:49 +05:30
Rohit Waghchaure	ffbeb02428	renamed purpose in stock entry	2019-03-26 12:52:32 +05:30
Rohit Waghchaure	c7b916ac46	fix: test cases	2019-03-26 12:52:32 +05:30
Rohit Waghchaure	9faed1b433	feat: added button get items from material request in stock entry	2019-03-26 12:52:31 +05:30
Rohit Waghchaure	8ce2d50706	Added test cases	2019-03-26 12:52:31 +05:30
Rohit Waghchaure	186c758087	feat: added good in transit feature in the stock entry	2019-03-26 12:52:31 +05:30
Rohit Waghchaure	1f2f9cf360	feat: added stock entry type master to select purpose in the stock entry	2019-03-26 12:52:31 +05:30
Mangesh-Khairnar	324e06cba0	Merge branch 'develop' of https://github.com/frappe/erpnext into so-on-hold	2019-03-25 18:51:13 +05:30
Mangesh-Khairnar	5e474f4664	fix: add server-side validation for closed sales order for linked material request	2019-03-25 17:28:20 +05:30
Rushabh Mehta	5770ad9e8c	Merge pull request #16963 from itusedyetnew/develop Fix:stock_values_on removed append function on string	2019-03-25 12:03:53 +05:30
Frappe Bot	b07a5d449d	Merge branch 'master' into develop	2019-03-23 07:25:03 +00:00
Nabin Hait	95705412f3	fix(uom): Get items as per UOM defined in BOM, fixes #15081	2019-03-22 13:19:17 +05:30
Rushabh Mehta	7678c7b179	Merge pull request #16869 from rohitwaghchaure/not_able_to_submit_purchase_receipt fix: purchase receipt not able to submit because default inventory account has not selected in another company	2019-03-22 12:47:06 +05:30
Rushabh Mehta	9c43c8f00b	Merge pull request #16554 from SaiFi0102/Brand-Item-Defaults-V12 feat: Brand Item Defaults (v12)	2019-03-22 12:46:04 +05:30
Saurabh	3c95387926	Merge branch 'master' into develop	2019-03-20 14:39:49 +05:30
itusedyetnew	8aafbd22de	stock_values_on append function on string	2019-03-20 11:10:41 +05:30
Rohit Waghchaure	ca9f93cdc2	feat: Stock ageing warehouse wise	2019-03-20 02:14:54 +05:30
Rohit Waghchaure	8bfe330b37	feat: pricing rule enhancements	2019-03-19 12:44:30 +05:30
Faris Ansari	5f8b358fd4	Website: Product Configurator and Bootstrap 4 (#15965 ) - Refactored Homepage with customisable Hero Section - New Homepage Section to add content on Homepage as cards or using Custom HTML - Products page at "/all-products" with customisable filters - Item Configure dialog to find an Item Variant filtered by attribute values - Contact Us dialog on Item page - Customisable Item page content using the Website Content field	2019-03-19 11:48:32 +05:30
Himanshu Warekar	2f5f17fcbb	refactor: fix issue credit note	2019-03-18 21:46:26 +05:30
Mangesh-Khairnar	873c579bb4	fix: check for both hold and closed status in po	2019-03-18 12:14:25 +05:30
Mangesh-Khairnar	a1afd78723	feat: add validation for on hold purchase order	2019-03-18 12:14:25 +05:30
rohitwaghchaure	fd33c55760	Merge pull request #16865 from rohitwaghchaure/purchase_invoice_asset_issue_not_able_to_submit feat: added provision to disable CWIP accounting in asset settings	2019-03-16 12:18:36 +05:30
Rushabh Mehta	957a3307ae	Merge pull request #16634 from Alchez/hotfix-stock-balance-balance fix(stock_balance): Make balance qty and value columns more visible in the Stock Balance report	2019-03-15 09:02:20 +05:30
Rohit Waghchaure	267723f57b	fix: stock ledgre report not working	2019-03-11 14:06:00 +05:30
Rohit Waghchaure	6b33c9b934	fix: purchase receipt not able to submit because default inventory account has not selected in another company	2019-03-08 11:13:35 +05:30
Rohit Waghchaure	821a002125	feat: added provision to disable CWIP accounting in asset settings	2019-03-08 10:51:37 +05:30
Saif Ur Rehman	e62bd893c5	Merge branch 'develop' of https://github.com/frappe/erpnext.git into Brand-Item-Defaults-V12 # Conflicts: # erpnext/stock/doctype/item/test_item.py	2019-03-08 01:29:39 +05:00
Jay Parikh	9757a603fa	Fix Company Default to Total Stock Summary Report	2019-03-06 12:44:41 +00:00
Rohan Bansal	e66f59654e	fix(report): Incorrectdata for balance quantity and value in Stock Balance report	2019-03-06 16:04:11 +05:30
Mangesh-Khairnar	86e650c1ed	feat: validate linked sales order on material request creation	2019-03-02 20:48:04 +05:30
Mangesh-Khairnar	1c276e9828	feat: validate on hold sales order	2019-03-02 20:48:04 +05:30
Frappe Bot	1fcae10258	Merge branch 'master' into develop	2019-02-28 10:20:48 +00:00
Rohit Waghchaure	b48effebce	fix: test case	2019-02-27 19:33:22 +05:30
Rohit Waghchaure	cd34c70670	fix: bom cost update is not working	2019-02-27 18:01:30 +05:30
Saurabh	3dd7ddd838	Merge branch 'master' into develop	2019-02-21 18:25:29 +05:30
Nabin Hait	e08cb3a49b	Merge pull request #16745 from nabinhait/manage-returned-qty fix: Consider returned qty while making invoice from DN / PR	2019-02-21 18:11:37 +05:30
Suraj Shetty	463a3cf8cf	Merge pull request #16725 from deepeshgarg007/item_dashboard fix: Item name display issue fix in item dashboard	2019-02-21 14:42:38 +05:30
Nabin Hait	816a4655a0	fix: Consider returned qty while making invoice from DN / PR	2019-02-21 12:02:36 +05:30
Saurabh	482ebd2c7c	Merge branch 'master' into develop	2019-02-20 18:14:18 +05:30
deepeshgarg007	942c894f93	fix: fetch item name in item dashboard	2019-02-19 19:51:23 +05:30
Rohit Waghchaure	389cd6ad63	fix: stop button not working in material request	2019-02-19 19:18:07 +05:30
Sagar Vora	cc6e51c62d	Merge branch 'master' into develop	2019-02-19 18:09:49 +05:30
Nabin Hait	8e9d947527	Merge branch 'hotfix' into fix-item-variant-settings-barcodes	2019-02-19 15:07:46 +05:30
Nabin Hait	818ead4041	Merge branch 'hotfix' into purchase-qty-fix	2019-02-19 15:06:10 +05:30
deepeshgarg007	de0f59b818	fix: Removed precision from multiple doctypes	2019-02-19 08:40:16 +05:30
deepeshgarg007	9a19e06856	fix: Change Received qty to accepted qty and validation for indicators	2019-02-18 18:42:15 +05:30
Suraj Shetty	cc0222a28a	Remove unwanted barcode field from item	2019-02-16 17:53:23 +05:30
Frappe Bot	74fd5daeb2	Merge branch 'master' into develop	2019-02-15 10:22:33 +00:00
Nabin Hait	b819f104e6	Merge pull request #16653 from nabinhait/item-variants fix: Enqueued item variants updation if there are more than 30 variants	2019-02-15 14:51:14 +05:30
Sagar Vora	921f468950	Merge branch 'hotfix' into get-item-details	2019-02-15 13:03:04 +05:30
Nabin Hait	54f8ed1282	Merge branch 'hotfix' into item-variants	2019-02-14 18:50:11 +05:30
Nabin Hait	0d1ccc357f	fix: get item details	2019-02-14 18:30:10 +05:30
Deepesh Garg	4d1bc0ca85	fix: Add total row in analytics report (#16648 )	2019-02-13 16:58:46 +05:30
Faris Ansari	a748ca69e7	fix: Validate invalid fields in Item Variant Settings - Some fields like barcodes cannot be copied in Item Variants - Wrote a patch that deletes the fields if they exist - Also, validate in controller	2019-02-13 13:02:39 +05:30
rohitwaghchaure	a0aaeafae8	Merge pull request #16644 from rohitwaghchaure/fix_work_order_time_log_msg fix: validation message for work order	2019-02-13 09:49:25 +05:30
Nabin Hait	db527bfb24	fix: Enqueued item variants updation if there are more than 30 variants	2019-02-12 18:30:00 +05:30
Sagar Vora	551f52fd25	Merge branch 'master' into develop	2019-02-12 16:41:24 +05:30
Nabin Hait	fdefbdb23b	Merge pull request #16609 from nabinhait/multipel_fixes Multiple fixes	2019-02-12 13:56:06 +05:30
Rohit Waghchaure	e0412a177c	fix: validation message for work order	2019-02-12 11:47:16 +05:30
Rohan Bansal	d635f722fc	fix(stock_balance): Make balance qty and value columns more visible	2019-02-11 15:22:01 +05:30
rohitwaghchaure	d95c8cfac3	Merge pull request #16621 from netchampfaris/fix-warehouse-currency fix: Set company_currency for Warehouse Tree	2019-02-11 14:58:02 +05:30
Nabin Hait	bb6438af5a	Merge pull request #16537 from nabinhait/stock-balance-fix fix: Fixed error on stock balance report	2019-02-11 11:00:01 +05:30
Faris Ansari	453964728d	fix: Set company_currency for Warehouse Tree	2019-02-09 20:27:42 +05:30
Nabin Hait	17e0513270	fix: message if stock reco is enqueued	2019-02-08 16:56:26 +05:30
Nabin Hait	8d4bb3e327	fix: backflush only if transferred item is present in work order	2019-02-08 16:56:26 +05:30
Nabin Hait	450fe309d6	fix: allow updating title of material request	2019-02-08 16:56:26 +05:30
Aditya Hase	6e1bb60b58	fix(py3): Convert filter to list for indexing	2019-02-07 22:21:05 +05:30
Aditya Hase	e1f867f29f	fix(py3): Explicitly convert to float for comparison	2019-02-07 22:21:05 +05:30
Aditya Hase	691c166a56	fix(py3): Use six.text_type instead of unicode	2019-02-07 20:35:52 +05:30
Sagar Vora	da1dc7fa52	Merge branch 'master' into develop	2019-02-05 18:40:39 +05:30
Saif Ur Rehman	590491779a	Merge branch 'develop' of https://github.com/frappe/erpnext.git into Brand-Item-Defaults-V12 # Conflicts: # erpnext/stock/doctype/item/item.py	2019-02-02 02:49:04 +05:00
Saif Ur Rehman	00aaa48779	test(Item): test_item_defaults	2019-02-02 02:43:44 +05:00
Saif Ur Rehman	1a441b267d	Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12 # Conflicts: # erpnext/patches.txt	2019-02-01 19:17:04 +05:00
Saif Ur Rehman	c8b61007b0	Merge branch 'master' of https://github.com/frappe/erpnext.git into Brand-Item-Defaults # Conflicts: # erpnext/setup/doctype/brand/brand.json # erpnext/stock/get_item_details.py	2019-02-01 17:05:46 +05:00
Nabin Hait	f3f4ce9b87	fix: Fetch data based on item group filter in item dashboard stock balance report	2019-02-01 12:01:19 +05:30
Nabin Hait	9ea19b8fe1	fix: Fixed error on stock balance report	2019-01-31 15:53:25 +05:30
Sagar Vora	f97c5dad82	Merge branch 'staging' into develop	2019-01-29 18:39:14 +05:30
Nabin Hait	cc41b876fb	Merge pull request #16497 from nabinhait/bom_price BOM raw materials price	2019-01-29 14:58:40 +05:30
Nabin Hait	4e45663297	fix(stock): get item price based on party	2019-01-29 14:02:08 +05:30
Nabin Hait	8ba9545b72	Merge pull request #16498 from nabinhait/stock-ledger-report fix(stock): Escaping issue in stock ledger report	2019-01-29 11:30:15 +05:30
Nabin Hait	e8190473f5	Merge branch 'staging-fixes' into unicode	2019-01-29 11:13:04 +05:30
Nabin Hait	1187d61b56	fix(stock): Escaping issue in stock ledger report	2019-01-25 17:07:29 +05:30
Nabin Hait	01ca3e5e36	fix(manufacturing): Get raw materials rate from price list ignoring party	2019-01-25 16:25:15 +05:30
Nabin Hait	fc9e733d7f	Merge pull request #16483 from surajshetty3416/stock-levels-based-on-permission fix: Show stock levels in Item master based on user permissions	2019-01-25 09:48:43 +05:30
Saif Ur Rehman	3d275af67b	Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12 # Conflicts: # erpnext/buying/doctype/supplier/supplier.json # erpnext/patches.txt # erpnext/selling/doctype/customer/customer.json	2019-01-24 23:40:16 +05:00
Suraj Shetty	7a45887fa1	fix typo	2019-01-24 16:26:48 +05:30
Suraj Shetty	dd0496f7aa	Add missed out field field	2019-01-24 16:18:43 +05:30
Suraj Shetty	c165838228	Filter bin list based on warehouses that are accessible to the user	2019-01-24 15:45:46 +05:30
Frappe Bot	e415cce1a9	Merge branch 'staging' into develop	2019-01-23 08:19:00 +00:00
Aditya Hase	55a08dee78	style: Remove unusued local variable	2019-01-23 00:28:02 +05:30
Aditya Hase	f3c22f342c	fix(unicode): Import unicode_literals in every file	2019-01-22 18:36:10 +05:30
Saif Ur Rehman	74a3370095	Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12 # Conflicts: # erpnext/buying/doctype/purchase_order/purchase_order.json # erpnext/patches.txt # erpnext/selling/doctype/quotation/quotation.json # erpnext/selling/doctype/sales_order/sales_order.json	2019-01-22 16:20:40 +05:00
Sagar Vora	4d1a9b10ed	Merge branch 'staging' into develop	2019-01-22 15:56:39 +05:30
Nabin Hait	f0ea152022	Merge pull request #16289 from Anurag810/Quality-inspection-fix fix: validated quality inspection for delivery note(DN) and purchase receipt(PR)	2019-01-22 10:49:55 +05:30
Saif Ur Rehman	398f593e5f	Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12 # Conflicts: # erpnext/patches.txt	2019-01-18 17:33:19 +05:00
Nabin Hait	bace4d3e6d	Merge pull request #16358 from adityahase/naming-series feat(naming): Deferred naming for SLE and GL Entry	2019-01-18 10:55:30 +05:30
Nabin Hait	bef2c22d23	Fix: merge conflict	2019-01-18 10:15:47 +05:30
Nabin Hait	6202d0ed68	fix: NoneType comparison with int error	2019-01-18 09:40:24 +05:30
Nabin Hait	30667c160d	test: Inter company stock transfer for serialised items	2019-01-18 09:36:18 +05:30
Nabin Hait	5a87ac0ad8	fix: Inter company stock transfer for serialised items	2019-01-18 09:36:18 +05:30
Nabin Hait	983d102a19	Merge branch 'staging-fixes' into Quality-inspection-fix	2019-01-16 17:52:30 +05:30
Nabin Hait	3dd5f55412	feat(stock-reco): Fetch items in stock reco based on group warehouse	2019-01-16 16:20:05 +05:30
Nabin Hait	158e7dcd8b	fix(bom-uom_issue)Fetch rate in BOM from Price List based on UOM	2019-01-16 16:00:25 +05:30
Nabin Hait	7686aa9ff6	Merge pull request #16400 from Zlash65/fix-deff fix: for deferred settings for Item	2019-01-16 10:16:00 +05:30
Saurabh	7d630b3e29	Merge branch 'master' into staging-fixes	2019-01-15 19:41:09 +05:30
Zlash65	a3dd798bad	clean if conditions	2019-01-15 16:05:42 +05:30
Zlash65	627be1de51	minor fixes for deferred calculations	2019-01-15 14:16:50 +05:30
Nabin Hait	acd7f73d57	Merge branch 'hotfix' into group_warehouse_stock_reco	2019-01-14 20:25:53 +05:30
Nabin Hait	4ed7cfc515	tests(cost-center-company): Validate cost center's company and revent tests	2019-01-14 17:14:39 +05:30
Fisher Yu	2cd49f51e2	fix issue #16284 , child table copy (#16285 ) * fix issue #16284, child table copy V11 Child table from Clipboard Excel error, can't multiply sequence by non-int of type 'float' * Update get_item_details.py consider the empty string case * Update get_item_details.py	2019-01-11 15:31:33 +05:30
Nabin Hait	0d208851a4	Fix(stock-reco): Fixed codacy issues	2019-01-10 17:56:11 +05:30
Nabin Hait	afbdaa525e	Merge pull request #16365 from hiousi/patch-1 fix: variant can not get its price	2019-01-10 10:36:27 +05:30
Saif Ur Rehman	8d61794540	Merge branch 'Item-Tax-Template' of https://github.com/SaiFi0102/erpnext.git into Item-Tax-Template-V12 # Conflicts: # erpnext/patches.txt # erpnext/stock/doctype/item/item.json	2019-01-10 04:23:40 +05:00
Saif Ur Rehman	edd0e2476f	chore: Updated item.json, no changes	2019-01-10 04:16:10 +05:00
Saif Ur Rehman	2689dea72a	fix: Give higher precedence to set_warehouse in get_item_details while setting item level warehouse	2019-01-09 13:43:06 +05:00
Saif Ur Rehman	eb7277d2d4	Merge branch 'staging-fixes' of https://github.com/frappe/erpnext.git into Item-Tax-Template # Conflicts: # erpnext/patches.txt	2019-01-09 11:25:53 +05:00
Saif Ur Rehman	091cfba5fc	test: Added test for get_item_tax_template and get_item_tax_map	2019-01-09 11:24:30 +05:00
hiousi	9671438435	Update get_item_details.py	2019-01-08 22:23:45 +01:00
hiousi	1516e29609	[fix] variant can not get its price get_price_list_rate() return empty dict before trying to get the item price for a variant.	2019-01-08 18:34:08 +01:00
Saurabh	afec3ca89a	Merge branch 'staging' into develop	2019-01-08 17:09:36 +05:30
rohitwaghchaure	ffdadbf97f	fix: fallback to stock uom if uom is not defined (#16329 ) * [minor] Code cleanup * fix: remove 'or' condition, won't execute	2019-01-08 16:21:25 +05:30
Saif Ur Rehman	380b4b0926	Merge branch 'staging-fixes' of https://github.com/frappe/erpnext.git into Item-Tax-Template # Conflicts: # erpnext/accounts/doctype/accounts_settings/accounts_settings.json # erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json # erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json # erpnext/accounts/doctype/sales_invoice/sales_invoice.json # erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json # erpnext/buying/doctype/purchase_order/purchase_order.json # erpnext/buying/doctype/purchase_order_item/purchase_order_item.json # erpnext/buying/doctype/supplier/supplier.json # erpnext/buying/doctype/supplier_quotation/supplier_quotation.json # erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json # erpnext/selling/doctype/quotation/quotation.json # erpnext/selling/doctype/quotation_item/quotation_item.json # erpnext/selling/doctype/sales_order/sales_order.json # erpnext/selling/doctype/sales_order_item/sales_order_item.json # erpnext/setup/doctype/item_group/item_group.json # erpnext/stock/doctype/delivery_note/delivery_note.json # erpnext/stock/doctype/delivery_note_item/delivery_note_item.json # erpnext/stock/doctype/item/item.json # erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json	2019-01-08 13:41:46 +05:00
Nabin Hait	4c08aaef3d	Merge pull request #16290 from deepeshgarg007/stock-recon fix: Unorderable type error while making stock reconciliation entry	2019-01-08 11:55:49 +05:30
Aditya Hase	0c16424d7d	fix(naming): Use creation instead of name to order SLEs	2019-01-08 00:09:36 +05:30
Aditya Hase	7bc692d48d	feat(naming): Deferred naming for Stock Ledger Entry and GL Entry For fast lockless insertions use hash as autonaming method for temporarily naming Stock Ledger Entry and GL Entry In an hourly run scheduled job rename these entries using autoname options	2019-01-08 00:07:54 +05:30
Saif	e5091cbc0f	chore: Updated DocType JSON Files to Clean Up Git Diff of Other PRs (#16356 ) * chore: Updated DocType json files to clean up git diff of other PRs * fix: remove auto-generated file	2019-01-07 18:19:30 +05:30
Saif Ur Rehman	7ea6554f1f	Merge branch 'staging' of https://github.com/frappe/erpnext.git into Item-Tax-Template # Conflicts: # erpnext/selling/doctype/quotation_item/quotation_item.json # erpnext/stock/doctype/item/item.json	2019-01-06 04:43:13 +05:00
Saif Ur Rehman	b1288b75ba	fix: Test Records	2019-01-06 04:41:13 +05:00
Nabin Hait	47c9826b6f	test(reco-warehouse): Get items for group warehouse	2019-01-03 15:24:59 +05:30
Saif Ur Rehman	648bd15b2a	Force item_tax_rate on setting item details server-side	2019-01-03 04:03:54 +05:00
deepeshgarg007	9c0c633259	fix: Added validation for stock reconciliation in stock ledger entry	2019-01-02 11:31:55 +05:30
deepeshgarg007	9eb99dc61e	Merge branch 'staging-fixes' of https://github.com/frappe/erpnext into stock-recon	2019-01-01 18:40:24 +05:30
Saif Ur Rehman	eeead1d777	fix: Only load transaction's company's tax accounts in item tax map	2018-12-29 02:25:00 +05:00
Anurag Mishra	0c8411d085	test cases sucess	2018-12-28 16:53:00 +05:30
Nabin Hait	fcbe410c2f	feat(stock-reco): Fetch items based on group warehouse	2018-12-28 16:31:05 +05:30
Saif Ur Rehman	1ea98cbbe1	fix: missing line due to conflict resolution	2018-12-28 00:29:43 +05:00
Saif Ur Rehman	7d9ee83d5a	-Fix for updated get_default_cost_center -Back to not updating item's defaults child table	2018-12-27 23:10:19 +05:00
Saif Ur Rehman	127b3f552b	At least add a row for old logic to work properly	2018-12-27 23:03:17 +05:00
Saif Ur Rehman	c819ea38a0	-Added Item Default child table for Brand -Item Default Precedence: Get defaults from Item Group, if no default, fetch from Brand -Remove auto set Item's Item Defaults from Item Group: Item Default should be manually entered to override both Item Group and Brand defaults	2018-12-27 23:01:54 +05:00
Suraj Shetty	3de12db2b1	Merge branch 'develop' of github.com:frappe/erpnext into general-ui-fixes	2018-12-27 09:05:25 +05:30
Saif Ur Rehman	677866824a	More work on Tax Category and Item Tax Template	2018-12-27 02:11:07 +05:00
Frappe Bot	9e09b3adbe	Merge branch 'staging' into develop	2018-12-26 12:16:20 +00:00
deepeshgarg007	22e05b24f3	Fix for NoneType comparison with int error	2018-12-26 17:16:34 +05:30
Frappe Bot	e8c2fdfb8c	Merge branch 'master' into staging-fixes	2018-12-26 11:44:09 +00:00
rohitwaghchaure	53a38e8edc	Merge pull request #16257 from surajshetty3416/permission-fixes Fix user permission checks	2018-12-26 14:49:01 +05:30
Suraj Shetty	b763893f22	Fix quotes issue in item.js	2018-12-24 19:43:31 +05:30
Suraj Shetty	67b311e95e	Make -> Create	2018-12-24 16:16:13 +05:30
Suraj Shetty	146be9f6a6	Merge branch 'develop' of github.com:frappe/erpnext into general-ui-fixes	2018-12-24 16:08:43 +05:30
rohitwaghchaure	7ec5e80b70	[Fix] While making sales invoice from delivery note, system not remove the returned qty (#16141 )	2018-12-24 14:55:31 +05:30
Nabin Hait	5a9579bae4	feat(quality): Check quality status before receipt/delivery (#16169 )	2018-12-24 14:54:42 +05:30
Valmik	78bc405eeb	fix: set fieldname for frappe prompt (#16198 )	2018-12-24 14:54:06 +05:30
KanchanChauhan	1790a6faaa	Set ignore_user_permission 1 for Company field in Item Default (#16167 )	2018-12-24 14:48:09 +05:30
Rohan	349040db6d	fix(work_order): Set operations for Work Order when created from MREQ (#16154 )	2018-12-24 14:42:34 +05:30
rohitwaghchaure	4265c5a772	Rename BOM and Work order fields (#16209 ) * Rename BOM and Work order fields * Rearranged BOM fields	2018-12-24 14:38:49 +05:30
rohitwaghchaure	1c1798c7f2	[Fix] Warehouse wise item balance age and value report not working (#16258 )	2018-12-24 14:19:27 +05:30
Suraj Shetty	83e3c4c0fa	Fix quote error	2018-12-24 11:11:04 +05:30
Suraj Shetty	b2965001d1	Replace 'Make' with 'Create'	2018-12-23 13:25:58 +05:30
Saif Ur Rehman	8ac261750b	Add and Modified DocTypes for Item Tax Template	2018-12-22 02:51:59 +05:00
Frappe Bot	1b7c583c48	Merge branch 'staging' into develop	2018-12-21 05:46:23 +00:00
Suraj Shetty	7ed37ae6c3	Commonify code - use get_permitted_documents function to avoid code redundancy	2018-12-19 19:56:42 +05:30
Suraj Shetty	7ae2d59ffd	Merge branch 'staging-fixes' into permission-fixes	2018-12-18 15:41:03 +05:30
Suraj Shetty	a8d9bfdcfd	Fix: currency symbol issue in delivery note list (#16233 )	2018-12-18 14:53:17 +05:30
rohitwaghchaure	37d7d25018	Merge pull request #16207 from Zlash65/fix-qi [Minor] Make Quality Inspection in query configurable	2018-12-17 13:55:26 +05:30
Nabin Hait	22a1e281a9	fix(variant): Show attribute values on single variant creation (#16204 )	2018-12-14 14:22:45 +05:30
Zlash65	9fde660aaf	make quality inspection in query configurable	2018-12-13 13:28:01 +05:30
Frappe Bot	8e1326f22f	Merge branch 'staging' into develop	2018-12-10 16:05:45 +00:00
Rohan	c1eb94d37f	Revert "fix(delivery): update package total on validate (#16131 )" This reverts commit `f43433b43d`.	2018-12-10 20:27:14 +05:30
Suraj Shetty	07e5786e1b	Fix user permission checks	2018-12-10 19:10:18 +05:30
Frappe Bot	5b50b2848d	Merge branch 'staging' into develop	2018-12-10 13:08:33 +00:00
Rohan	f43433b43d	fix(delivery): update package total on validate (#16131 )	2018-12-10 17:47:31 +05:30
RicardoJohann	bc0ef0beca	Add Serial Number button in Delivery Note and Sales Invoice's Packing List (#16080 )	2018-12-10 17:43:03 +05:30
Nabin Hait	2bd6ab9fba	Merge pull request #16140 from KanchanChauhan/staging-fixes [Minor]Method path fix in Material Request js	2018-12-07 15:08:44 +05:30
Frappe Bot	7c2a5bddb1	Merge branch 'staging' into develop	2018-12-06 09:50:25 +00:00
Frappe Bot	ee5d7e6d0f	Merge branch 'master' into staging-fixes	2018-12-06 09:26:42 +00:00
deepeshgarg007	114cc810a0	List view currency bug fix	2018-12-03 15:13:06 +05:30
Kanchan Chauhan	9dc85153e0	[Minor]Method path fix in Material Request js	2018-12-03 14:39:43 +05:30
Nabin Hait	3ecb995485	Merge pull request #16006 from gbm001/gbm001-item-barcodes-pull fix/feat: Allow extension of barcode types (without validation)	2018-12-03 14:39:14 +05:30
Nabin Hait	0b4ea25f83	Merge pull request #16138 from rohitwaghchaure/user_permissions_issue_item [Fix] Permissions issue while making item variants	2018-12-03 14:32:40 +05:30
Rohit Waghchaure	a8003c1af7	[Fix] Permissions issue while making item variants	2018-12-03 11:49:52 +05:30
deepeshgarg007	4c79274054	Fixed patch and deprecated grid reports	2018-11-30 18:01:22 +05:30
Rohit Waghchaure	16b8ecbe05	[Fix] Stock value difference calculation for stock reconciliation	2018-11-30 16:20:52 +05:30
deepeshgarg007	94a3539015	Row check fix in stock analytics	2018-11-30 16:20:48 +05:30
deepeshgarg007	9ed13f4a90	Merge branch 'staging-fixes' of https://github.com/frappe/erpnext into analytics-fix	2018-11-29 12:52:44 +05:30
deepeshgarg007	1a1c013b2a	Analytics report bug fixes and code cleaning	2018-11-29 08:34:47 +05:30
Ameya Shenoy	fe1f532bc0	Merge branch 'staging' into develop	2018-11-28 08:28:37 +00:00
Ameya Shenoy	2806d83362	Merge branch 'master' into staging-fixes	2018-11-28 08:12:48 +00:00
Nabin Hait	dfd79b0349	Merge branch 'staging-fixes' into gbm001-item-barcodes-pull	2018-11-27 14:19:20 +05:30
Nabin Hait	b98d08a2cb	Merge pull request #16049 from rohitwaghchaure/incorrect_stock_value_difference_calculation [Fix] Incorrect stock value difference because of negative stock	2018-11-27 13:21:43 +05:30
Nabin Hait	5f7b37ee11	Merge pull request #16093 from rohitwaghchaure/manufacturing_settings_permissions_issue [Fix] No permission for Manufacturing Settings	2018-11-27 13:07:44 +05:30
Nabin Hait	15951e6e93	Merge branch 'staging-fixes' into gbm001-item-barcodes-pull	2018-11-26 20:25:29 +05:30
Nabin Hait	c5064069c7	Merge branch 'staging-fixes' into manufacturing_settings_permissions_issue	2018-11-26 20:23:11 +05:30
deepeshgarg007	05c2989698	removed total from graph	2018-11-26 20:19:57 +05:30
Nabin Hait	b32abde2ac	Merge branch 'staging-fixes' into bug-fixes	2018-11-26 20:05:09 +05:30
Nabin Hait	56dc5c1be3	Merge branch 'staging-fixes' into pos-profile-fix	2018-11-26 19:59:07 +05:30
Rohit Waghchaure	15ed7a6351	[Fix] No permission for Manufacturing Settings	2018-11-26 17:31:18 +05:30
Rohit Waghchaure	3893ba302c	If is pos and no pos profile use the item's default warehouse for packing materials	2018-11-26 14:13:24 +05:30
Nabin Hait	2508d11097	fix(test): Test cases fixed	2018-11-26 11:05:28 +05:30
Rohit Waghchaure	6424f47f3b	[Fix] Incorrect stock value difference because of negative stock	2018-11-21 23:18:41 +05:30
Suraj Shetty	1eb098caf9	Add additional condition condition to get_pos_profile - If we have any POS Profile related to the user, that profile should be used	2018-11-21 14:36:58 +05:30
Andrew McLeod	f99a68a695	feat: Added unit testing for Item Barcodes in item.py Adds three different barcodes and barcodes types to a test item and checks that they are added correctly. Adds a barcode that already exists, and checks a DuplicateEntryError is raised. Adds an invalid EAN barcode and checks InvalidBarcode (a subclass of ValidationError) is raised.	2018-11-16 13:55:55 +00:00
Andrew McLeod	5607762c0f	fix/feat: Allow extension of barcode types (without validation) Currently, it is difficult to add new custom barcode types for two reasons, both of which relate to validate_barcode in item.py: - There is a bug where barcode types with a space in, such as Code 128, are split in two (so barcode_type is checked against 'Code' and '128' rather than 'Code 128'). This is fixed by splitting the Options field against a newline, instead of spaces. - All barcodes are validated against the stdnum.ean library. This only handles EAN-8, EAN-13 and UPC-12 barcodes and any other barcode will fail. Barcodes with no type will continue to not be checked. Barcodes with the default barcode_types of EAN, UPC will continue to be checked. The non-default barcode_types of EAN-13 and EAN-8 will also be checked. The barcode_type is cast to upper case before this check is made so ean, upc, ean-13 and ean-8 will also be validated. This allows people to add their own barcode types, such as Code 128 and QR codes. Users can add custom validation of these barcodes using the usual hooks, but they cannot remove the standard validation.	2018-11-16 11:08:39 +00:00
Frappe Bot	eb4969d24f	Merge branch 'staging' into develop	2018-11-15 09:26:03 +00:00
deepeshgarg007	4c366eed23	Minor issue fixes	2018-11-15 12:02:07 +05:30
Deepesh Garg	3b8c84fa75	Merge pull request #15975 from nabinhait/staging-fixes fix(test): Fixed item discount amount calculation and test cases related to pricing rule	2018-11-15 12:01:09 +05:30
Frappe Bot	b5c7b96a73	Merge branch 'staging' into develop	2018-11-13 11:33:31 +00:00
Nabin Hait	7fe4124bb8	fix(field property): Made barcode field non-mandatory in item	2018-11-13 16:48:59 +05:30
Frappe Bot	88c88d6e7c	Merge branch 'master' into staging-fixes	2018-11-13 10:59:05 +00:00
Saif	60ec88bcc8	Added Default Warehouse field that sets all item's warehouse (#15462 ) * -Added field def_warehouse that sets warehouse of all items -Grouped warehouse fields together and put raw materies supplied before items table, it will only show if there are any items supplied * Set def_warehouse in test_sales_order.py * Changed from def_warehouse to set_warehouse * Rest of def_warehouse to set_warehouse	2018-11-13 12:37:53 +05:30
Alchez	ce3340903d	Update Delivery Trip status based on visited stops (#15723 ) * feat(delivery_trip_status): Update Delivery Trip status based on visited stops * feat(delivery_trip_status): Fix tests * feat(delivery_trip_status): Fix allow on submit for status * feat(delivery_trip_status): Change status mapping * feat(delivery_trip_status): Fix patch * Update update_delivery_trip_status.py	2018-11-13 12:22:17 +05:30
Alchez	9f87c441b0	feat(delivery_trip): Create a Delivery Trip by selecting multiple Delivery Notes in list view (#15706 )	2018-11-13 12:20:05 +05:30
khushalti	fad08e1bcb	[fix] - GL entry not creating on PR if rejected qty mentoned (#15815 )	2018-11-13 12:09:32 +05:30
Doridel Cahanap	2b14d6a058	Contract Manufacturing : Customer Provided Items (#15828 ) * Material Request from Production Plan for Customer provided parts * Test cases * Customer web portal for their material requests	2018-11-13 12:07:16 +05:30
Zarrar	6922415d1b	[New Feature]Scan Item Barcode label to quick create/update records in items child table (#15731 ) * Update transaction.js * setup barcode scan stock entry controller not inherited from transaction.js, need to call setup barcode scan from transaction.js * fix bug of item_code change always reset qty to 0 when calling frappe.model.set_value(dt,dn,'item_code',xxx), even qty is set, system always reset qty to 0. * Update transaction.js * Update transaction.js * Update transaction.js * Update transaction.js * Update transaction.js * Update transaction.js * clean up barcode logic for transactions * call scan_barcode method for stock entry * separate out logic for searching serial, batch or barcode number * added scan barcode field in transactions doctype * search barcode-serial-batch sequence, code rectify * hide all barcode related field if disabled from settings * remove print statement * Update stock_entry.py	2018-11-13 11:11:32 +05:30
Deepesh Garg	84483ff776	Stock analytics script report (#15630 ) * Stock analytics script report * Codacy Issue Fixes * Codacy Issue Fixes * Removed Trailing Whitespaces * Code cleaning and optimization * Minor Changes * Code cleaning and spacing * Added link for stock analytics in stock.py * Refactoring and code cleaning * Codacy issue fixes	2018-11-12 17:05:31 +05:30
Frappe Bot	1ff9c691b7	Merge branch 'staging' into develop	2018-11-09 10:21:07 +00:00
Alchez	068ba191e7	[Feature] Route optimization for Delivery Trip stops (#15566 ) * Minor improvements * [Feature] Route optimization for Delivery Trip stops * Process and optimize the entire route, with or without locks * Form sets of routes for optimization based on applied lock positions * Re-arrange stops based on the optimized routes and lock positions * Set delay times between stops - offset estimation times by delays cumulatively * Fix codacy errors * Fix travis * feat(route_optimization): Set estimated route distance from Google Maps * feat(route_optimization): Add tests for route lists * feat(route_optimization): Fix tests	2018-11-08 11:57:05 +05:30
Ameya Shenoy	ea42980de6	Merge branch 'staging' into develop	2018-11-06 11:17:24 +00:00
Ameya Shenoy	65797bca64	Merge branch 'master' into staging-fixes	2018-11-06 11:02:08 +00:00
Nabin Hait	3e6663d47e	fix(serial no): Set supplier info based on pur invoice if serial no is created from Purchase Invoice (#15820 )	2018-11-05 14:01:59 +05:30
Ameya Shenoy	f3f997f232	Merge branch 'staging' into develop	2018-10-31 13:51:52 +00:00
Ameya Shenoy	961849beb4	Merge branch 'master' into staging-fixes	2018-10-31 13:43:12 +00:00
rohitwaghchaure	cd11bdfdbb	[Fix] Supplier wise sales analytics report not showing item details which is added in purchase invoice with update stock (#15869 )	2018-10-31 18:02:00 +05:30
Ameya Shenoy	7658bdc00a	Merge branch 'staging' into develop	2018-10-23 08:06:15 +00:00
Ranjith Kurungadam	ac6e3a69f9	fix: Serial No- allow editing SO, track changes (#15741 )	2018-10-22 12:06:54 +05:30
Ameya Shenoy	c1231d65fd	Merge branch 'staging' into develop	2018-10-19 13:27:07 +00:00
Nabin Hait	5d1171678e	fix(perpetual inventory): Get warehouse account map only if perpetual inventory enabled (#15743 ) * fix(perpetual inventory): Get warehouse account map only if perpetual inventory enabled * fix(perpetual inventory): Get warehouse account map only if perpetual inventory enabled	2018-10-19 18:03:13 +05:30
Saif	b4cf72c770	Adding "Include UOM" in Reports with Qty and Rates (#15541 ) * Added Include UOM field for Stock Balane, Stock Ledger and Stock Projected Qty * Add columns in result list-of-lists instead of converting reports to list-of-dicts * For requested changes -Merged conversion factor query with item detail queries -Ensuring snail_case -Made columns consistently list-of-dicts	2018-10-18 17:59:47 +05:30
Ameya Shenoy	d1c467bcf5	Merge branch 'staging' into develop	2018-10-17 09:44:39 +00:00
Ameya Shenoy	77b60928bf	Merge branch 'master' into staging-fixes	2018-10-17 09:39:31 +00:00
Ameya Shenoy	4fdbff7456	Merge pull request #15547 from Zlash65/demo-refactor Demo data refactor	2018-10-16 17:34:09 +05:30
Shreya Shah	8e71074e1c	fix(report): Add column for Item Name (#15702 )	2018-10-16 14:36:49 +05:30
Shreya Shah	e45868a3c6	fix(discount-amount): Print hide discount_amount if print without amount (#15705 )	2018-10-16 14:34:56 +05:30
Shreya Shah	ff0deedca9	fix(discount-amount): Print hide discount_amount if print without amount (#15704 )	2018-10-16 14:34:30 +05:30
Shreya Shah	bfb88f7839	Merge pull request #15701 from shreyashah115/item-stock Add column for Item Name in Item Price Stock report	2018-10-16 14:22:46 +05:30
Shreya	82660913a5	fix(report): Add column for Item Name	2018-10-16 12:15:56 +05:30
Ameya Shenoy	606c504f28	Merge branch 'staging' into develop	2018-10-15 12:25:03 +00:00
Chinmay Pai	905c0ff978	File api (#15637 ) * file-api: major refactor migrate from file_manager.py to file.py Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com> * file-api: migrate to file-api remove file_manager stuff and migrate to file-api Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>	2018-10-15 10:38:53 +05:30
Alchez	a16f0f4423	fix(item_defaults): handle multiple item defaults for a company (#15634 )	2018-10-11 16:56:46 +05:30
Ameya Shenoy	f90af80344	Merge branch 'staging' into develop	2018-10-11 06:58:53 +00:00
Sagar Vora	d92f3ac480	Fix 'transporter info' section in Delivery Note (#15565 ) - create is_transporter checkbox in supplier doctype - new field transporter (supplier with is_transporter checked) - created fields driver and driver_name - removed GST India fields from core doctype - removed readonly & allow_on_submit from fields (delivery trip applicable only for in-house delivery) - read_only transporter_name field (kept for backwards compatibility) - made necessary changes in delivery_trip implementation - hidden section's fields from print (preserving v10 convention) - added transporter field to 'Driver' doctype - added queries for transporter and driver fields - GST India fields in regional module - Fix e-waybill report	2018-10-10 14:51:26 +05:30
Zlash65	0309bbee30	function call requires company as parameter	2018-10-10 14:28:16 +05:30
Shreya Shah	8a4bcefec4	fix(accounts-receivable): Column values in Print and PDF (#15621 )	2018-10-08 18:34:01 +05:30
Nabin Hait	d2c5b50842	fix(warehouse-account): get warehouse account map fallback handling (#15625 ) * fix(warehouse-account): get warehouse account map fallback handling * fix: import issue	2018-10-08 18:19:53 +05:30
Ameya Shenoy	de5206ff43	Merge branch 'staging' into develop	2018-10-08 07:28:24 +00:00
rohitwaghchaure	5e466bace4	Removed update_job_card_reference method (#15614 )	2018-10-08 12:36:45 +05:30
Ameya Shenoy	1d5dc73dfd	Merge branch 'staging' into develop	2018-10-05 09:10:30 +00:00
Shreya Shah	32206029ac	Fix Codacy	2018-10-05 14:14:33 +05:30
Zlash65	2123b97d31	add get_query for revenue and expense account	2018-10-05 12:26:32 +05:30
Saif	00a16a9337	set_item_default was referencing a variable company of "company" (#15576 )	2018-10-05 11:54:03 +05:30
Valmik	4c61861163	Add Delivery Trip to Delivery Note dashboard (#15587 )	2018-10-05 11:36:31 +05:30
Ameya Shenoy	da10f6ebd8	Merge branch 'staging' into develop	2018-10-04 11:51:30 +00:00
Rohit Waghchaure	18678696db	Fix issue after merging hotfix into staging-fixes	2018-10-04 16:33:43 +05:30
Ameya Shenoy	7d929c508f	Merge branch 'master' into staging-fixes	2018-10-04 09:25:07 +00:00
deepeshgarg007	719701f2a4	Enhancement in Budget Variance and other reports (#15455 ) * Enhanced Budget Variance report and added filters and columns in other reports * Update budget_variance_report.js * Changes in budget variance report * Spacing in column names	2018-10-02 12:52:13 +05:30
Zlash65	6a5e6ed2ff	delivery trip notification to customer fix	2018-10-01 17:28:42 +05:30
Zlash65	9e67b8ec4d	fix driver name selection	2018-10-01 17:27:12 +05:30
Zlash65	622bd10946	add date data [mandatory]	2018-10-01 15:37:31 +05:30
Alchez	6ecb2556b7	Add Delivery Settings + improve 'Notify Customers' functionality (#15322 ) * Add Delivery Settings + improve 'Notify Customers' functionality * Minor improvements * Add patch to create a default dispatch notification template * Fix travis errors	2018-09-30 21:38:47 +05:30
Neil Trini Lasrado	55a53e0bec	Added ability to have a default return warehouse for Sales Returns (#15491 )	2018-09-30 21:22:50 +05:30
Saif	83c89346c3	set_item_default was referencing a variable company of "company" (#15534 )	2018-09-30 21:12:25 +05:30
Suraj Shetty	4b404c4f1e	Avoid multiple escapes (#15509 )	2018-09-27 15:39:34 +05:30
Nabin Hait	7d6d678e8d	purchase receipt return entry in dashboard	2018-09-26 19:04:11 +05:30
Nabin Hait	183972f58f	fix(stock_entry): allow creating stock entry against work order even if item rate is zero	2018-09-26 18:34:07 +05:30
Nabin Hait	1e7c32b909	Payroll fixes and more (#15475 ) * fix(payroll): multiple minor fixes related to salary structure * Added GSTR-1 and GSTR-2 report in Accounts module page * delete asset movement records on cancellation of Purchase Receipt * Update consolidated_financial_statement.py * minor fix * minor fix * add filters on item prices report (#15495)	2018-09-26 18:01:00 +05:30
RicardoJohann	171c7d4128	add filters on item prices report (#15495 )	2018-09-26 15:58:06 +05:30
Ameya Shenoy	430c3c88ff	Merge branch 'staging' into develop	2018-09-26 07:32:45 +00:00
Ameya Shenoy	9d3a97fd15	Merge branch 'master' into staging-fixes	2018-09-26 07:28:53 +00:00
rohitwaghchaure	fe1e4a41e6	Validate negative stock serial number (#15492 )	2018-09-25 18:36:32 +05:30
Ameya Shenoy	63ebeb432c	Merge branch 'staging' into develop	2018-09-21 11:04:20 +00:00
Zarrar	e83ff38c10	[Enhance] Deferred Expense (#15437 ) * added section for deferred expense in item master * added default expense account field in Company master * added deferred expense section in purchase invoice item * validation and getter code added * scheduler event to book expense every month * codacy, import fix and other minor fixes * rectify debit credit logic for expense * commonify js code for deferred expense and revenue * remove deferred calculation and validation * common file to calculate deferred revenue and expense * codacy fixes * expense account root_type - Asset, specific method naming	2018-09-21 15:45:40 +05:30
Suraj Shetty	bfc195dd8b	Changes to support refactor in frappe pg-poc branch (#15287 ) * Remove quotes from sql to make it compatible with postgres as well * Fix queries - Replace mysql specifc queries with standard ones * Make repo URL chages to test pg-poc * Add root passowrd to test site config * Fix quotes issue * Remove debug flag from a pricing rule query * Remove python 3.6 version from travis.yml * Fix improper query issue * Fix incorrect query * Fix a query - This fix need to be changed when we will start supporting postgres since date_format is not supported by postgres * Get price list map as dict * Convert price_list_currency_map to dict	2018-09-21 10:20:52 +05:30
Ameya Shenoy	a2f0b34147	fix(item, item default): changed the modified date (#15442 ) The patch move_item_defaults_to_child_table_for_multicompany used to fail since the doctypes Item and Item Defaults weren't reloaded properly Signed-off-by: Ameya Shenoy <shenoy.ameya@gmail.com>	2018-09-19 19:02:52 +05:30
Faris Ansari	2ab6e0e39b	fix(translations): Replace translations by keyword with indexed version (#15426 ) * fix(translations): Replace translations by keyword with indexed version Keywords in the translation also gets translated which results in an error because python cannot find the key * Update buying_controller.py	2018-09-19 13:13:59 +05:30
Doridel Cahanap	6d0ae5b23b	Allow Rename for Custom Tariff (#15389 )	2018-09-12 17:13:12 +05:30
Nabin Hait	9fde97cdd2	Fixed merge conflict	2018-09-12 15:45:20 +05:30
Saurabh	393dd4286a	[resolved] merge-conflicts	2018-09-12 14:48:30 +05:30
Zarrar	ce6a09ca54	[Staging] Stock Reconciliation (#15382 ) * optimize query and some fixes * add get_query to filter warehouses based on company * minor changes	2018-09-12 10:54:18 +05:30
Nabin Hait	13beb3a008	fix(test): test cases fixed	2018-09-11 19:37:08 +05:30
Sagar Vora	508189eaea	Use default conversion factor if not found in Item (#15369 )	2018-09-11 17:22:25 +05:30
Nabin Hait	84ddbc0ac9	fix(test): test cases fixed	2018-09-11 17:11:39 +05:30
Nabin Hait	2236f0aef0	fix(test): multiple test cases fixed	2018-09-11 16:50:46 +05:30
Nagarajan	8be8345b65	Stock Projected Qty Item Group Filter (#15340 ) * Update stock_projected_qty.js * Update stock_projected_qty.js * Update stock_projected_qty.py * Update stock_projected_qty.js	2018-09-07 16:20:18 +05:30
rohitwaghchaure	bd4348db10	[Enhance] Add additional cost of the manufacture stock entry in the project costing (#15341 )	2018-09-07 16:16:23 +05:30
Nabin Hait	b479a87031	fix(report): Cost center filters in financial statements and general ledger	2018-09-07 13:17:23 +05:30
rohitwaghchaure	32dc3bf082	[Enhance] Job Card (#15244 ) * [Enhance] Added job card against the work order * removed work order from timesheet * Fixed codacy * Added patch to make job card from the timesheet * Timer in job card * Dates validation in job card * Added button to make job card from work order * Added sub-assembly operation in the work order	2018-09-06 19:21:48 +05:30
Neil Trini Lasrado	6f77abe0dd	Added ability to create a Return Sales Invoice/ Credit Note against a delivery note of type return (#15266 ) * Remove make subscription button on delivery note if it is of type returns * Added 'issue_credit_note' checkbox on delivery note to pass a Sales Inv of type return if checked while creating a return delivery note * Added logic to auto-create Return Sales Invoice/ Credit Note if issue_credit_note checkbox is checked while return delivey note is submited * Update delivery_note.py	2018-09-06 19:17:47 +05:30
Alchez	4b290e5561	Map details from Delivery Trip back to Delivery Note (#15261 ) * Map details from Delivery Trip back to Delivery Note * Add pop-up to indicate changed Delivery Notes	2018-09-06 19:08:19 +05:30
Alchez	f2fe0b2194	Keep Delivery Trip stops unique based on their Delivery Notes (#15264 ) * Keep Delivery Trip stops unique based on their Delivery Notes * Pull single row when making a Trip from Delivery Note	2018-09-06 19:05:09 +05:30
Alchez	e52ae4eacb	[Fix] 'To Bill' status even if the amount is zero (#14784 ) * Fix 'To Bill' status even if the invoice amount is zero * Modify fix to only apply on Delivery Note documents	2018-09-06 18:27:06 +05:30
Faris Ansari	b892cc8b02	fix(item): Remove Hub Category field (#15331 )	2018-09-06 18:02:48 +05:30
Nabin Hait	a2a6568b7e	fix(reports): Made gstr1 ready for govt portal	2018-09-06 17:44:31 +05:30
Sanjay Kumar	1b49f3a4e7	Allow cost center in entry of balance sheet accounts (#14972 ) * Allow Cost Center In Entry of Balance Sheet Account * Add parent cost center in get payment entry * Add Tests for Allow Cost Center In Entry of Balance Sheet Account * Add tests for cost center wise account and party balance * set parent cost center in taxes * 1. Remove copy parent cost_center to child 2. Improve update party and account balance functionality on cost_center change 3. Add cost_center filter to get_outstanding_documents * fix Codacy and Travis issue	2018-09-06 14:39:35 +05:30
johnhkelley1	431b4fba72	Allow for 0 valuation rate in Stock Reconciliation (#15313 ) Currently, a valuation rate of 0 gets treated the same as an omitted valuation rate, and gets overwritten during validation. This hotfix allows a Stock Reconciliation Item's valuation rate to be set to 0.	2018-09-05 11:43:28 +05:30
rohitwaghchaure	bcaca85873	[Fix] Meta object has no attribute permissions (#15316 )	2018-09-05 11:10:17 +05:30
Valmik	2175b90b8d	Added feature to optimize routes, also cleaned up code (#15193 )	2018-08-31 16:39:29 +05:30
Nabin Hait	b259e3eb06	Merge branch 'defer-stop-date' of https://github.com/Zlash65/erpnext into Zlash65-defer-stop-date	2018-08-31 12:39:46 +05:30
Saurabh	5c3590fa8d	Merge branch 'master' into develop	2018-08-31 11:29:14 +05:30
Shreya Shah	ee8f8281b4	[py3] Convert filter object to list (#15260 )	2018-08-30 19:22:22 +05:30
rohitwaghchaure	624927bf0b	[Fix] Not able to export the Supplier-Wise Sales Analytics report (#15271 )	2018-08-30 19:19:14 +05:30
KanchanChauhan	0cd5313c69	Validate Completed Qty and Produced qty in Stock Entry for Manufacture (#15248 )	2018-08-30 19:11:15 +05:30
Nabin Hait	9983d41fb0	Fixed divison error	2018-08-30 19:10:36 +05:30
Rushabh Mehta	49f9747385	major(manufacturing): fixes to ux, material requests to purchase order based on default supplier etc (#15267 ) * major(manufacturing): fixes to ux, material requests to purchase order based on default supplier etc * fix: remove debug	2018-08-30 18:50:48 +05:30
Prateeksha Singh	5797565dd0	Merge with upstream	2018-08-30 16:15:27 +05:30
Zlash65	80f5cb05cc	fixes in setting end_date and manual provision of start&end date	2018-08-30 10:39:48 +05:30
Zlash65	4ce8c7f383	end date should reset if start date is changed	2018-08-30 10:39:48 +05:30
Rushabh Mehta	13bcc4e27e	perms: fix default import, export perms	2018-08-29 17:10:27 +05:30
Nabin Hait	a804d6d487	Fixed merge conflict	2018-08-29 13:34:58 +05:30
Prateeksha Singh	bd7d964848	[hub] Merge Develop	2018-08-28 18:25:07 +05:30
Zarrar	34208cc89d	Revert "Google maps settings"	2018-08-28 17:25:21 +05:30
Saurabh	5b398f293a	[fix] typo fix	2018-08-28 16:28:12 +05:30
Nabin Hait	a626d967c0	[fix] naming series refactor patch	2018-08-28 16:08:22 +05:30
Saurabh	f2caacdf74	[fix] fix google map imports (#15240 )	2018-08-28 15:23:35 +05:30
Nabin Hait	04bca58fb7	[fix] missing functions related to google maps	2018-08-28 14:21:48 +05:30
Shreya Shah	e0a47aeb2f	Improve performance for warehouse tree (#15207 ) * Fix conflicts * Modify query structure * Remove whitespaces	2018-08-28 13:46:22 +05:30
Shreya Shah	a5add289bb	Refactor Naming Series (#15070 ) * Patch to create Property Setter for existing naming series * Update existing naming series options with new * Add patch link to patches.txt * Update patch * Fix codacy * Fix as per suggestions * Remove old patch for property setter * Improve as per suggested - Modified the naming - Also refactored naming for doctypes having autoname with series - Added a patch to make property setter for autoname * Fix Travis * Rebase with develop	2018-08-28 13:44:48 +05:30
rohitwaghchaure	2b72d09948	[Fix] Raw materials are not showing in the stock entry if skip transfer is enabled and backflush is based on stock entry (#15187 )	2018-08-24 11:28:34 +05:30
rohitwaghchaure	c5cf428d00	[Enhance] Provision to backflush raw materials from WIP warehouse (#15184 )	2018-08-24 11:27:41 +05:30
Shreya Shah	be7703387d	Fetch reserved qty (#15182 ) * Fetch reserved qty * Update get_item_details.py	2018-08-22 14:45:22 +05:30
Suraj Shetty	fc7b7b6b97	Allow item list for System Manager	2018-08-22 11:32:49 +05:30
Saif	a09a8c3bf7	Fixed missing DocType info for Purchase Items (#15152 ) * Made Purchase Invoice Items' Batch No and Serial No fields non copyable. * Added appropriate currency field options to Purchase...Items DocFields: -Landed Cost Voucher Amount -Billed Amt	2018-08-20 17:55:18 +05:30
rohitwaghchaure	ecc6af9d2a	[Fix] Total materials consumed cost not consider in the calculation of Gross Margin in project (#15171 )	2018-08-20 17:39:54 +05:30
Nabin Hait	9409eddf28	Update __init__.py	2018-08-16 13:58:44 +05:30
Rushabh Mehta	8705371ef0	fix(product-listing): fix variant selection in website	2018-08-16 09:22:45 +05:30
Shreya Shah	0631aed3d9	Discount amount field in all transactions' child tables (#15124 ) * Add discount_amount and base_discount_amount in Sales Invoice Item * Add patch for existing documents * Discount amount field in all child tables of Purchase and Selling * Remove console statements	2018-08-14 10:51:48 +05:30
Nabin Hait	3b5f18231a	fix(item_defaults): Item name was overwriting by child name	2018-08-13 17:45:29 +05:30
Nabin Hait	9a33bc6417	optimizing transactions by caching	2018-08-09 10:47:09 +05:30
Nabin Hait	50238c3049	[optimize] tree conditions for pricing rule	2018-08-08 18:43:04 +05:30
Himanshu Mishra	f56aac65e1	[optimize]: bin updates (#15108 )	2018-08-08 18:32:03 +05:30
Rushabh Mehta	708e47aadf	optimize(various)	2018-08-08 16:37:31 +05:30
Nabin Hait	3f142b874a	item defaults based on caching	2018-08-08 13:02:59 +05:30
Doridel Cahanap	59e4c32e9f	Allow Disabling Batch and edit Validations (#15076 )	2018-08-06 14:45:18 +05:30
KanchanChauhan	7fb8540b70	Get item defaults from item group (#15089 )	2018-08-06 14:29:14 +05:30
Prateeksha Singh	a5f6e54b70	fix merge conflict	2018-08-06 13:56:53 +05:30
Ranjith Kurungadam	752fd5a7a0	Tests SO for Serial No based delivery (#15072 ) * fix remove SO from Serial No only when voucher SE * SO tests - delivery by Serial No	2018-08-03 10:39:51 +05:30
Ranjith Kurungadam	d54991d624	Delivery by Serial No (#15030 ) * fields added for delivery by Serial No * SO - validate item for delivery by Serial No * Stock Entry - add Serial No on production, validate reserved consumption * add item by reservation to transaction if delivery by Serial No * SLE - validate reserved Serial No by SO in Delivery Note, Sale Invoice * Sales Order - validate Ensure Delivery by Serial No * Serial No - remove SO ref on cancel	2018-08-01 17:47:07 +05:30
Nabin Hait	e45ec661ea	Additional fields in Item Price (#14540 ) * [IMPROVEMENT] Item Price New Fields and Features * [IMPROVEMENT] Item Price - Item Price insert against Qty, Supplier/Customer, Validup/Validfrom - Stock Setting to accept Default Price List for Purchase or Sales Item - Move Item Section in Item Price * Fetch default Item Price based on Customer as null * test fixes * Code cleanup and fixed the issue of incorrect item price fetched against the customer * Removed min qty from packing_increment calculation * Removed auto_update_price_list_rate from the stock settings * Revert sales_order.json changes * Removed sales, purchase price list from stock settings because this fields are already available in selling, buying settings * Removed unnecessory file * Fixed item price validation code	2018-08-01 17:44:34 +05:30
rohitwaghchaure	1fa5698798	[minor] Freeze the screen to avoid multiple time clicks (#15047 )	2018-07-30 19:11:43 +05:30
Zarrar	89c87fd6a6	[Minor] Patch fix (#15041 ) * update modified date * remove extra parameter from function call	2018-07-30 10:57:47 +05:30
Nabin Hait	fa06ee80e9	Fixed merge conflict	2018-07-27 12:54:00 +05:30
FinByz Tech Pvt. Ltd	f5cc1bd44c	Created Eway Bill Report (#14926 ) * Created Eway Bill Report * Field value changes * Changed module from Stock to Regional * Added comments and minor fix * minor fix	2018-07-27 11:21:42 +05:30
rohitwaghchaure	0fe6ced99d	[Fix] Valuation rate for serialized items (#15017 )	2018-07-27 10:33:30 +05:30
Prateeksha Singh	f26177bdbc	[hub] setup publish items flow	2018-07-26 10:38:11 +05:30
Ranjith Kurungadam	e51c175aca	Fix tests (#14991 ) * minor improv in fetching account * pass name field while creating tds doc * create tds fixture after creating tds account * Inpatient Record - Test - Fix * fix batch query	2018-07-24 11:07:28 +05:30
Nabin Hait	0c0c345678	Added index on SLE based on batch_no, item and warehouse	2018-07-23 14:38:50 +05:30
yimesgen	20a80fee45	Update batch.py (#14905 ) * Update batch.py Performance improvements for pos stock availability checks on a particular warehouse due to the slowing down effects of the where clauses combined by the "and". * Update batch.py	2018-07-23 14:36:50 +05:30
rohitwaghchaure	6b862fcae5	[Fix] Rounded total is not working in the purchase receipt (#14984 )	2018-07-23 13:02:07 +05:30
Zarrar	a22e0d0c99	return empty if no stock ledger entry found (#14968 )	2018-07-23 11:31:04 +05:30
Saurabh	d7897f1c53	Resolved merge conflicts	2018-07-18 17:08:16 +05:30
Shreya Shah	3c9839f832	Defaults in Item Group (#14874 ) * Add Defaults table in Item Group * Fetch defaults from Item group if not found in Item * Add patch * Remove default fields from Item Group * Set query for defaults * Fix Codacy * Modify test records * Modify budget.py and sales_order.py * Remove join from query * Else condition to avoid error if no defaults found * refrain from making item test records before item_group * default cost center fetch correction * Remove tab item group from query	2018-07-17 18:01:44 +05:30
Shreya Shah	663b435919	Update modified time to fix patch (#14931 )	2018-07-17 16:47:18 +05:30
Saurabh	e78a877202	patch fixes (#14936 )	2018-07-17 16:38:11 +05:30
Shreya Shah	ffd2254944	Make item defaults non-collapsible (#14908 )	2018-07-16 14:55:54 +05:30
rohitwaghchaure	526ab2ca30	[enhance] Allow transfer for manufacture in the BOM (#14891 ) * [enhance] Allow transfer for maufacture in the BOM * Added patch * Fix codacy * Fixed typo and added test cases	2018-07-15 20:04:41 +05:30
Nabin Hait	b2da082798	Fixed logic and tests	2018-07-13 17:02:08 +05:30
rohitwaghchaure	2d84945839	[Fix] Stock reconciliation wrong difference amount calculation (#14893 )	2018-07-13 11:07:27 +05:30
Zarrar	9a3b785a03	[Minor] Employee Separation Fix (#14867 ) * delete associated task & project forcefully in Employee Seapration cancel trigger * remove leftover print statement * remove console statements	2018-07-11 14:34:55 +05:30
rohitwaghchaure	07d0e9a2b2	Don't show disabled items in the stock balance report (#14851 )	2018-07-09 16:56:41 +05:30
Saurabh	1cfcf70905	Resolved merge conflicts	2018-07-06 13:18:44 +05:30
rohitwaghchaure	3f5e80ebe3	Allow bulk edit for the sales invoice item (#14826 )	2018-07-06 12:39:04 +05:30
Manas Solanki	da486eeebd	Loyalty Program (#12631 ) * First Cut for the Loyalty Program * finished the collection part * redmeption for the loyalty point update the loyalty point entry in the FIFO style make the accounting entry knocking the debtors account against the expense account selected in the loyalty program update the outstanding balance in the client side * completed for the desk viewe * wrap up for the desk and shopping cart * pos * fix and test the travis	2018-07-06 12:36:57 +05:30
rohitwaghchaure	82a9fde921	Added compact print option for the material request (#14799 )	2018-07-06 10:40:51 +05:30
Zarrar	dfe897b888	[ Fix ] UOM Conversion fix (#14768 ) * increase precision for conversion value * inverse the conversion data * update uom data * rectify conversion logic according to inversion of values * rectify test case for uom conversion * patch improv to correct conversion data	2018-07-01 16:45:53 +05:30
rohitwaghchaure	1501a6e58e	[Fix] Data missing issue in stock ledger report (#14755 )	2018-07-01 16:42:00 +05:30
Cadmandata	d673afccf2	Updated comment in make_stock_entry() function (#14726 ) Purpose flag is used in make_stock_entry(**args) function, but it was not included in the comment inside the function.	2018-06-28 23:05:32 +05:30
rohitwaghchaure	cae945e743	Added validation and fixes UX for asset (#14727 )	2018-06-28 23:04:25 +05:30
Nabin Hait	e2a8120ef8	ignore user permissions for some fields	2018-06-26 15:27:34 +05:30
rohitwaghchaure	d3fb0fbb20	Added test cases for asset accounting, asset value adjustment (#14572 ) * Added test cases for asset accounting, asset value adjustment * Accounting entry for the asset created manually * Added asset movement test cases and validation * Added validation to make asset from purchase receupt, invoice only	2018-06-22 15:40:59 +05:30
Sachin Mane	19a5a5dcf4	improve performance of stock_value retrieval using tabBin instead of … (#14584 ) * improve performance of stock_value retrieval using tabBin instead of stock ledger * rename fn * rename fn * Update warehouse.py	2018-06-21 13:01:48 +05:30
rohitwaghchaure	79e5b07e62	[Fix] Subscription method (#14604 ) * [Fix] Subscription method path * [Fix] Condition	2018-06-21 12:58:14 +05:30
Nabin Hait	3946b77555	changed fieldname of inventory section break in Item	2018-06-20 22:33:34 +05:30
Bassam Ramadan	45725c2c7b	add missing brand filter to stock balance report (#14597 ) add missing brand filter to stock balance report	2018-06-20 17:41:29 +05:30
Shreya Shah	5c3929c5ea	Fix positioning of fields (#14562 )	2018-06-18 15:49:59 +05:30
Shreya Shah	1ac5585151	Bug - Add batch while creating serial nos (#14559 )	2018-06-18 15:44:10 +05:30
rohitwaghchaure	77a45b43aa	Added expense account, cost center in the purchase order and material request item doctype and fix the code (#14535 )	2018-06-15 18:03:31 +05:30
Ameya Shenoy	22c2f472e3	Merge branch 'master' into develop	2018-06-15 09:35:06 +00:00
Nabin Hait	2737b08f0f	blanket order related fixes	2018-06-14 18:07:34 +05:30
Manas Solanki	e5e87f7137	[feature] Blanket Order - Creaete Sales or Purchase order from the blanket order - If there is any blanket order for the customer/supplier rates will be fetched from that order - Manually selecting the Blanket order will change the rates accordingly - Upon submission of the order, the ordered qty will be updated in the Blanket Order	2018-06-14 15:55:38 +05:30
Zarrar	6ffdf94003	[Fixes] Defaults and User-Permission based fixes in treeview (#14501 ) * utility function added for treeview function to distinguish defaults from user permission and return appropriate data * make use of utility function for treeview	2018-06-14 12:24:16 +05:30
Zarrar	17089eeac3	[Minor] Fetching and appending items in Stock Reconciliation fix (#14509 ) * minor fix in get_list of items in stock reconciliation * reload doc fails because of backdated modified date * item and item defaults should load prior to shopify refactor * attribute value should't be none or empty, could be zero though * Update item.py	2018-06-14 11:54:18 +05:30
Shreya Shah	dd8fba6783	Do not check for batch on cancellation (#14506 )	2018-06-14 11:49:45 +05:30
rohitwaghchaure	fb997d6539	[Fix] Woocommerce test cases (#14513 )	2018-06-14 09:13:39 +05:30
Rohit Waghchaure	80d4477d1e	[Fix] Travis for test_material_consumption	2018-06-13 18:37:03 +05:30
Rohit Waghchaure	0eef3f665d	[Fix] Travis for stock entry	2018-06-13 13:06:25 +05:30
Manas Solanki	176e7c5ce2	fix the test case for the payroll (#14480 ) * fix the test case for the payroll * fix the shopify and stock entry * more structured test cases for payroll	2018-06-13 11:13:01 +05:30
Rohit Waghchaure	b6381c66d8	[Fix] Purchase receipt test cases	2018-06-12 13:54:40 +05:30
Rohit Waghchaure	f270567c45	[Fix] Test cases for asset	2018-06-12 12:20:52 +05:30
Rohit Waghchaure	647d595158	Code cleanup and fixes for the asset	2018-06-11 19:15:08 +05:30
Rohit Waghchaure	86026d31cf	[Fix] Alternative item, transferred qty issue for backflush method	2018-06-11 14:11:00 +05:30
rohitwaghchaure	7048925016	[Enhance] Standalone debit/credit note (#14269 ) * [Enhance] Standalone debit/credit note * Test cases * Test cases and documentation * Removed credit, debit note links from accounts module	2018-06-11 12:02:14 +05:30
Manas Solanki	3639b85663	Merge pull request #14363 from frappe/manassolanki-patch-10 PR to check the current state of Travis	2018-06-11 11:40:40 +05:30
rohitwaghchaure	8fc64a9717	[Fix] Travis data (#14422 )	2018-06-08 14:43:50 +05:30
rohitwaghchaure	2704bef0b3	Merge pull request #14368 from shreyashah115/fix-trav Some more travis fixes	2018-06-07 14:14:33 +05:30
Shreya	4638d1ab97	Fix POS Profile test	2018-06-06 16:23:16 +05:30
Zarrar	32a118d68c	fix precision in stock entry (#14366 )	2018-06-06 15:06:52 +05:30
Shreya	90bdfed3db	Modify all asset test cases	2018-06-06 14:27:55 +05:30
Manas Solanki	3504a2342e	PR to check the current state of Travis	2018-06-06 12:46:06 +05:30
Ameya Shenoy	873e28d9b8	Merge branch 'master' into develop	2018-06-06 05:53:19 +00:00
Shreya Shah	59af3a0296	[Enhancement] UOM Conversion Factors (#13853 ) * new doctype UOM category * new doctype UOM Conversion Factor * bootstrap json data for uom conversions * uom conversion in item * Patch to add all conversions and categories * Fetch conversions multi-way * fix codacy * Rebase with develop * [minor] Fix * Add a test case * Improvise as per review comment * Add json data for UOMs * Commonify function and call from patch * Update uom_conversion_data.py	2018-06-06 09:44:46 +05:30
Shreya Shah	c37fd050c5	Remove unnecessary variable (#14352 ) * Remove unnecessary variable * Replace cur_frm with frm * Update material_request.js	2018-06-06 09:19:48 +05:30
Shreya	9c801b976d	Fix share transfer test	2018-06-06 02:58:23 +05:30
Shreya	8f692f9a27	Fix batch test	2018-06-06 02:09:17 +05:30
Shreya	2ad81726d5	Fix utils.py	2018-06-06 02:09:17 +05:30
rohitwaghchaure	2da6b3d628	[enhance] Provision to backflush raw materials based on stock entries for subcontracted items (#14296 )	2018-06-05 13:06:52 +05:30
Shreya Shah	630721aacc	Travis (#14354 ) * Fix Purchase Receipt tests * Fix Item test * Fix daily work summary test * Modify currency exchange test cases * Fix Leave Application test * Update working hours when making salary slip from timesheet * Replace fixer.io with exchangeratesapi * Fix codacy	2018-06-05 12:56:10 +05:30
Nabin Hait	81d12cc9c8	Get default income account from Item	2018-06-05 12:49:03 +05:30
Sushant Nadkar	ebf76163ad	show uom in list view of material request (#14338 )	2018-06-04 14:23:25 +05:30
Zarrar	7e0e85912b	item_name not fetched in packing slip (#14310 )	2018-06-01 15:10:33 +05:30
Saurabh	0eb622f7da	[fix] resolve conflicts	2018-05-31 17:32:17 +05:30
AMS Fauzi	f3a6d95634	Develop: Batch Number Series (#14251 )	2018-05-31 09:31:57 +05:30
rohitwaghchaure	31a96d2a3f	[Fix] System not fetching default warehoue defined in pos profile for packing materials of product bundle item (#14287 )	2018-05-30 18:13:47 +05:30
Shreya Shah	47335e5e60	Stocking out items with expired batches (#14249 ) * Add dropdown in Stock Entry to get expired batch items * Fetch all the items with expired batches * Add the fetched item details to stock entry details * Modify as per the review comments	2018-05-30 15:44:41 +05:30
rohitwaghchaure	05152dad0b	[Enhance] Provision to set overproduction percentage for work order (#14248 )	2018-05-30 15:28:09 +05:30
Shreya Shah	ae95a8aa15	Update status in Purchase Receipt (#14257 ) * Update status on submission if per_billed = 100 * Add patch to update existing records	2018-05-28 18:24:28 +05:30
Zarrar	b9f54ca946	[Enhance] Group same items during printing Delivery Note, Invoices, etc (#14250 ) * add doctypes allowed to group items, average the rate * add check field to group items during print * call common before_print in delivery note * fix precision issue while calculating average	2018-05-28 17:41:09 +05:30
Saurabh	3c1b153cdb	Merge pull request #14111 from netchampfaris/stock-ledger-report-hotfix [fix] Stock Ledger report item filter	2018-05-28 15:23:21 +05:30
Shreya Shah	e329038aaa	Total Quantity in Sales and Purchase DocTypes (#14114 ) * Add field to all sales and purchase doctypes * Add patch to update existing records * Modify taxes_and_totals.py	2018-05-28 11:49:08 +05:30
Suraj Shetty	084b0b3a67	Treeview permission (#14232 ) * Replace frappe.db.sql to frappe.get_list to apply permissions (#14037) * Replace frappe.db.sql to frappe.get_list to apply permission - All get_children method had frappe.db.sql in them which had no permission check, now its replaced with frappe.get_list which will check permission based on the user. * Fix codacy - Remove trailing whitespace * Add parent filter * Add ifnull checks	2018-05-26 09:12:59 +05:30
Nabin Hait	33df0b4fbf	Test case fixes (#14219 ) * Test case fixes * fetch_from fixes	2018-05-26 09:09:02 +05:30
Nabin Hait	f87ec61043	Test case fixes for item defaults	2018-05-24 18:19:21 +05:30
Nabin Hait	b903fc4e71	Item defaults query fixes	2018-05-24 17:07:51 +05:30
Ameya Shenoy	95e60927b4	Merge branch 'master' into develop	2018-05-24 08:45:14 +00:00
Manas Solanki	f7713ebfa7	[optimize] introduce two filter in the report in order to handle large item master data (#14193 )	2018-05-23 19:43:04 +05:30
Nabin Hait	5f861756a2	Item Default fixes	2018-05-23 19:37:06 +05:30
Achilles Rasquinha	efb731941d	ran 2to3, evaluation (#13499 ) * ran 2to3, evaluation * Update update_gstin.py * Update accounts_receivable_summary.py	2018-05-23 11:31:24 +05:30
Zarrar	c141eb00ee	[Enhance] Department added wherever applicable (#14121 ) * set All Department as default parent_department * add department field in employee_transfer * copied data from options to fetch_from * add department field wherever employee's link field present * empty options field where fetch_from is added	2018-05-23 11:11:36 +05:30
Ameya Shenoy	1cc7500be9	Merge branch 'master' into develop	2018-05-22 09:18:38 +00:00
Manas Solanki	a96421279d	Remove the debugger from the material_request.js	2018-05-21 17:27:01 +05:30
rohitwaghchaure	22619a8e0c	Merge pull request #14164 from rohitwaghchaure/fixed_alias_issue [Fix] Unknown column 'i.stock_uom' in 'field list'	2018-05-21 16:22:23 +05:30
Rohit Waghchaure	abc6cf0aa5	[Fix] Unknown column 'i.stock_uom' in 'field list'	2018-05-21 16:18:37 +05:30
Manas Solanki	b5d9b38dee	don't update the modified of the item price	2018-05-21 15:40:51 +05:30
Manas Solanki	f87762887a	fetch defualt supplier from the item table (#14113 )	2018-05-20 10:58:26 +05:30
Zarrar	42231df33a	[Minor] Supplier Group test fix & default supplier in item fix (#14150 ) * fix supplier group test * item - default_supplier fix	2018-05-20 10:46:10 +05:30
Gaurav Naik	8f17281011	Initialized dynamic link on Warehouse (#14135 ) * Initialized dynamic link for Warehouse * Codacy Fixes	2018-05-20 10:39:14 +05:30
rohitwaghchaure	d08ac1fe79	Merge pull request #14136 from rohitwaghchaure/multiple_fixes_for_v11 Fixes in material request, asset maintenance	2018-05-18 16:39:48 +05:30
Rohit Waghchaure	73a99441ca	Fixed get_query for default data in item	2018-05-18 16:39:08 +05:30
Rohit Waghchaure	6cdaa6e861	Fixes in material request, asset maintenance	2018-05-18 16:30:14 +05:30
Rohit Waghchaure	f61e94e162	Changed condition of finance book in reports	2018-05-18 09:10:07 +05:30
Faris Ansari	9e4889d756	[fix] Stock Ledger report item filter - breaks when Item Code contains % symbol	2018-05-17 12:18:28 +05:30
Rohit Waghchaure	421697250b	[Fix] Asset gl entry not creating for non perpetual	2018-05-16 18:20:52 +05:30
Manas Solanki	38667ab8da	return defaults according to the company	2018-05-16 17:00:05 +05:30
Rohit Waghchaure	b233e9d643	[Fix] Multiple fixes	2018-05-16 16:41:34 +05:30
Manas Solanki	e3910fb2a6	[fixes] fix in the item defaults	2018-05-16 16:16:34 +05:30
Manas Solanki	8e184569a1	Update item.json	2018-05-16 15:11:52 +05:30
rohitwaghchaure	eff678d2d6	Merge pull request #13918 from manassolanki/item-level-defualts [enhancement] add the item defaults in the child-table for multi-company	2018-05-16 14:04:47 +05:30
Suraj Shetty	fbb6b3da5f	Undo replace of frappe.db.sql with frappe.get_list (#14074 )	2018-05-16 13:53:31 +05:30
lasalesi	265005d30d	apply sorting for make multiple variant attributes (#14073 )	2018-05-16 13:10:25 +05:30
Manas Solanki	64614374d8	fix codacy	2018-05-16 13:00:56 +05:30
Manas Solanki	b16a4ec79e	changes for the default cost center	2018-05-16 13:00:56 +05:30
Rushabh Mehta	0b628386de	[minor] remove in_dialog old property	2018-05-16 12:51:22 +05:30
Manas Solanki	087a2259d9	update for default warehouse	2018-05-16 12:44:07 +05:30
Manas Solanki	c760222a6c	add the item defaults in the childtable for multicompany	2018-05-16 12:44:06 +05:30
Suraj Shetty	8501010f12	Replace frappe.db.sql to frappe.get_list to apply permissions (#14037 ) * Replace frappe.db.sql to frappe.get_list to apply permission - All get_children method had frappe.db.sql in them which had no permission check, now its replaced with frappe.get_list which will check permission based on the user. * Fix codacy - Remove trailing whitespace	2018-05-16 10:44:38 +05:30
rohitwaghchaure	f9fa588ddc	Merge pull request #14061 from rohitwaghchaure/budget_validation_enhance_in_mr_po [Enhance] Budget validation on material request, purchase order	2018-05-15 22:18:17 +05:30
Rohit Waghchaure	4d4fb6dcbc	[Enhance] Budget validation on material request, purchase order	2018-05-15 22:12:44 +05:30
rohitwaghchaure	c3b9eabe5e	Merge pull request #14048 from shreyashah115/exchange-rate [Enhancement] Buying and Selling checkboxes in Currency Exchange	2018-05-15 17:55:09 +05:30
Shreya	3f77852e93	Pass buying or selling as filter parameters Wherever get_exchange_rate is called, pass filter buying or selling on the basis of doctype.	2018-05-15 17:22:06 +05:30
Manas Solanki	1879f08c7c	Merge branch 'develop' into deferred-account	2018-05-15 15:20:44 +05:30
Manas Solanki	0393848f60	deferred account in the item and company master	2018-05-15 13:04:01 +05:30
Saurabh	99400bd958	remove duplicate fields occured due to merge conflicts	2018-05-14 22:11:17 +05:30
Saurabh	2ca83d61ea	Resolve merge conflicts from enterprise_sprint branch	2018-05-14 21:15:46 +05:30
rohitwaghchaure	7c6bef4905	Merge branch 'enterprise_sprint' into supplier-group	2018-05-14 20:39:01 +05:30
Rohit Waghchaure	aa7b434270	Create asset adjustment doctype, post gl entry for the asset	2018-05-14 19:07:40 +05:30
Rohit Waghchaure	f2684ae83a	Commonify get_asset_category_account and get_fixed_asset_account method	2018-05-14 19:07:40 +05:30
Rohit Waghchaure	f41e1ed191	Added default asset accounts in COA, CWIP account in asset category	2018-05-14 19:07:40 +05:30
Rohit Waghchaure	af05995418	Asset accounting	2018-05-14 19:07:39 +05:30
Rohit Waghchaure	c6deb13fb4	Added account fields in the company, fixes in auto creation of the asset from PR	2018-05-14 19:07:39 +05:30
Rohit Waghchaure	ab84254188	Asset linked to purchase receipt and serial no	2018-05-14 19:07:39 +05:30
Suraj Shetty	f93cc57e8a	Ignore user permission for 'variant Of' in Item (#14013 ) - Since mostly variant of is null it gets filtered out if user permission is applied. And since variant is a link to item itself there is no need to check user permission for it as user permission gets applied on Item anyways.	2018-05-14 14:07:20 +05:30
Rohit Waghchaure	ebe1ebead2	[Fix] 'ProductionOrder' object has no attribute 'set_work_order_operations'	2018-05-14 13:21:45 +05:30
Manas Solanki	a27d29b349	enable deferred revenue in the item master	2018-05-14 12:07:14 +05:30
Zlash65	0a50554417	doctype level changes	2018-05-14 11:45:38 +05:30
Kanchan Chauhan	d560da950d	[Minor] Show only active driver in Delivery Trip	2018-05-10 10:42:56 +05:30
Nabin Hait	9d215c2d9b	Set operations on production order while making from Material Request	2018-05-09 18:32:54 +05:30
Nabin Hait	b2800eeb2a	Merge branch 'develop' of https://github.com/frappe/erpnext into develop	2018-05-08 16:34:35 +05:30
Nabin Hait	9036b9ee85	Merge branch 'master' into develop	2018-05-08 16:31:42 +05:30
Zarrar	f2df7f32fa	update subscription to auto_repeat across dashboards (#13956 )	2018-05-08 16:06:36 +05:30
Saurabh	40349f4b00	[fix] add stock entry link on Material Request Dashboard (#13950 )	2018-05-08 15:23:51 +05:30
Nabin Hait	4bbe5fbefc	Fixes related to auto repeat	2018-05-05 12:32:59 +05:30
Nabin Hait	abd0325acd	Fixed merge conflict	2018-05-05 12:19:14 +05:30
Shreya Shah	764b9bfeba	cint for Item field has_variants (#13916 ) * convert none type value to int * Fix typo	2018-05-04 17:58:36 +05:30
Suraj Shetty	dcc90e3312	Add fix to support changes in user permission (#13923 ) https://github.com/frappe/frappe/pull/5494	2018-05-04 17:52:57 +05:30
Nabin Hait	62b985d405	[fix] Update show_in_website in template	2018-05-04 12:21:15 +05:30
Suraj Shetty	00cced12a0	Success Action (#13666 ) * success action config for sales invoice * remove "Notification Control" doctype and its usage * add default success action after_install or while migration (patch) * rename for_doctype to ref_doctype * case change * minor fix * Remove unnecessary code * Replace message with translatable message * Fix 'cannot import error'	2018-05-03 19:06:32 +05:30
Nabin Hait	ed376cacc8	Set Qty in transactions based on serial no via Stock Settings (#13897 )	2018-05-03 16:24:52 +05:30
rohitwaghchaure	125c0caf12	Added brand in item price doctype, item prices report (#13900 )	2018-05-03 16:23:57 +05:30
Prateeksha Singh	a7c6ff8f3e	Merge pull request #13837 from shreyashah115/serial-batch-linking Serial No. and Batch No. linking	2018-05-02 15:11:19 +05:30
Zarrar	284de4c15a	updated modified time - reload issue in patch (#13881 )	2018-05-02 12:14:59 +05:30
Shreya	0456ced796	remove unused code	2018-05-01 19:00:06 +05:30
Nabin Hait	3652a62b55	minor fixes	2018-04-30 19:32:29 +05:30
Nabin Hait	d39386bd55	Renamed some salary related fields	2018-04-30 16:21:37 +05:30
Shreya	96e45902fd	codacy	2018-04-30 15:54:34 +05:30
Shreya	14bd43d5eb	minor changes	2018-04-30 15:30:42 +05:30
Faris Ansari	9f739fe87d	Handle item_wise_tax_detail invalid value while item renaming (#13778 )	2018-04-26 18:48:01 +05:30
rohitwaghchaure	7e8a7ac6ee	Provision to select opening stock in stock reconciliation (#13802 )	2018-04-26 16:30:35 +05:30
Shreya	a20157af17	on item, warehouse and batch triggers, fetch serial nos based on batch	2018-04-26 14:39:21 +05:30
Shreya	7461d28ae0	add batch when creating serial nos	2018-04-26 14:39:21 +05:30
Shreya	4a2fe605b3	batch no field in serial no doctype	2018-04-26 14:39:21 +05:30
Saurabh	9738d52d5f	Merge branch 'master' into develop	2018-04-24 12:09:40 +05:30
Saurabh	d2065ce3bf	typo fix	2018-04-24 12:07:37 +05:30
Saurabh	2e7a45dbb4	resolved merge conflicts	2018-04-24 11:16:13 +05:30
tundebabzy	dbdf462e56	fix conflict	2018-04-22 23:49:26 +01:00
Shreya Shah	44e719d64c	[Enhancement] Leave Application and Expense Claim (#13645 ) * child table employee expense approver * set query in department * mandatory approver check in hr settings * triggers on leave and expense approver * fetch all parent approvers from department hierarchy * fixes * patch to move employee approvers from employee to department * removed hard coding of roles * modify approvers list query * commonified functions * patch * renamed standard reply occurrences * removed leave approvers table from Employee master * email templates for leave application notification * set default email templates for leave in hr settings * notify by email template * approval status in expense claim * render template in patch * removed unused code * Single child table department approver * read instead of render template	2018-04-19 20:58:52 -08:00
Saurabh	2476a8aab9	a[fix] check content before making in condition	2018-04-17 20:45:06 +05:30
tundebabzy	caae0f4dcc	Merge branch 'develop' into new-subscription	2018-04-17 09:34:04 +01:00
Saurabh	46743d00d6	Merge branch 'master' into develop	2018-04-17 12:00:21 +05:30
Saurabh	9fbb8192e1	[fix] do not escape % while using clause (#13677 )	2018-04-17 11:56:46 +05:30
Sanjay Kumar	bc83daf0fa	#13478 : Default Accounts in Item from Item Group (#13635 ) * remove external app reference and update get_warehouse_list * resolve #13478 : Default Accounts in Item from Item Group	2018-04-15 21:36:37 -08:00
Nabin Hait	642d39098a	Fixed merge conflict	2018-04-13 14:38:57 +05:30
rohitwaghchaure	2ea593bdd8	[Fix] POS Profile data not set in the sales invoice (#13568 )	2018-04-12 13:37:08 +05:30
Nabin Hait	c10e106f8f	Optimization related to large number of items (#13606 )	2018-04-12 13:25:03 +05:30
Sanjay Kumar	6225b769a6	remove external app reference and update get_warehouse_list (#13597 )	2018-04-11 02:19:36 -08:00
Doridel Cahanap	ad76f9ad70	[Enhancement] Work Order Material Consumption (#13384 ) * Work Order Material Consumption * Test cases and other minor fixes * Test cases fixes * Travis Fixes * Work Order Material Consumption Request Changes * Update work_order.js	2018-04-09 10:31:28 +05:30
Nabin Hait	e9638be032	fixed merge conflict	2018-04-06 15:18:27 +05:30
rohitwaghchaure	c0f149a3be	[Fix] Delivery notification for delivery trip (#13543 )	2018-04-06 14:26:26 +05:30
rohitwaghchaure	2ae6cfda5f	[Fix] Item variant details report (#13545 )	2018-04-06 11:49:04 +05:30
rohitwaghchaure	22d9f0a4aa	[Fix] Bin not deleted on delete of an item (#13539 )	2018-04-06 10:29:07 +05:30
Suraj Shetty	97d84eb509	remove apply user permission (#13505 )	2018-04-05 12:10:46 +05:30
Nabin Hait	2b682c82e8	Fixed merge conflict	2018-04-04 11:40:16 +05:30
Nabin Hait	5fd79f7f77	Update stock_ledger.py	2018-04-04 11:20:16 +05:30
Rushabh Mehta	d5f9ebd008	[optimize] item queries (#13480 )	2018-04-02 23:37:33 +05:30
Nabin Hait	edd320e338	Optimisation of warehouse_account_map (#13454 )	2018-04-02 10:30:17 +05:30
rohitwaghchaure	40a5a3063c	[Fix] Allow zero valuation rate if previous sle has zero valuation rate (#13432 )	2018-04-02 10:14:49 +05:30
Nabin Hait	ff2e4c898a	Fixed merge conflict	2018-03-29 13:57:39 +05:30
Manas Solanki	a4502c4f6b	Merge pull request #13430 from codingCoffee/child_doc_perm_fix Permisssion fixes for child table	2018-03-29 13:27:08 +05:30
Manas Solanki	1f02c62339	Merge pull request #13431 from manassolanki/fix-22 fix the item varint details	2018-03-29 13:26:14 +05:30
Manas Solanki	ef770b593a	fix the item varint details	2018-03-29 13:25:00 +05:30
Ameya Shenoy	c5d222253a	Permisssion fixes for child table Related to commit 595929eb2432140a27dc262d4d78aca4ec5455c3 frappe.client.[get_list, get, get_value] when called on child table needs parent as an argument or it throws an error by default	2018-03-29 13:16:08 +05:30
Manas Solanki	94769d81a8	Update get_item_details.py	2018-03-29 11:15:05 +05:30
Nabin Hait	4d9e104284	Merge branch 'master' into develop	2018-03-28 15:51:18 +05:30
rohitwaghchaure	a3c3dec5a2	[enhance] Item Alternative (#13121 ) * [enhance] Item Alternative * Added two way provision in item alternative * Test Cases * documentation	2018-03-28 11:51:44 +05:30
Nabin Hait	a6746407e5	Fixed waiting qty in item dashboard data	2018-03-28 11:16:12 +05:30
Nabin Hait	b9c82b9790	Fixed merge conflict	2018-03-27 14:25:27 +05:30
Nabin Hait	9d7fe1f7cd	Indicator fix for stock entry item table	2018-03-27 13:30:11 +05:30
Prateeksha Singh	be368fe94b	Enumerate numeric values in variant dialog	2018-03-27 12:17:15 +05:30
Shreya Shah	ba4f32be5c	set default warehouse instead of product bundle's warehouse for packed_items in delivery note (#13398 )	2018-03-27 11:32:10 +05:30
rohitwaghchaure	2e560cb25d	[Fix] Same serial no returned two times (#13378 )	2018-03-27 11:24:50 +05:30
Nabin Hait	651b612909	Fixed logic for reserved qty for subcontract and production and written a patch (#13396 ) * Fixed logic for reserved qty for subcontract and production and written a patch * repost reserved qty for filtered bins	2018-03-27 11:24:20 +05:30
Nabin Hait	061d912749	Fixed merge conflict	2018-03-23 16:20:27 +05:30
rohitwaghchaure	492de67d7b	Added consumed material cost in project (#13365 )	2018-03-23 15:02:04 +05:30
Nabin Hait	e3f0412570	Pass doc while autonaming item	2018-03-22 12:13:21 +05:30
rohitwaghchaure	23fa8893a8	[Fix] Division by zero issue (#13362 )	2018-03-22 11:16:00 +05:30
rohitwaghchaure	93779c21a7	[Fix] Project not set in the stock ledger entry (#13357 )	2018-03-21 17:52:41 +05:30
Zarrar	969c8aaf52	[Enhance] Fetch Customer's Item code based on Customer Name or Customer Group (#13198 ) * customer code can be assigned based on customer group * improvise customer group selection * requested changes made	2018-03-21 11:17:49 +05:30
rohitwaghchaure	2b88ac948e	[Fix] Special character issue (#13350 )	2018-03-21 10:04:47 +05:30
Zarrar	13ddc7e188	[ Enhance ] Production to Work Order (#12902 ) * remove occurrences of Production Order * rename from report and jsons * Change Production Order to Work Order * change occurences of production order from other files * resolve minor conflict issues and reports * patch added * codacy fix * updated patches, leftover changes * rename reports, rectify patches	2018-03-20 12:38:43 +05:30
Nabin Hait	d97c5a04b2	minor fix in item naming	2018-03-20 12:31:05 +05:30
Nabin Hait	3707242770	Fixed merge conflict	2018-03-13 16:15:41 +05:30
Nabin Hait	89346967da	Reverted #13259 (#13291 )	2018-03-13 16:01:11 +05:30
Nabin Hait	96f4b22589	Set po nos in DN and SI (#13290 )	2018-03-13 15:46:59 +05:30
tundebabzy	0125f7b130	rename to Subscription and transfer present Subscription records to Auto Repeat in frappe	2018-03-12 13:51:47 +01:00
rohitwaghchaure	13460f023d	[Fix] Batch value showing as item value while making batch (#13281 )	2018-03-12 17:20:50 +05:30
Nabin Hait	2f493731ec	Fixed merge conflict	2018-03-12 15:49:59 +05:30
Nabin Hait	2c7a6e6b43	Reserve for subcontracting (#13195 ) * [fix] #8427 * review comments changes * Validation for reserved warhouse * code improvements * alignment * test case * message changes * default warehouse / remove validation / change sql * fix * patch * Fixed merge conflict * Fixes and cleanups of reserve qty for subcontracting * set from_warehouse only if purchase_order and purpose found (#12398) * [HotFix] Validation issue for subcontract stock entry (#12127) * [Fix] Validation issue for subcontract stock entry * Update stock_entry.py * Fixes and cleanups of reserve qty for subcontracting * patch fixed * Reload bin in patch * [fix] set source warehouse in stock entry for manufacture * [fix] #8540 * code alignment * code alignment * Move target warehouse validation to submit * validation code improvement * code changes for single stock entry * validation fix * call make_rm_stock_entry * remove old stock entry method/rewrite test case * Don't set bom_no against raw materials while trasferring items for sub-contracting * minor fix	2018-03-12 14:12:12 +05:30
Shreya Shah	ef4c3b8e2f	add has variants in standard filter (#13251 )	2018-03-12 11:20:49 +05:30
Nabin Hait	5e63c265db	Fixed merge conflict	2018-03-09 17:34:39 +05:30
Nabin Hait	052333ea63	subctracting stock entry should also be considered as consumed qty	2018-03-09 14:30:32 +05:30
Achilles Rasquinha	b4de7e3d07	removed has_key, used pythonic in (#13236 ) * removed has_key, used pythonic in * Update bom.py	2018-03-09 12:35:47 +05:30
Suraj Shetty	f2d28ebd6a	Data import Tool bug fix (#13165 ) * fixes #13064 * commonified naming series checks * test fixes replaced test employee names according to naming series	2018-03-09 12:33:13 +05:30
Zarrar	3fd634783d	[Enhance] Fetch Customer's Item code based on Customer Name or Customer Group (#13198 ) * customer code can be assigned based on customer group * improvise customer group selection * requested changes made	2018-03-09 12:10:45 +05:30
rohitwaghchaure	bbd9b71547	Provision to include exploded items while making transfer entry of raw materials for subcontrtacted item (#13043 )	2018-03-07 15:39:40 +05:30
Vishal Dhayagude	668ec25d19	Allow Item variant Rename (#13161 ) * [WIP] Item varient rename * [wip] Item Variant * [fix] Item Varient Rename * [fix] Item Attribution Rename * removed unwanted code	2018-03-07 15:31:08 +05:30
Nabin Hait	c43c95e0aa	Fixed merge conflict	2018-03-05 14:54:44 +05:30
Manas Solanki	5fd7b3bb80	Fix status updater (#13033 ) * fix the status updater for multiple sources * patch for updating the status * patch for updating the sales order item * Update update_status_for_multiple_source_in_po.py	2018-03-05 11:28:29 +05:30
Vishal Dhayagude	35b665cb26	[new] Create multiple warehouse address and fetch address to stock entry (#13109 ) * [new] Create multiple warehouse address and fetch address to stock entry * [fix] Deleted unwanted field and added patch to link warehouse details to Address * [fix] Codacy fixed * [fix] Modified patch for warehouse address * [fix] Modified patch for warehouse address * [fix] Patch updated and removed contact details from stock entry * [fix] Patch Updated	2018-03-05 11:10:01 +05:30
rohitwaghchaure	a6a4e86dc8	[Fix] System only shows 20 attribute values while making variants (#13155 )	2018-03-05 11:03:59 +05:30
rohitwaghchaure	67cfa81de2	[Fix] Stock Ageing report does not work with group warehouse (#13151 )	2018-03-05 11:00:42 +05:30
Nabin Hait	c10bbd6aa7	Editable unallocated amount in pe (#13130 ) * editable unallocated amount in payment entry to handle multi currency * set unallocated amount on server side * some minor fixes * Fixes in territory patch * removed print * minor fixes	2018-03-01 13:14:14 +05:30
Harsh Patel	5bebbbe7a9	[Feature] Supplier warehouse link field on purchase order (#13051 ) * Multiple Features: [New] Supplier warehouse link field on purchase order for sub-contracting [New] Auto select supplier warehouse while making purchase receipt from purchase order * Set default to_warehouse in stock entry as the supplier warehouse	2018-03-01 11:33:25 +05:30
rohitwaghchaure	0df95fa781	Multi-UOM for sales/purchase return (#13132 ) * Multi-UOM for sales/purchase return * Update sales_and_purchase_return.py	2018-03-01 11:31:33 +05:30
Nabin Hait	f68dc69078	Set auto created serial nos in incoming transactions in case of multi UOM (#13112 ) * Create user from Employee * Set auto created serial nos in incoming transactions in case of multi uom	2018-03-01 10:54:24 +05:30
Nabin Hait	a645f36b2b	Get valuation rate from historical SLE even if it is zero (#13129 ) * Don't overwrite start and end date comes from payroll entry * Get valuation rate from historical SLE even if it is zero, if records exists * Valid till should be autoset if not any default value * Set status of expense claim based on is_paid check	2018-03-01 10:31:24 +05:30
rohitwaghchaure	332a17ee86	[Fix] Test case for serial no (#13136 )	2018-03-01 10:28:04 +05:30
Achilles Rasquinha	646522886c	self.assertEqual	2018-02-28 21:13:51 +05:30
Achilles Rasquinha	96698c9a77	Use range instead xrange (#13128 ) * Use range instead of xrange * convert float to int	2018-02-28 16:12:51 +05:30
Nabin Hait	3799f8bec9	Don't validate serial nos while cancelling the transaction	2018-02-26 16:39:06 +05:30
Nabin Hait	127c61e930	Fixed logic in itemwise recommended reorder level	2018-02-26 12:43:17 +05:30
rohitwaghchaure	8ffd5d40e3	[Fix] UX for delivery trip (#13046 ) * [Fix] UX for delivery trip * Fixed test cases	2018-02-26 12:25:39 +05:30
Nabin Hait	802819df9d	Merge branch 'master' into develop	2018-02-23 16:59:44 +05:30
Zarrar	339426c926	fix permission issue for stock balance report - Item Group (#13069 )	2018-02-23 16:58:55 +05:30
Nabin Hait	cf72d7f135	Fixed merge conflict	2018-02-22 14:47:26 +05:30
rohitwaghchaure	4e8fdf7b3f	[Enhance] Quality Inspection Template (#12988 ) * [Enhance] Quality Inspection Template * Test case and patch * Update make_quality_inspection_template.py	2018-02-22 11:03:48 +05:30
Shreya Shah	8a77a0e1e4	Add total row in all trends reports (#13010 ) * total in sales order trends report * total in all trends reports	2018-02-21 14:46:07 +05:30
Zarrar	bc5515651b	[Hotfix] Selecting create on blank field throws error (#13014 ) * selecting create on blank field error fix * error when fetching default_print_format	2018-02-21 11:13:14 +05:30
Shreya Shah	f65afac353	db_update instead of save to avoid unnecessary validations (#13009 )	2018-02-21 11:12:04 +05:30
rohitwaghchaure	e2558308f6	[enhance] Production Plan (#12160 ) * [enhance] Production plan * Test cases * Removed production planning tool * Documentation * Added actual qty in material request production item * Renamed field 'Use Multilevel BOM' to 'Include Exploded Items'	2018-02-20 12:20:00 +05:30
Pawan Mehta	2fbb4923a7	item balance report (#12983 ) * item balance report * remove hard coding * Update item_balance.json * Update item_balance.json Change name to "Item Balance (Simple)" * Update item_balance.json	2018-02-20 12:17:49 +05:30
joezsweet	16862f9051	Better handling of auto set barcode_type issue (#12970 ) Get barcode_type options and check if value is included	2018-02-16 17:33:30 +05:30
riyasrawther	d1134516c2	Warehouse wise Item Balance, Age and Value (#12879 ) * Create warehouse_wise_item_balanace_age_and_value.py * Create warehouse_wise_item_balance_age_and_value.js * Create warehouse_wise_item_balance_age_and_value.json * Update warehouse_wise_item_balance_age_and_value.json * Update warehouse_wise_item_balance_age_and_value.json * Update warehouse_wise_item_balance_age_and_value.json * Update warehouse_wise_item_balance_age_and_value.js * Rename warehouse_wise_item_balanace_age_and_value.py to warehouse_wise_item_balance_age_and_value.py * Update warehouse_wise_item_balance_age_and_value.py	2018-02-16 14:53:53 +05:30
joezsweet	bd7c00c59e	[Hot Fix] barcode_type auto set to a wrong value (#12957 ) * Fix barcode_type auto set to a wrong value This fix a problem that arise, for some weird reason that i can't figure out, when the barcode length == 8, 9,10 or 12,13 and barcode_type is not set; barcode_type become "ean8, ean9, ean10, ean11, ean12, ean13" * codacy fix	2018-02-16 14:47:10 +05:30
rohitwaghchaure	5a5f73e46a	Merge pull request #12602 from PawanMeh/fixes_8540 Select multiple raw material items for Sub Contract Stock Entries	2018-02-15 18:54:29 +05:30
Saurabh	82ffdd7dc6	Merge branch 'master' into develop	2018-02-15 15:17:04 +05:30
Achilles Rasquinha	0bf19a1ac5	Merge pull request #12931 from achillesrasquinha/py3-iteritems Py3 iteritems	2018-02-15 13:49:43 +05:30
Achilles Rasquinha	1697a7aa81	replaced string_types with basestring	2018-02-15 11:39:45 +05:30
Achilles Rasquinha	714c7465fb	Updated Python 3 fixes	2018-02-15 11:31:05 +05:30
Nabin Hait	e6d65bc2a1	Fixed translations and tests (#12900 ) * Fixed translations and tests * minor fixes * minor test fixes	2018-02-14 17:44:06 +05:30
Achilles Rasquinha	361366ebe6	Python 3 fixes. (#12916 ) * Fixed iteritems and exceptions * python3-fixes * fixed iteritems	2018-02-14 17:08:59 +05:30
rohitwaghchaure	a13b177908	[Fix] Not able to select delivery note in delivery trip (#12912 )	2018-02-14 17:06:21 +05:30
Saurabh	2735701aab	resolved merge conflicts	2018-02-14 11:51:09 +05:30
Faris Ansari	5a91989665	Remove total_projected_qty (#12889 )	2018-02-13 16:00:52 +05:30
Achilles Rasquinha	56b2e12af8	Python 3 fixes [merge asap] (#12884 ) * Python 3 fixes * fixed compare	2018-02-13 14:42:40 +05:30
rohitwaghchaure	6a7495dbc8	Removed set only once for maintain stock field in item master (#12878 )	2018-02-12 17:25:24 +05:30
sivankar	a4ff220769	removed duplicate function and other CLI fixes (#12876 ) * merge shelf like and manufacturing date * setting default manufacturing date as todays date * setting default manufacturing date as todays date * fix * Improvements to batch auto naming (#12496) * refactor: add new function - batch_uses_naming_series use batch_uses_naming_series in autoname method * properly update naming series on delete: - add new functions - get_batch_prefix, get_batch_naming_series_key, get_batch_naming_series - refactor get_name_from_naming_series - add after_delete method * add documentation and rename some functions * PEP 8 compliance * test * added support for jinja template and added validation if expiry date is set or not if item has_expiry_date is set * bug fix, renamed item_code to item as in batch doctype we refer 'item code' by 'item' * added manufacturing date wise sort * added prefix to expiry date and manufacturing date * Quality Review fixes	2018-02-12 17:24:26 +05:30
Nabin Hait	e21e59614f	Fixed merge conflict	2018-02-12 15:59:55 +05:30
tundebabzy	6e90f49a35	Wrong Exchange Rate Is Fetched When Exchange Rate Is Different From Company Currency For Price Lists #12712 (#12714 ) * unconditionally fetch exchange rate * Revert "unconditionally fetch exchange rate" This reverts commit d0d404d342092b5ba4398ed3bd8d8ff8f60b5f8a. * allow for `plc_conversion_rate` field to be reset * fetch exchange rate using price list currency and company currency not form currency * clean up	2018-02-12 15:18:57 +05:30
joezsweet	04338cfb4b	removed extra spaces	2018-02-12 10:12:27 +01:00
sivankar	621740efd9	Enhancement and bug fix in batch (#12753 ) * merge shelf like and manufacturing date * setting default manufacturing date as todays date * setting default manufacturing date as todays date * fix * Improvements to batch auto naming (#12496) * refactor: add new function - batch_uses_naming_series use batch_uses_naming_series in autoname method * properly update naming series on delete: - add new functions - get_batch_prefix, get_batch_naming_series_key, get_batch_naming_series - refactor get_name_from_naming_series - add after_delete method * add documentation and rename some functions * PEP 8 compliance * test * added support for jinja template and added validation if expiry date is set or not if item has_expiry_date is set * bug fix, renamed item_code to item as in batch doctype we refer 'item code' by 'item' * added manufacturing date wise sort * added prefix to expiry date and manufacturing date	2018-02-12 14:33:40 +05:30
rohitwaghchaure	0aeeb7e02c	[Fix] Item variant details report (#12869 )	2018-02-12 11:44:39 +05:30
rohitwaghchaure	7477899d2e	Formatter, code cleanup (#12852 )	2018-02-12 11:25:58 +05:30
Manas Solanki	a884bd9c6a	don't set the ordered_qty in SO on load from BIN	2018-02-09 13:12:07 +05:30
Saurabh	ab8c7e616e	resolved merge conflicts	2018-02-08 15:17:15 +05:30
pawan	2b885beaee	code changes for single stock entry	2018-02-07 19:06:18 +05:30
rohitwaghchaure	b553b7a69d	PDC Enhancements (#12462 )	2018-02-07 18:32:51 +05:30
joezsweet	097a98cc10	fixed spaces to tabs	2018-02-05 13:16:00 +01:00
joezsweet	5f473611bd	space to tab	2018-02-05 12:05:11 +01:00
Prateeksha Singh	b8e9c9be08	[hub] form (info) view for items	2018-02-05 12:58:30 +05:30
Nabin Hait	2ef1f84041	Fixed merge conflict	2018-02-03 09:14:53 +05:30
tundebabzy	a829d5a4d5	Merge branch 'hotfix' into issue-12535-1	2018-02-01 16:56:05 +01:00
Nabin Hait	b9ce104b09	Opening balance in stock ledger report (#12729 )	2018-02-01 14:58:50 +05:30
Nabin Hait	7ba092eaf9	Fixes for making stock entry against Pro Order (#12721 )	2018-02-01 10:51:27 +05:30
rohitwaghchaure	32a5f38595	Merge pull request #12633 from vishdha/issue_12388 [fix] Sales order link to purchase order not working fixed	2018-01-31 17:30:43 +05:30
tundebabzy	4990cf7783	remove stray code	2018-01-31 11:35:56 +01:00
Nabin Hait	ec2c9ec897	Merge branch 'master' into develop	2018-01-31 15:39:16 +05:30
Zarrar	4e05f02038	error in throw message rectify (#12719 )	2018-01-31 15:33:51 +05:30
Vishal	fc05cc4e70	[fix] link with supplier quotation to purchase order	2018-01-31 15:10:39 +05:30
Vishal	4dc329f5ea	[fix] Sales order link to purchase order not working fixed	2018-01-31 15:10:39 +05:30
tundebabzy	2f4854ad1a	create new dialog everytime (#12696 )	2018-01-30 12:18:15 +05:30
Nabin Hait	585254456e	Check credit limit while making DN, if bypassed on SO (#12702 )	2018-01-30 12:11:22 +05:30
Saurabh	59c915f599	Merge branch 'master' into develop	2018-01-29 18:53:54 +05:30
Zlash65	f7a4d4221b	check precision with qty	2018-01-29 18:47:21 +05:30
Saurabh	d581ff40ea	Merge branch 'master' into develop	2018-01-29 17:42:37 +05:30
Zarrar	5bf77beb83	precision while checking qty (#12688 )	2018-01-29 16:47:52 +05:30
Saurabh	03f6b3e588	resolved merge conflicts	2018-01-29 16:25:33 +05:30
tundebabzy	794ecda618	corrected wrong get_diff arguments	2018-01-27 05:54:40 +01:00
tundebabzy	db4fd7f5b6	Improvements to batch auto naming (#12496 ) * refactor: add new function - batch_uses_naming_series use batch_uses_naming_series in autoname method * properly update naming series on delete: - add new functions - get_batch_prefix, get_batch_naming_series_key, get_batch_naming_series - refactor get_name_from_naming_series - add after_delete method * add documentation and rename some functions * PEP 8 compliance * test	2018-01-26 11:00:20 +05:30
rohitwaghchaure	bfa898ff9b	[Fix] System pull the valuation rate even if allow zero valuation rate is enabled (#12537 )	2018-01-26 10:59:00 +05:30
rohitwaghchaure	3574c96c8c	Update item_dashboard_list.html	2018-01-25 17:11:52 +05:30
Vinayak Jethe	5743ce2b6b	Made changes as per suggestions	2018-01-25 13:37:20 +05:30
Vinayak Jethe	549c196beb	Fixes issue #12512	2018-01-24 19:47:59 +05:30
Vinayak Jethe	46c82c45e0	Revised changes for codacy	2018-01-24 14:24:58 +05:30
Vinayak Jethe	2c8ce5a717	Fixes issue #12512	2018-01-24 13:51:26 +05:30
Saurabh	fb2f97391f	resolved merge conflicts	2018-01-24 11:24:10 +05:30
Saurabh	4b9a55b0ef	[fix] If buying or selling price list not found, return empty dict	2018-01-24 07:48:56 +05:30
Saurabh	c8399fd093	Merge pull request #12614 from rohitwaghchaure/removed_set_only_once_for_batch_serialno Disabled property set only once for has serial no and has batch no field in item doctype	2018-01-23 18:08:56 +05:30
Rohit Waghchaure	266e66cd1b	Disabled property set only once for has serial no and has batch no field in item doctype	2018-01-23 18:06:12 +05:30
Shreya	dfae11bcee	disabled warehouse in list view	2018-01-23 16:46:24 +05:30
pawan	9b7093e4d6	validation code improvement	2018-01-23 11:39:53 +05:30
Shreya	e2b31085a7	fetch uom conversion factor in material request	2018-01-23 10:54:23 +05:30
pawan	6a8eba891e	Move target warehouse validation to submit	2018-01-23 00:57:44 +05:30
pawan	4ab6ef89a1	code alignment	2018-01-22 17:31:40 +05:30
pawan	67867529c0	[fix] #8540	2018-01-22 17:08:39 +05:30
Saurabh	ef31637549	Merge branch 'master' into develop	2018-01-22 15:29:15 +05:30
Rohit Waghchaure	f83f6aae22	[Fix] Wrong projected qty for warehouse group in the process of reorder item making extra material requests	2018-01-20 15:44:38 +05:30
Nabin Hait	570e29d5e7	Fixed merge conflict	2018-01-17 18:56:02 +05:30
rohitwaghchaure	60febc5465	[Fix] Gross profit validation issue (#12516 )	2018-01-17 14:40:59 +05:30
Vishal Dhayagude	052b51ab20	[fix] Fetch UOM conversion and stock_uom from BOM into material request (#12513 ) * [fix]Fetch UOM conversion and stock_uom from BOM into material Request * Update material_request.js	2018-01-17 14:39:54 +05:30
umaepoch	832453a757	Added Delay days field to Ordered Items to be Delivered report (#12439 ) * Added Delay Days to Ordered Items to be Delivered Report * Ordered Items to be Delivered	2018-01-15 15:43:16 +05:30
Saurabh	35d8ce4fbd	resolved merge conflicts	2018-01-12 16:58:32 +05:30
tundebabzy	e1e38a4bb9	Autoname for Batch DocType #12302 (#12461 ) * add new fields: check: use naming series data: series prefix * refactor autoname: use new function - get_name_from_hash * add new function - get_name_from_naming_series * refactor autoname to generate name from naming series * PEP 8 compliance	2018-01-12 16:30:02 +05:30
tundebabzy	df023bff7f	add posting_date/transaction_date to list_view (#12453 )	2018-01-12 16:27:29 +05:30
Sachin Mane	24e2735e19	Add 'Shelf Life' (Item) and Manufacturing date (Batch) (#12381 ) * fix bug in batch number selector. fetch and display batch numbers only for the given item code. * remove print statement * Fix error on selecting Chattisgarh in address Fix error on selecting Chattisgarh in address because of spelling mistake * Revert "Fix error on selecting Chattisgarh in address" * Add Shelf Life (Item) and Manufacturing Date (Batch) fields * remove console.log * fix ci issues * Update batch.js	2018-01-11 12:45:50 +05:30
Charles-Henri Decultot	47ad7fb129	Multiple variant correction (#12424 )	2018-01-11 12:29:45 +05:30
rohitwaghchaure	752d21e658	Code cleanup for item price stock report and fix report was not exporting properly in excel (#12427 )	2018-01-11 12:28:48 +05:30
tundebabzy	6f75885d86	better validation message	2018-01-10 23:14:13 +01:00
tundebabzy	76dddbf26e	Merge branch 'develop' into multi-barcode	2018-01-10 21:49:27 +01:00
Zarrar	94f9f48d70	set from_warehouse only if purchase_order and purpose found (#12398 )	2018-01-10 16:29:40 +05:30
Saurabh	892a7a6980	resolved merge conflicts	2018-01-09 12:05:20 +05:30
rohitwaghchaure	412e044e8f	[Fix] Error in stock move from batch dashboard (#12377 )	2018-01-09 11:27:35 +05:30
Shreya Shah	44fa9a6d9d	Last purchase rate button added back (#12135 ) * last purchase rate button added * triggers to update rate on button * updated modified column in buying settings * moved trigger to get_item_details.py * hide get_last_rate button depending on buying settings	2018-01-08 14:58:20 +05:30
Nabin Hait	3a972c4d85	Precision issue in stock reconciliation	2018-01-08 12:35:05 +05:30
Nabin Hait	07e5376043	Fixes and cleanups of reserve qty for subcontracting	2018-01-05 18:19:59 +05:30
Nabin Hait	cab8dfc5fb	Fixed merge conflict	2018-01-05 14:15:39 +05:30
Nabin Hait	cb495fb33b	Merge branch 'master' into develop	2018-01-05 13:17:00 +05:30
Nabin Hait	28d0230e56	Multiple small fixes	2018-01-05 13:14:25 +05:30
tundebabzy	8f44d1c63d	Payment Terms in Delivery Note #12167 (#12293 ) * add Payment Terms Template field to delivery note: - This helps for users who create invoice from Sales Invoice - Field is hidden in print - Field is not coupled to Payment Schedule table. * do nothing in payment_terms_template trigger if doctype is Delivery Note	2018-01-05 12:46:50 +05:30
rohitwaghchaure	bc2c83ee3c	Companywise default tax template (#12290 ) * Companywise default tax template * Fix test cases	2018-01-05 12:42:02 +05:30
Nabin Hait	c33788a91b	Show standard rate only in unsaved Item	2017-12-29 15:42:50 +05:30
Shreya Shah	df0dd8be5f	Travis fix for client side tests (#12224 ) * salary slip test fix * attendance tool test fix * timeout after routing	2017-12-29 14:04:46 +05:30
rohitwaghchaure	fe22686a8f	Update last purchase rate from the purchase invoice (#12189 )	2017-12-28 16:11:27 +05:30
Nabin Hait	ca674bec42	Set numeric ranges in Item tamplate if blank (#12199 )	2017-12-28 12:35:11 +05:30
Nabin Hait	123759aff7	Fixes for travis (#12161 ) * Fixes for travis * Testcase fixes for get_item_details * Testcase fixes for get_item_details * Travis fixes * Travis fixes	2017-12-26 17:50:34 +05:30
Nabin Hait	92615901a7	Fixed merge conflict	2017-12-25 13:41:04 +05:30

... 19 20 21 22 23 ...

4507 Commits