Commit Graph

3245 Commits

Author SHA1 Message Date
Deepesh Garg
5f2afb8803 fix: Do not fetch batch items and serialized items in stock reconciliation (#17725) 2019-05-27 13:42:29 +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
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
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
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
Deepesh Garg
ea9c758648
Merge pull request #17331 from deepeshgarg007/inactive_items
feat: Inactive items report
2019-04-24 22:30:54 +05:30
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