Marica
048de30cb5
Merge branch 'develop' into pick-list-enhance
2020-04-07 14:05:05 +05:30
rohitwaghchaure
f8e8333d77
Merge pull request #21174 from rohitwaghchaure/material_request_incorrect_filter_issue_develop
...
fix: material request type manufacture shows items with Is Purchase I…
2020-04-07 12:06:18 +05:30
marination
e05013ede3
feat: Scan Barcode in Purchase Receipt
2020-04-06 22:13:13 +05:30
Rohit Waghchaure
5317907e15
fix: material request type manufacture shows items with Is Purchase Item enabled
2020-04-06 17:53:16 +05:30
Marica
e58d1b1b9f
Merge branch 'develop' into bin-requested-qty
2020-04-06 15:54:51 +05:30
Saqib Ansari
474222074b
fix: tests
2020-04-06 12:40:41 +05:30
Deepesh Garg
aa775f87b2
fix: Setting to toggle customer and supplier warehouse for inter warehouse transfer ( #21142 )
...
* fix: Setting to toggle customer and supplier warehouse for inter warehouse transfer
* fix: Use cint
2020-04-06 10:23:06 +05:30
marination
2a9a5352bb
fix: Test Cases and block expense on outward entry
...
- Throw error if rate present against Customer Provided Item in DN and SI
- Added test cases for Sales Invoice and Delivery Note
- Allow SI and DN with 0 rate in Test
2020-04-03 18:25:21 +05:30
marination
fd04e96bdd
fix: Mapping Customer Provided Material Request to Stock Entry
...
- Fixed inability to map Material Request to Stock Entry
- Commonified Customer Provided Item validation
2020-04-03 15:46:48 +05:30
Marica
66c4a08703
fix: Update Received Qty in Material Request as per Stock UOM ( #21054 )
...
* fix: Update Received Qty in Material Request as per Stock UOM
* fix: Process each PR only once
* fix: minor suggested changes
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-04-03 10:07:06 +05:30
Saqib
438e0433a3
fix: cannot set warehouse on deleting all so items and updating them ( #21078 )
...
* fix: cannot set warehouse on deleting all so items and updating them
* fix: travis
* fix: docname is editable in update items dialog
2020-04-03 10:02:56 +05:30
marination
9a39bcd031
fix: Fixed Test Cases for Material Request
...
- Reduce quantity on Material Transfer/Issue
- No effect on Customer Provided Material Request
2020-04-02 19:36:21 +05:30
marination
686a09620d
fix: Commonified code and added server side validation
2020-04-02 13:51:25 +05:30
marination
6f0dc8257c
fix: Typo in stock level validation in Stock Ledger
2020-04-01 11:04:14 +05:30
rohitwaghchaure
98a91f489d
Merge pull request #21015 from marination/so-mr-mapping-uom
...
fix: UOM fixes in Sales Order,Material Request & Production Plan
2020-03-31 16:24:37 +05:30
rohitwaghchaure
7845961d46
Merge pull request #21017 from Alchez/dev-remove-same-item-validation
...
feat: allow BOM to use same item as raw material (develop)
2020-03-31 16:04:26 +05:30
rohitwaghchaure
bc415331a2
Merge pull request #21003 from Alchez/dev-stock-entry-fg-validation
...
fix: allow target warehouses to be changed for work order stock entries (develop)
2020-03-31 15:44:13 +05:30
Saqib
25846cccbd
fix: warehouse_account_map not getting reset for diff company transac ( #20995 )
...
* fix: warehouse_account_map not getting reset for diff company transaction
* fix: potential key errors while fetching warehouse_account_map
* fix: travis
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-03-31 15:31:15 +05:30
rohitwaghchaure
86aff0de1f
fix: serial no scan not adding the serial nos in stock entry ( #21083 )
2020-03-31 15:26:45 +05:30
Deepesh Garg
fbf6e56d86
fix: Expense account currency validation in Landed Cost voucher ( #21073 )
...
* fix: Expense account currency validation in Landed Cost voucher
* fix: Remove unused imports
2020-03-31 10:45:32 +05:30
Deepesh Garg
a47e42c515
Merge pull request #21087 from nabinhait/item_defaults_fix_dev
...
fix: Add item defaults based on global settings only if default company and warehouse is mentioned
2020-03-29 21:55:25 +05:30
Deepesh Garg
f9f39f5a7e
Merge pull request #21103 from nextchamp-saqib/stock-ledger-warehouse-filter
...
chore: [ux] filter warehouse based on company
2020-03-28 21:09:46 +05:30
Saqib Ansari
ed3553f795
chore: [ux] filter warehouse based on company
2020-03-28 19:12:59 +05:30
Deepesh Garg
c12a8040ef
Merge branch 'develop' into item_defaults_fix_dev
2020-03-27 21:51:00 +05:30
Nabin Hait
fe000e20e8
fix: Add item defaults based on global settings only if default company and warehouse is mentioned
2020-03-27 19:24:47 +05:30
marination
815c36a4eb
fix: Updated Bin Requested Qty logic
2020-03-26 15:46:27 +05:30
Marica
38cba153b5
fix: Make shelf life mandatory in Batched Item if it has expiry date ( #21044 )
2020-03-26 13:29:02 +05:30
Marica
b856aae651
fix: Project field in Stock Entry Detail should be editable ( #20999 )
2020-03-26 13:23:49 +05:30
Saqib
faea85451f
feat: auto set batch no on serial no selection ( #20757 )
...
* feat: auto set batch no on serial no selection
* fix: dialog not shown if set warehouse selected
* fix: typo
* fix: merge conflict
* fix: callback no getting called after serial no selected
* fix: available batch qty not fetched without set_warehouse selected
* fix: item batch not synced with dialog batch table
2020-03-26 13:18:57 +05:30
rohitwaghchaure
b6bb56e9bf
Merge pull request #21037 from rohitwaghchaure/fixed_batch_selector_popup_develop
...
fix: batch selection popup not coming for stock entry
2020-03-24 16:32:21 +05:30
Rohit Waghchaure
5c1404e878
fix: batch selection popup not coming for stock entry
2020-03-24 11:40:03 +05:30
Rohan
7ea79933b3
fix: handle error handling ( #20815 )
2020-03-23 14:54:33 +05:30
Rohan
879c6bfb44
Merge branch 'develop' into dev-stock-entry-fg-validation
2020-03-23 14:50:02 +05:30
Deepesh Garg
f8b54bd301
Merge pull request #21005 from rohitwaghchaure/qty_must_be_positive_for_stock_entry_develop
...
fix: stock entry qty must be positive
2020-03-21 20:46:10 +05:30
Rohan
b7d84725e8
fix: add warehouse check for FG item
2020-03-20 18:49:11 +05:30
marination
73c8d23a79
fix: UOM fixes in Sales Order,Material Request & Production Plan
2020-03-20 17:52:28 +05:30
Rohit Waghchaure
5e4e2dbd03
fix: stock entry qty must be positive
2020-03-19 14:53:37 +05:30
Rohan
ce90848161
fix: allow target warehouses to be changed for work order stock entries
2020-03-19 13:22:58 +05:30
Deepesh Garg
dbeb77e745
fix: Unable to submit landed cost voucher ( #20977 )
2020-03-19 11:03:03 +05:30
Deepesh Garg
fa6454b9c5
fix: Update is_tree field in Tree doctypes ( #20981 )
2020-03-19 11:01:23 +05:30
rohitwaghchaure
e4cd12506c
Merge pull request #20991 from rohitwaghchaure/fixed_reserved_qty_for_production_develop
...
fix: reserved qty for production issue for partial completion of work…
2020-03-19 09:37:43 +05:30
Deepesh Garg
6b36fae531
Merge pull request #20990 from rohitwaghchaure/fixed_shortage_qty_in_stock_projected_qty_report_develop
...
fix: shortage qty in stock projected qty report
2020-03-19 09:33:03 +05:30
Rohit Waghchaure
dd13d0a9a9
fix: reserved qty for production issue for partial completion of work order
2020-03-19 09:29:17 +05:30
Rohit Waghchaure
cd2478a527
fix: shortage qty in stock projected qty report
2020-03-19 09:27:53 +05:30
Nabin Hait
ddc3bb2251
fix: Multiple fixes for travis ( #20924 )
...
* fix: Multiple fixes for travis
* fix: Multiple fixes for travis
* fix: Run dashboard patch if table already exists
* fix: Multiple fixes for travis
* fix: deletion of auto-created batch
2020-03-17 17:04:18 +05:30
marination
e1f499ae1b
fix: Pick List Enhancements
2020-03-17 11:47:11 +05:30
Marica
b10adbb161
fix: Item alternative must have similar fields as original item ( #20796 )
...
* fix: Item alternative must have similar fields as orignal item
* fix: Using db.get_values and meta instead of get_value and get_doc
* fix: Made code more DRY
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-03-17 10:56:59 +05:30
Saqib
1306f5005b
fix: is_pos gets reset on making s_inv from s_ord ( #20886 )
...
* s_inv has is_pos default set as 1
2020-03-16 17:51:00 +05:30
Saqib
de4f6901d6
fix: serial_no_selector showing for non serialized batched item ( #20851 )
2020-03-16 16:29:10 +05:30
Shivam Mishra
aecf9d6168
Merge branch 'develop' into desk-settings-card
2020-03-12 17:13:03 +05:30
Shivam Mishra
451382e08e
feat: update desk pages
2020-03-12 16:34:34 +05:30
Saqib
6ec4618914
fix: travis ( #20903 )
2020-03-11 16:04:00 +05:30
Shivam Mishra
1fd1852c6a
Merge branch 'develop' into yet-another-desk
2020-03-10 18:20:27 +05:30
Marica
508ad51d9c
fix: Validate Serial No/Batch No against unserialized Item in Stock Reconciliation ( #20858 )
2020-03-09 18:13:41 +05:30
Saqib
b978d79573
fix: show uom in print formats instead of stock uom ( #20843 )
...
Co-authored-by: Saqib Ansari <saqibansari@Saqibs-MacBook-Pro.local>
2020-03-06 11:03:46 +05:30
Shivam Mishra
0310366d5a
fix (cleanup): remove incomplete dependencies data
2020-03-05 11:28:40 +05:30
Shivam Mishra
8a8e8d6c5c
feat: added base pages for desk
2020-03-02 16:56:31 +05:30
Marica
ed25ec7ee5
chore: Item Price and Product Bundle Form cleanup ( #20772 )
...
* chore: Item Price and Product Bundle Form cleanup
* fix: Trailing comma
2020-03-02 15:51:14 +05:30
Saqib
e9ac3e0d64
feat: link serial no to batch no ( #20778 )
...
* feat: link serial no to batch no
* fix: test cases
2020-03-02 15:02:58 +05:30
rohitwaghchaure
b5a670cdb9
fix: serial no material transfer performance issue ( #20747 )
2020-02-27 18:18:10 +05:30
Lokesh Waingankar
2866617c82
fix: 'Last Purchase Rate' taking wrong on BOM ( #20689 )
...
* fix: 'Last Purchase Rate' taking wrong on BOM. #20228
* fix: Added condition for None purchase order and purchase receipt (#20689 )
* fix: fetch last purchase rate
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-02-27 13:21:14 +05:30
abhijitkumbharInd
ba8840727a
Create a new item on Material Request showing error Item None not found. #20608 ( #20731 )
2020-02-26 12:48:36 +05:30
rohitwaghchaure
7229f694ea
fix: rate and amount in material request copying from sales order ( #20717 )
2020-02-26 11:28:08 +05:30
rohitwaghchaure
1e6788b028
fix: reorder material request not created if doctype has custom mandatory field ( #20719 )
2020-02-26 11:25:34 +05:30
Andy Zhu
75d9d79fac
fix: missing assign item's expense_account
...
As in dict object "ret", missing assign item's expense_account will cause it then fetches the default stock_adjustment_account in 'Company'.
2020-02-26 10:49:48 +13:00
Rucha Mahabal
6071313965
fix: document creation via onboarding slide ( #20644 )
...
* fix: defaults not set in doc created via Onboarding Slide
* fix: default company not set in Supplier
2020-02-20 12:57:21 +05:30
Deepesh Garg
23aa5c6332
Merge pull request #20643 from abhijitkumbharInd/develop
...
fix: HSN/SAC Error while creating a new item and not selecting the fi…
2020-02-19 19:23:10 +05:30
Deepesh Garg
40546d8af9
Merge pull request #20663 from marination/stock-settings-query
...
fix: Set Query on warehouse fields in Stock Settings
2020-02-19 18:57:24 +05:30
marination
120f75026f
fix: Server side validation for Warehouses
2020-02-19 11:17:58 +05:30
marination
bde13b98e0
fix: Set Query on warehouse fields in Stock Settings
2020-02-18 21:35:59 +05:30
Deepesh Garg
15ff6a594b
feat: Inter warehouse stock transfer on valuation rate with taxation ( #20083 )
...
* fix: Validation for target warehouse
* feat: Get items on valuation rate in delivery note on Internal transfers
* fix: Create Inter company purchase receipt from delivery note
* feat: Inter company stock transfer on valuation rate with taxation
* fix: Add from warehouse in purchase invoice
* fix: Use get_value instead of get_cached_value
* fix: Get incoming rate instead of valuation rate
* fix: GL entry for from warehouse in purchase receipt
* fix: GL Entries fixes in purchase invoice
* fix: Address and tax fetching fixes
* fix: Add test case for stock transfer via purchase receipt
* fix: Code cleanup, added validations and test cases
* fix: Validation for supplier warehouse
* fix: Test Cases
* fix: Change validation condition
* fix: Address fixes while creating Purchase Receipt from delivery note
* fix: Set taxes while creating Purchase Receipt from Delivery Note
* fix: Update set_missing_value function
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-02-18 12:28:41 +05:30
abhijitkumbharIND
0047fcf7ad
fix: HSN/SAC Error while creating a new item and not selecting the field. #20590
2020-02-17 18:12:58 +05:30
Marica
db00270895
feat: Added popup to 'Get Items from Open Material Requests' in Purchase Order ( #20371 )
...
* feat: Added popup to 'Get Items from Open Material Requests' in Purchase Order
* fix: Query with filters, UX enhancements and cleanup
2020-02-17 15:58:08 +05:30
Himanshu Mishra
b76d2d4d98
Fix: Syntax error in get_child_warehouses
2020-02-12 13:22:05 +05:30
rohitwaghchaure
490b843ecf
Merge branch 'develop' into fixed_purchase_receipt_time_out_error_develop
2020-02-11 19:56:11 +05:30
rohitwaghchaure
3d98c59585
Merge pull request #20555 from ashish-greycube/fix_actual_qty_for_backflush
...
fix: backflush raw material based on - Material Transferred for Manufacture
2020-02-11 19:50:36 +05:30
vishal
998de83d48
fix: filter serial no based on batch no
2020-02-11 12:24:44 +05:30
Rohit Waghchaure
e55a927eee
fix: test cases
2020-02-10 14:39:26 +05:30
ashish-greycube
121636f9bf
fix: backflush raw material based on - Material Transferred for Manufacture
2020-02-10 10:49:50 +05:30
Rohit Waghchaure
f0d27528e3
fix: time out error while submitting the purchase receipt which has more than 100 serial nos
2020-02-07 14:42:33 +05:30
Deepesh Garg
d8e57d3d5a
fix: Unable to submit landed cost voucher ( #20493 )
...
* fix: Unable to submit landed cost voucher
* fix: Test case for multiple landed cost voucher against a Purchase receipt
* fix: Test Case
2020-02-03 18:53:34 +05:30
Pranav Nachnekar
6c14a08631
fix: disallow quick entry for doctypes with tree view ( #20452 )
2020-02-03 17:05:26 +05:30
Suraj Shetty
2f67647f7b
Merge branch 'develop' of https://github.com/frappe/erpnext into fix-incorrect-translations
2020-01-29 15:06:50 +05:30
Suraj Shetty
48e9bc3fc9
fix: Incorrect translation syntax
2020-01-29 15:06:18 +05:30
Deepesh Garg
565a810bf7
Merge pull request #20454 from marination/stock-ledger-qty-column
...
fix: 'In Qty' and 'Out Qty' columns in Report Stock Ledger
2020-01-29 09:49:55 +05:30
Deepesh Garg
b61b8d7ced
fix: Remove comma
2020-01-29 09:49:26 +05:30
marination
372c5e51d5
fix: 'In Qty' and 'Out Qty' columns in Report Stock Ledger
2020-01-28 16:04:49 +05:30
Deepesh Garg
0c31d62edd
Merge pull request #20447 from Alchez/dev-driver-address-fetch
...
fix: only fetch driver address if not set (develop)
2020-01-28 09:20:26 +05:30
rohitwaghchaure
7fda3a12cc
Merge pull request #20445 from rohitwaghchaure/copy_to_warehouse_to_target_warehouse_in_delivery_note_item
...
fix: to warehouse not set in the customer warehouse
2020-01-27 19:29:19 +05:30
Rohan Bansal
ce17a546b9
fix: only fetch driver address if not set
2020-01-27 18:08:11 +05:30
Rohit Waghchaure
2dff28498f
fix: to warehouse not set in the customer warehouse
2020-01-27 17:56:25 +05:30
Deepesh Garg
1e77a1374d
Merge pull request #20393 from rohitwaghchaure/unlink_reference_name_from_batch_on_cancel_of_stock_transactions_develop
...
fix: unlink references from batch on cancellation of stock transactions
2020-01-23 22:40:26 +05:30
Rohit Waghchaure
8996b7d8a4
delete the auto created batch
2020-01-23 17:44:19 +05:30
Rohit Waghchaure
4f4dbf1996
fix: unlink references from batch on cacnellation of stock transactions
2020-01-23 12:45:45 +05:30
Rohit Waghchaure
0cc4cf2cf5
fix: Zero division error while making finished good entry against the work order
2020-01-21 19:28:08 +05:30
byugandhara
239f0d529e
Fix: Spelling correction in throw message of stock entry( #20337 ) ( #20353 )
2020-01-21 15:47:27 +05:30
rohitwaghchaure
6ae61a1693
fix: incorrect number of gl entries issue ( #20352 )
2020-01-20 17:53:19 +05:30
Marica
7653a8b9fa
fix: 'get_additonal_costs' is not defined ( #20344 )
...
* fix: 'get_additonal_costs' is not defined
* fix: Re-added get_items on Work order change.
2020-01-20 15:46:36 +05:30
Nabin Hait
03b116dd01
fix: deprecated fetching item price based on min_qty ( #20347 )
2020-01-20 15:45:04 +05:30
Nabin Hait
e321fbb0d5
fix: Multiple fixes based on testing on pre-release branch ( #20301 )
...
* fix: Multiple fixes based on testing on pre-release branch
* fix: reload hr settings
2020-01-16 13:37:25 +05:30