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 |
|