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

3306 Commits

Author SHA1 Message Date
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
Himanshu Warekar
810dde2e0b fix: show get items even if note has been amended 2019-04-16 12:20:35 +05:30
Nabin Hait
29997e2631 fix: Invoice against partially returned DN/PR 2019-04-16 09:55:42 +05:30
Nabin Hait
e7e2e93419
Merge pull request #17183 from netchampfaris/duplicate-variant-check-d 
fix: Validate variant attributes only if is_new
 2019-04-15 10:08:28 +05:30
Faris Ansari
581e5fbfda fix: Set default value for Packing Unit as 0 
The default value 1 assumes Items will be always packed in integer
quantities. This is not the usual case.
 2019-04-12 12:39:12 +05:30
Mangesh-Khairnar
3ab2a18088
Merge branch 'develop' into so-on-hold 2019-04-11 15:49:06 +05:30
Faris Ansari
6472ed2c1e
Merge pull request #16941 from Mangesh-Khairnar/po-on-hold 
Feature: Purchase order on hold
 2019-04-11 15:36:54 +05:30
Nabin Hait
89206e74d0 fixed merge conflict 2019-04-11 12:31:14 +05:30
Rohit Waghchaure
9665a531fc fix: item variant test cases 2019-04-11 09:56:00 +05:30
Rohit Waghchaure
f3a9552e48 fix: item variant test cases 2019-04-10 17:57:09 +05:30
Faris Ansari
4da3d0015a fix: Validate variant attributes only if is_new 2019-04-09 17:40:53 +05:30
Mangesh-Khairnar
16c4fd6733 Merge branch 'develop' of https://github.com/frappe/erpnext into so-on-hold 2019-04-09 12:13:45 +05:30
Mangesh-Khairnar
1934a76cd8 feat: Add status field in multiple reports linked with purchase order and sales order creation (#17107) 
* enhancement: add status field in ordered itemd to be delivered

* enhancement: add status field in purchase order itemd to be received

* enhancement: add a status column in the billed reports
 2019-04-08 16:29:59 +05:30
Nabin Hait
f1698bb2df fix: unique variant based on 2019-04-08 14:59:43 +05:30
rohitwaghchaure
bc02ee23e0
Merge pull request #17078 from rohitwaghchaure/unlinked_advance_payment_on_cancellation_of_order 
feat: provision to unlink advance payment entry on cancelation of order
 2019-04-06 12:30:05 +05:30
Nabin Hait
843e440191
Merge branch 'hotfix' into validate_stock_transaction_v11 2019-04-05 15:41:26 +05:30
Nabin Hait
9302a19d74
Merge pull request #17135 from hrwX/validate_stock_transaction_v12 
fix(Item): check transactions for batch, serial check
 2019-04-05 15:40:19 +05:30
Nabin Hait
603dce428b
Merge pull request #17144 from nabinhait/variant-fix 
fix: Default variant Based on
 2019-04-05 15:38:15 +05:30
rohitwaghchaure
e334413b34
Merge pull request #17141 from rohitwaghchaure/incorrect_pos_profile_selected_if 
fix: incorrect auto POS profile selected in the sales invoice
 2019-04-05 13:04:05 +05:30
Mangesh-Khairnar
3d667b4c94 Merge branch 'develop' of https://github.com/frappe/erpnext into po-on-hold 2019-04-05 12:11:26 +05:30
Nabin Hait
a3357e4e86 fix: Default variant Based on 2019-04-05 12:10:36 +05:30
Rohit Waghchaure
e8e3fb175d fix: incorrect POS profile selected 2019-04-05 09:57:52 +05:30
Rohit Waghchaure
f7a83cb4f5 fix: incorrect POS profile selected 2019-04-05 00:42:48 +05:30
Himanshu Warekar
cdd79e3c40 fix: check transactions for batch, serial check 2019-04-04 15:26:35 +05:30
Himanshu Warekar
7f253b679a pull from hotfix 2019-04-04 15:19:44 +05:30
Himanshu Warekar
28db545947 fix: check transactions for batch, serial check 2019-04-04 15:02:25 +05:30
Nabin Hait
2df623c693
Merge pull request #17072 from kennethsequeira/auto-re-val 
fix: spelling in validation message for Auto-reorder
 2019-04-04 11:40:08 +05:30
Nabin Hait
1e5664ba5f
Update item.py 2019-04-04 11:39:55 +05:30
Rushabh Mehta
3720e64506 fix(kaizen): warehouse account description 2019-04-04 09:02:41 +05:30
Rushabh Mehta
1f0edabda8 fix(kaizen): warehouse account description 2019-04-04 08:58:34 +05:30
Rohit Waghchaure
5fa9a7a1b4 feat: unlink advance payment entry on cancelation of order 2019-04-01 00:40:38 +05:30
Nabin Hait
da7a193f11 fix(stock): Fixed stock balance and stock ledger report 2019-03-30 15:53:04 +05:30
Kenneth Sequeira
4f5839eb65 fixed spelling in validation message 
fixed typo in auto-reorder validation message
 2019-03-30 15:37:51 +05:30
rohitwaghchaure
725f37cea5
Revert "fix(Delivery Note): Fix issue credit note" 2019-03-30 13:21:50 +05:30
rohitwaghchaure
f3a1fa0bae
Revert "Fix(Delivery Note): Fix issue credit note" 2019-03-30 12:33:54 +05:30
rohitwaghchaure
b6505bddeb
Merge pull request #17025 from hrwX/fix_issue_credit 
fix(Delivery Note): Fix issue credit note
 2019-03-30 12:31:29 +05:30
rohitwaghchaure
5fdbdd50f9
Merge pull request #16950 from hrwX/fix-issue-credit 
Fix(Delivery Note): Fix issue credit note
 2019-03-30 12:31:18 +05:30
Rushabh Mehta
c4599c21c3 fix(test): item variant 2019-03-29 18:30:00 +05:30
Rushabh Mehta
048e5f44b5 fix(test): item variant 2019-03-29 14:34:14 +05:30
Nabin Hait
d4e038b6ca Merge branch 'hotfix' of https://github.com/frappe/erpnext into develop 2019-03-29 12:41:48 +05:30
Nabin Hait
0a90ce5cf6 Refactored deferred revenue booking logic 2019-03-28 19:43:02 +05:30
Himanshu Warekar
a86f3a7d80 remove issue credit note 2019-03-27 10:01:18 +05:30
rohitwaghchaure
fa638443bc
Merge pull request #16925 from rohitwaghchaure/stock_entry_enhancements 
feat: stock entry enhancements
 2019-03-26 22:50:54 +05:30
Nabin Hait
8aaee57921 fix(uom): Get items as per UOM defined in BOM, fixes #15081 2019-03-26 16:53:13 +05:30
rohitwaghchaure
e196b3120e
Merge pull request #16961 from rohitwaghchaure/stock_ageing_warehouse_wise 
feat: Stock ageing report warehouse wise
 2019-03-26 16:21:17 +05:30
Rohit Waghchaure
5816fc2801 Renamed subcontract to Send to Subcontractor 2019-03-26 12:52:49 +05:30
Rohit Waghchaure
ffbeb02428 renamed purpose in stock entry 2019-03-26 12:52:32 +05:30
Rohit Waghchaure
c7b916ac46 fix: test cases 2019-03-26 12:52:32 +05:30
Rohit Waghchaure
9faed1b433 feat: added button get items from material request in stock entry 2019-03-26 12:52:31 +05:30
Rohit Waghchaure
8ce2d50706 Added test cases 2019-03-26 12:52:31 +05:30
Rohit Waghchaure
186c758087 feat: added good in transit feature in the stock entry 2019-03-26 12:52:31 +05:30
Rohit Waghchaure
1f2f9cf360 feat: added stock entry type master to select purpose in the stock entry 2019-03-26 12:52:31 +05:30
Mangesh-Khairnar
324e06cba0 Merge branch 'develop' of https://github.com/frappe/erpnext into so-on-hold 2019-03-25 18:51:13 +05:30
Mangesh-Khairnar
5e474f4664 fix: add server-side validation for closed sales order for linked material request 2019-03-25 17:28:20 +05:30
Rushabh Mehta
5770ad9e8c
Merge pull request #16963 from itusedyetnew/develop 
Fix:stock_values_on removed append function on string
 2019-03-25 12:03:53 +05:30
Frappe Bot
b07a5d449d Merge branch 'master' into develop 2019-03-23 07:25:03 +00:00
Nabin Hait
95705412f3 fix(uom): Get items as per UOM defined in BOM, fixes #15081 2019-03-22 13:19:17 +05:30
Rushabh Mehta
7678c7b179
Merge pull request #16869 from rohitwaghchaure/not_able_to_submit_purchase_receipt 
fix: purchase receipt not able to submit because default inventory account has not selected in another company
 2019-03-22 12:47:06 +05:30
Rushabh Mehta
9c43c8f00b
Merge pull request #16554 from SaiFi0102/Brand-Item-Defaults-V12 
feat: Brand Item Defaults (v12)
 2019-03-22 12:46:04 +05:30
Saurabh
3c95387926 Merge branch 'master' into develop 2019-03-20 14:39:49 +05:30
itusedyetnew
8aafbd22de
stock_values_on append function on string 2019-03-20 11:10:41 +05:30
Rohit Waghchaure
ca9f93cdc2 feat: Stock ageing warehouse wise 2019-03-20 02:14:54 +05:30
Rohit Waghchaure
8bfe330b37 feat: pricing rule enhancements 2019-03-19 12:44:30 +05:30
Faris Ansari
5f8b358fd4
Website: Product Configurator and Bootstrap 4 (#15965) 
- Refactored Homepage with customisable Hero Section
- New Homepage Section to add content on Homepage as cards or using Custom HTML
- Products page at "/all-products" with customisable filters
- Item Configure dialog to find an Item Variant filtered by attribute values
- Contact Us dialog on Item page
- Customisable Item page content using the Website Content field
 2019-03-19 11:48:32 +05:30
Himanshu Warekar
2f5f17fcbb refactor: fix issue credit note 2019-03-18 21:46:26 +05:30
Mangesh-Khairnar
873c579bb4 fix: check for both hold and closed status in po 2019-03-18 12:14:25 +05:30
Mangesh-Khairnar
a1afd78723 feat: add validation for on hold purchase order 2019-03-18 12:14:25 +05:30
rohitwaghchaure
fd33c55760
Merge pull request #16865 from rohitwaghchaure/purchase_invoice_asset_issue_not_able_to_submit 
feat: added provision to disable CWIP accounting in asset settings
 2019-03-16 12:18:36 +05:30
Rushabh Mehta
957a3307ae
Merge pull request #16634 from Alchez/hotfix-stock-balance-balance 
fix(stock_balance): Make balance qty and value columns more visible in the Stock Balance report
 2019-03-15 09:02:20 +05:30
Rohit Waghchaure
267723f57b fix: stock ledgre report not working 2019-03-11 14:06:00 +05:30
Rohit Waghchaure
6b33c9b934 fix: purchase receipt not able to submit because default inventory account has not selected in another company 2019-03-08 11:13:35 +05:30
Rohit Waghchaure
821a002125 feat: added provision to disable CWIP accounting in asset settings 2019-03-08 10:51:37 +05:30
Saif Ur Rehman
e62bd893c5 Merge branch 'develop' of https://github.com/frappe/erpnext.git into Brand-Item-Defaults-V12 
# Conflicts:
#	erpnext/stock/doctype/item/test_item.py
 2019-03-08 01:29:39 +05:00
Jay Parikh
9757a603fa Fix Company Default to Total Stock Summary Report 2019-03-06 12:44:41 +00:00
Rohan Bansal
e66f59654e fix(report): Incorrectdata for balance quantity and value in Stock Balance report 2019-03-06 16:04:11 +05:30
Mangesh-Khairnar
86e650c1ed feat: validate linked sales order on material request creation 2019-03-02 20:48:04 +05:30
Mangesh-Khairnar
1c276e9828 feat: validate on hold sales order 2019-03-02 20:48:04 +05:30
Frappe Bot
1fcae10258 Merge branch 'master' into develop 2019-02-28 10:20:48 +00:00
Rohit Waghchaure
b48effebce fix: test case 2019-02-27 19:33:22 +05:30
Rohit Waghchaure
cd34c70670 fix: bom cost update is not working 2019-02-27 18:01:30 +05:30
Saurabh
3dd7ddd838 Merge branch 'master' into develop 2019-02-21 18:25:29 +05:30
Nabin Hait
e08cb3a49b
Merge pull request #16745 from nabinhait/manage-returned-qty 
fix: Consider returned qty while making invoice from DN / PR
 2019-02-21 18:11:37 +05:30
Suraj Shetty
463a3cf8cf
Merge pull request #16725 from deepeshgarg007/item_dashboard 
fix: Item name display issue fix in item dashboard
 2019-02-21 14:42:38 +05:30
Nabin Hait
816a4655a0 fix: Consider returned qty while making invoice from DN / PR 2019-02-21 12:02:36 +05:30
Saurabh
482ebd2c7c Merge branch 'master' into develop 2019-02-20 18:14:18 +05:30
deepeshgarg007
942c894f93 fix: fetch item name in item dashboard 2019-02-19 19:51:23 +05:30
Rohit Waghchaure
389cd6ad63 fix: stop button not working in material request 2019-02-19 19:18:07 +05:30
Sagar Vora
cc6e51c62d Merge branch 'master' into develop 2019-02-19 18:09:49 +05:30
Nabin Hait
8e9d947527
Merge branch 'hotfix' into fix-item-variant-settings-barcodes 2019-02-19 15:07:46 +05:30
Nabin Hait
818ead4041
Merge branch 'hotfix' into purchase-qty-fix 2019-02-19 15:06:10 +05:30
deepeshgarg007
de0f59b818 fix: Removed precision from multiple doctypes 2019-02-19 08:40:16 +05:30
deepeshgarg007
9a19e06856 fix: Change Received qty to accepted qty and validation for indicators 2019-02-18 18:42:15 +05:30
Suraj Shetty
cc0222a28a Remove unwanted barcode field from item 2019-02-16 17:53:23 +05:30
Frappe Bot
74fd5daeb2 Merge branch 'master' into develop 2019-02-15 10:22:33 +00:00
Nabin Hait
b819f104e6
Merge pull request #16653 from nabinhait/item-variants 
fix: Enqueued item variants updation if there are more than 30 variants
 2019-02-15 14:51:14 +05:30
Sagar Vora
921f468950
Merge branch 'hotfix' into get-item-details 2019-02-15 13:03:04 +05:30
Nabin Hait
54f8ed1282
Merge branch 'hotfix' into item-variants 2019-02-14 18:50:11 +05:30
Nabin Hait
0d1ccc357f fix: get item details 2019-02-14 18:30:10 +05:30
Deepesh Garg
4d1bc0ca85 fix: Add total row in analytics report (#16648) 2019-02-13 16:58:46 +05:30
Faris Ansari
a748ca69e7 fix: Validate invalid fields in Item Variant Settings 
- Some fields like barcodes cannot be copied in Item Variants
- Wrote a patch that deletes the fields if they exist
- Also, validate in controller
 2019-02-13 13:02:39 +05:30
rohitwaghchaure
a0aaeafae8
Merge pull request #16644 from rohitwaghchaure/fix_work_order_time_log_msg 
fix: validation message for work order
 2019-02-13 09:49:25 +05:30
Nabin Hait
db527bfb24 fix: Enqueued item variants updation if there are more than 30 variants 2019-02-12 18:30:00 +05:30
Sagar Vora
551f52fd25 Merge branch 'master' into develop 2019-02-12 16:41:24 +05:30
Nabin Hait
fdefbdb23b
Merge pull request #16609 from nabinhait/multipel_fixes 
Multiple fixes
 2019-02-12 13:56:06 +05:30
Rohit Waghchaure
e0412a177c fix: validation message for work order 2019-02-12 11:47:16 +05:30
Rohan Bansal
d635f722fc fix(stock_balance): Make balance qty and value columns more visible 2019-02-11 15:22:01 +05:30
rohitwaghchaure
d95c8cfac3
Merge pull request #16621 from netchampfaris/fix-warehouse-currency 
fix: Set company_currency for Warehouse Tree
 2019-02-11 14:58:02 +05:30
Nabin Hait
bb6438af5a
Merge pull request #16537 from nabinhait/stock-balance-fix 
fix: Fixed error on stock balance report
 2019-02-11 11:00:01 +05:30
Faris Ansari
453964728d fix: Set company_currency for Warehouse Tree 2019-02-09 20:27:42 +05:30
Nabin Hait
17e0513270 fix: message if stock reco is enqueued 2019-02-08 16:56:26 +05:30
Nabin Hait
8d4bb3e327 fix: backflush only if transferred item is present in work order 2019-02-08 16:56:26 +05:30
Nabin Hait
450fe309d6 fix: allow updating title of material request 2019-02-08 16:56:26 +05:30
Aditya Hase
6e1bb60b58 fix(py3): Convert filter to list for indexing 2019-02-07 22:21:05 +05:30
Aditya Hase
e1f867f29f fix(py3): Explicitly convert to float for comparison 2019-02-07 22:21:05 +05:30
Aditya Hase
691c166a56 fix(py3): Use six.text_type instead of unicode 2019-02-07 20:35:52 +05:30
Sagar Vora
da1dc7fa52 Merge branch 'master' into develop 2019-02-05 18:40:39 +05:30
Saif Ur Rehman
590491779a Merge branch 'develop' of https://github.com/frappe/erpnext.git into Brand-Item-Defaults-V12 
# Conflicts:
#	erpnext/stock/doctype/item/item.py
 2019-02-02 02:49:04 +05:00
Saif Ur Rehman
00aaa48779 test(Item): test_item_defaults 2019-02-02 02:43:44 +05:00
Saif Ur Rehman
1a441b267d Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12 
# Conflicts:
#	erpnext/patches.txt
 2019-02-01 19:17:04 +05:00
Saif Ur Rehman
c8b61007b0 Merge branch 'master' of https://github.com/frappe/erpnext.git into Brand-Item-Defaults 
# Conflicts:
#	erpnext/setup/doctype/brand/brand.json
#	erpnext/stock/get_item_details.py
 2019-02-01 17:05:46 +05:00
Nabin Hait
f3f4ce9b87 fix: Fetch data based on item group filter in item dashboard stock balance report 2019-02-01 12:01:19 +05:30
Nabin Hait
9ea19b8fe1 fix: Fixed error on stock balance report 2019-01-31 15:53:25 +05:30
Sagar Vora
f97c5dad82 Merge branch 'staging' into develop 2019-01-29 18:39:14 +05:30
Nabin Hait
cc41b876fb
Merge pull request #16497 from nabinhait/bom_price 
BOM raw materials price
 2019-01-29 14:58:40 +05:30
Nabin Hait
4e45663297 fix(stock): get item price based on party 2019-01-29 14:02:08 +05:30
Nabin Hait
8ba9545b72
Merge pull request #16498 from nabinhait/stock-ledger-report 
fix(stock): Escaping issue in stock ledger report
 2019-01-29 11:30:15 +05:30
Nabin Hait
e8190473f5
Merge branch 'staging-fixes' into unicode 2019-01-29 11:13:04 +05:30
Nabin Hait
1187d61b56 fix(stock): Escaping issue in stock ledger report 2019-01-25 17:07:29 +05:30