Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
27,680 Commits 3 Branches 0 Tags 1 GiB
9eb091162a
Commit Graph

3333 Commits

Author SHA1 Message Date
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
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