Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
43,303 Commits 3 Branches 0 Tags 1 GiB
fed39a53cb
Commit Graph

43303 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Saqib Ansari
d5359bbdc2
Merge pull request #32379 from maharshivpatel/fix-pos-validate-qty-if-is_stock_item 
fix(pos): validate available quantity only if stock item
 2022-09-28 12:00:03 +05:30
Deepesh Garg
0c869251ce
Merge branch 'develop' into fix_asset_scrap_and_sale_dep 2022-09-28 08:38:52 +05:30
Maharshi Patel
d850b0adb1
Merge branch 'develop' into fix-pos-validate-qty-if-is_stock_item 2022-09-27 23:45:50 +05:30
Maharshi Patel
e392ea1104 fix: POS properly validate stock for bundle products 
Stock availability was not calculated properly for Product Bundle with non stock item so i have added logic to properly calculate that as well.
 2022-09-27 23:44:56 +05:30
Deepesh Garg
dbe4fdc73d
Merge pull request #32382 from deepeshgarg007/subscription_process 
fix: Move subscription process to hourly long queue
 2022-09-27 23:39:12 +05:30
Deepesh Garg
4c8617e1bb
Merge pull request #32378 from deepeshgarg007/add_index_return_against 
fix: Add return against indexes for POS Invoice
 2022-09-27 22:22:03 +05:30
Deepesh Garg
82a2f31ada fix: Move subscription process to hourly long quque 2022-09-27 22:12:32 +05:30
Anand Baburajan
cf72931816
Merge branch 'develop' into fix_asset_scrap_and_sale_dep 2022-09-27 20:43:53 +05:30
anandbaburajan
c6a7de0e54 chore: add blank lines 2022-09-27 20:43:08 +05:30
anandbaburajan
14e2d31619 test: adding test_asset_with_maintenance_required_status_after_sale 2022-09-27 20:19:01 +05:30
rohitwaghchaure
f95de1fd4d
Merge pull request #32377 from s-aga-r/fix/work-order/finish-button 
fix: consider overproduction percentage for WO finish button
 2022-09-27 17:44:41 +05:30
Deepesh Garg
cbfe28286a fix: Add return against indexes for POS Invoice 2022-09-27 16:22:59 +05:30
Nabin Hait
6145013f30
Merge branch 'develop' into fix_asset_scrap_and_sale_dep 2022-09-27 15:56:39 +05:30
Maharshi Patel
e39e088f18 fix: POS only validate QTY if is_stock_item 
POS invoice raised " Item not available " validation error even though item is non_stock.
 2022-09-27 15:44:38 +05:30
Deepesh Garg
1f6205e1ea fix: Add return against indexes for POS Invoice 2022-09-27 15:37:41 +05:30
Sagar Sharma
376febb9d1
Merge branch 'develop' into fix/work-order/finish-button 2022-09-27 15:36:15 +05:30
Maharshi Patel
c760ca2323
fix: Scrap Asset Accounting Dimensions (#31949) 
* fix: Scrap Asset Accounting Dimensions
 2022-09-27 15:31:36 +05:30
Sagar Sharma
05392e0918 fix: consider overproduction percentage for WO finish button 2022-09-27 15:30:08 +05:30
rohitwaghchaure
c917d716f7
Merge pull request #32370 from rohitwaghchaure/fixed-allow-expied-batch-return-using-pr-pi 
fix: Not allowing to return expired batches using purchase return
 2022-09-27 14:20:40 +05:30
Rohit Waghchaure
a4a86ee23f fix: allow to return expired batches using purchase return 2022-09-27 13:55:27 +05:30
Sagar Sharma
9049db41ae fix: For Quantity error msg in Stock Entry 2022-09-27 12:00:50 +05:30
ruthra kumar
21095502b9 chore: clean up purchase invoice and purchase invoice item 
1. remove discount accounting related fields from purchase invoice and
purchase invoice item
2. clean buying settings doctype
 2022-09-27 11:10:41 +05:30
Deepesh Garg
ce80b9fa0e Merge branch 'develop' of https://github.com/frappe/erpnext into internal_transfer_precision_fixes 2022-09-26 21:16:25 +05:30
Deepesh Garg
6e47fd54a0 fix: Hanlde rounding loss for internal transfer 2022-09-26 21:15:57 +05:30
rohitwaghchaure
106ee1bf4d
Merge pull request #32339 from rohitwaghchaure/fixed-opening-entry-trial-balance-issue 
fix: opening entry causing discrepancy between stock and trial balance
 2022-09-26 20:32:41 +05:30
rohitwaghchaure
6a67cc96d0
Merge pull request #32049 from djpalshikar/patch-1 
Allow Item Templates in Work Order Items
 2022-09-26 20:27:33 +05:30
Ernesto Ruiz
499ce5139c
fix: add translate function to book appointment verify html 2022-09-26 08:04:14 -06:00
Ernesto Ruiz
728ef46048
fix: add translate function to book appointment index.js 2022-09-26 08:01:48 -06:00
Ernesto Ruiz
e683cccf35
fix: add translate function to book appointment html 2022-09-26 07:59:13 -06:00
Sagar Sharma
e312d17eae refactor: rewrite Item Prices Report queries in QB 2022-09-26 17:50:17 +05:30
hendrik
f41d1500b0
fix: report chart field type 
* fix: report chart field type

Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2022-09-26 17:47:24 +05:30
Sagar Sharma
a80e8726e7
Merge pull request #32347 from s-aga-r/refactor/stock/report/incorrect-stock-value 
refactor: rewrite `Incorrect Stock Value Report` queries in `QB`
 2022-09-26 17:09:40 +05:30
Sagar Sharma
afb323b01c
Merge branch 'develop' into refactor/stock/report/incorrect-stock-value 2022-09-26 17:09:22 +05:30
Sagar Sharma
2647018870
Merge pull request #32346 from s-aga-r/refactor/stock/report/item-price-stock-report 
refactor: rewrite `Item Price Stock Report` queries in `QB`
 2022-09-26 17:08:44 +05:30
Sagar Sharma
9a1fa53791
Merge branch 'develop' into refactor/stock/report/item-price-stock-report 2022-09-26 17:08:30 +05:30
Deepesh Garg
d84fd6c925
Merge pull request #32245 from pps190/feat_scan_sound 
feat(stock): Audible indication of barcode scan status.
 2022-09-26 17:02:37 +05:30
Deepesh Garg
9b38a372fb
Merge pull request #32262 from shashankshirke/develop 
fix: broken link for item valuation updated
 2022-09-26 16:59:36 +05:30
Deepesh Garg
389fa180c8
Merge pull request #32276 from ernestoruiz89/patch-4 
fix: add some strings to translate function
 2022-09-26 16:39:04 +05:30
Deepesh Garg
539f8550c7
Merge pull request #32336 from ernestoruiz89/patch-6 
fix: typo on opportunity summary by sales stage report
 2022-09-26 16:37:58 +05:30
ruthra kumar
8b21d27f04
Merge pull request #32310 from nishibakabeer/patch-4 
fix: total value in all keys
 2022-09-26 11:27:47 +05:30
nishibakabeer
6919f389aa fix: total value in all keys 
Gross and net profit report showing wrong values in monthly quarterly and half yearly filters which is the total value
@ruthra-kumar added in develop branch as suggested ( https://github.com/frappe/erpnext/pull/32020)
 2022-09-26 10:40:55 +05:30
ruthra kumar
b33fb26b84
Merge pull request #32303 from ruthra-kumar/fix_difference_amount_calculation_on_payment_reconciliation 
fix: difference amount calculation and popup on payment reconciliation
 2022-09-26 10:25:12 +05:30
Sagar Sharma
b93331e844 refactor: rewrite Incorrect Stock Value Report queries in QB 2022-09-26 09:44:29 +05:30
Sagar Sharma
22299d2382 refactor: rewrite Item Price Stock Report queries in QB 2022-09-26 09:40:49 +05:30
Sagar Sharma
bb59346651 refactor: rewrite Delayed Item Report queries in QB 2022-09-23 15:47:26 +05:30
Rohit Waghchaure
bc3ab45af2 fix: opening entry causing discepancy between stock and trial balance 2022-09-23 15:21:09 +05:30
Sagar Sharma
1c1f991d2f refactor: rewrite Batch-Wise Balance History Report queries in QB 2022-09-23 14:57:44 +05:30
Sagar Sharma
2c9d9577e3 refactor: rewrite Batch Item Expiry Status Report queries in QB 2022-09-23 14:06:37 +05:30
Ernesto Ruiz
c4919cf5ec
fix: typo on opportunity summary by sales stage report 2022-09-22 15:42:46 -06:00
Sagar Sharma
4efb8b142c
Merge pull request #32324 from s-aga-r/refactor/report/production-planning-report 
refactor: rewrite `Production Planning Report` queries in `QB`
 2022-09-22 18:12:52 +05:30