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