Deepesh Garg
a79d074436
Merge pull request #32368 from ruthra-kumar/remove_code_for_buying_side_discount_accounting
...
chore: remove discount accounting logic from PI and PI Item
2022-09-30 15:58:35 +05:30
Deepesh Garg
429303bbb7
Merge pull request #32402 from deepeshgarg007/item_dashboard_create_new
...
fix: Item details fetching on making transaction from item dashboard
2022-09-30 15:56:32 +05:30
Nabin Hait
fe891aa488
fix: Create accounting dimension fields in asset capitalization
2022-09-30 15:55:41 +05:30
Maharshi Patel
9245d3b5cd
Revert "fix: fetch swift_number in payment_request"
...
This reverts commit f42a8e4e03
2022-09-30 15:35:12 +05:30
Deepesh Garg
bf7a51791a
chore: label post save
2022-09-30 15:29:07 +05:30
Sagar Sharma
6d0842465b
fix: don't allow to update Maintain Stock if the item has a BOM
2022-09-30 15:18:10 +05:30
Deepesh Garg
679b5ed551
chore: Add patch to update repayment schedule type in loan documents
2022-09-30 14:06:06 +05:30
Sagar Sharma
b1edd911f9
Merge branch 'develop' into remove_code_for_buying_side_discount_accounting
2022-09-30 12:39:29 +05:30
Sagar Sharma
774097bd10
Merge branch 'develop' into item_dashboard_create_new
2022-09-30 12:37:58 +05:30
Deepesh Garg
2ddee50f27
chore: Update labels as per repayment type
2022-09-30 10:39:45 +05:30
Deepesh Garg
3466461eb3
chore: Remove print statements
2022-09-30 10:19:58 +05:30
Deepesh Garg
76c6ccab5d
feat: Repayment schedule types for term loans
2022-09-30 10:13:17 +05:30
anandbaburajan
eadcd8e614
Merge branch 'fix_asset_sold_status' of https://github.com/AnandBaburajan/erpnext into fix_asset_sold_status
2022-09-29 15:34:48 +05:30
anandbaburajan
28952eda87
chore: remove unused function
2022-09-29 15:33:45 +05:30
Anand Baburajan
990514ae6d
Merge branch 'develop' into fix_asset_sold_status
2022-09-29 15:32:37 +05:30
anandbaburajan
f1169fb213
chore: refactor by just using a filter
2022-09-29 15:32:01 +05:30
Sagar Sharma
ffef659782
Merge branch 'develop' into fix/supplier-portal/make-pi-btn
2022-09-29 14:54:29 +05:30
rohitwaghchaure
10b7592d14
Merge pull request #32414 from rohitwaghchaure/consider-searchfields-as-per-customize-form
...
fix: searchfields as per customize form not working for Item
2022-09-29 14:51:55 +05:30
Rohit Waghchaure
3656f7d06f
test: added test case
2022-09-29 14:01:51 +05:30
anandbaburajan
0b3b4c99e6
Merge branch 'develop' of https://github.com/frappe/erpnext into fix_asset_sold_status
2022-09-29 08:55:00 +05:30
anandbaburajan
b734f9d237
chore: refactor by creating is_sold
2022-09-29 08:54:35 +05:30
Rohit Waghchaure
fd889fd29a
fix: searchfields as per customize form not working for Item
2022-09-28 23:00:45 +05:30
Deepesh Garg
369a343fb2
Merge pull request #32363 from ernestoruiz89/patch-7
...
fix: add translate function to strings in www/book appoinment
2022-09-28 20:15:05 +05:30
Deepesh Garg
bff3cd9068
chore: Remove print statements
2022-09-28 20:13:24 +05:30
Deepesh Garg
08443c6421
fix: Incorrect TCS amount deducted in Sales Invoice
2022-09-28 20:11:00 +05:30
Deepesh Garg
84ab5d45fd
Merge pull request #32403 from deepeshgarg007/loan_type_patch_fix
...
fix: Disbursement Account in patch to update old loans
2022-09-28 19:35:42 +05:30
Anand Baburajan
d4242de699
Merge branch 'develop' into fix_asset_sold_status
2022-09-28 18:20:46 +05:30
anandbaburajan
f4bf9c672f
chore: rewrite query using frappe.qb
2022-09-28 18:20:20 +05:30
Sagar Sharma
a145d1065a
Merge branch 'develop' into fix/stock-entry/supplied-items
2022-09-28 16:55:57 +05:30
Sagar Sharma
ac7409bbf3
fix: supplied items added twice in Stock Entry
2022-09-28 16:46:48 +05:30
Anand Baburajan
0618f606b2
Merge branch 'develop' into fix_asset_sold_status
2022-09-28 16:42:21 +05:30
anandbaburajan
a8dd3c3a7c
chore: adding missing asset statuses
2022-09-28 16:39:14 +05:30
anandbaburajan
1725672168
chore: adding missing asset statuses
2022-09-28 16:22:35 +05:30
anandbaburajan
f9f68005a5
fix: asset requiring maintenance sold status
2022-09-28 16:21:31 +05:30
Sagar Sharma
e63e017d20
Merge branch 'develop' into fix/supplier-portal/make-pi-btn
2022-09-28 15:46:52 +05:30
Sagar Sharma
80080a3d7b
fix: show Make Purchase Invoice button based on permission
2022-09-28 15:40:07 +05:30
Deepesh Garg
be623ce8e8
fix: Disbursement Account in patch to update old loans
2022-09-28 15:36:59 +05:30
Deepesh Garg
0439e41a44
fix: Item details fetching on making transaction from item dashboard
2022-09-28 14:54:53 +05:30
Maharshi Patel
f42a8e4e03
fix: fetch swift_number in payment_request
...
There isn't direct link between payment_request and bank so swift_number wasn't fetched using Fetch form. I fixed it by fetching swift_number on_change of bank_account.
2022-09-28 12:54:00 +05:30
Anand Baburajan
c1e3498a2a
Merge branch 'develop' into fix_asset_scrap_and_sale_dep
2022-09-28 12:18:38 +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
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
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
afb323b01c
Merge branch 'develop' into refactor/stock/report/incorrect-stock-value
2022-09-26 17:09:22 +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
729193aca8
Merge branch 'develop' into refactor/report/production-planning-report
2022-09-22 11:18:02 +05:30
Sagar Sharma
8417b9b99c
refactor: rewrite Production Planning Report queries in QB
2022-09-22 11:17:11 +05:30
rohitwaghchaure
d7e699ea1a
Merge pull request #32309 from rohitwaghchaure/fixed-item-code-key-error
...
fix: item_code key error in production plan
2022-09-21 15:27:43 +05:30
Rohit Waghchaure
caf23e6b8e
fix: item_code key error in production plan
2022-09-21 13:11:51 +05:30
Sagar Sharma
86c9ce9c20
Merge branch 'develop' into refactor/report/exponential-smoothing-forecasting
2022-09-21 10:25:47 +05:30
Sagar Sharma
1c0f1a2831
Merge branch 'develop' into refactor/report/exponential-smoothing-forecasting
2022-09-21 09:55:28 +05:30
Sagar Sharma
56f9c1b6f7
refactor: rewrite Exponential Smoothing Forecasting queries in QB
2022-09-21 09:54:38 +05:30
ruthra kumar
122d5f2729
fix: difference amount calculation on payment reconciliation
2022-09-21 08:36:09 +05:30
Sagar Sharma
d3a6881737
Merge branch 'develop' into refactor/report/bom-variance-report
2022-09-20 23:11:08 +05:30
Sagar Sharma
0048f58500
Merge branch 'develop' into refactor/report/bom-variance-report
2022-09-20 20:21:49 +05:30
Sagar Sharma
92e03e2c22
Merge branch 'develop' into refactor/report/bom-stock-report
2022-09-20 20:21:38 +05:30
ruthra kumar
6e65f01ede
Merge pull request #32296 from ruthra-kumar/amount_in_words_for_debit_note
...
fix: get amount in words for debit note
2022-09-20 18:09:33 +05:30
Sagar Sharma
19e64eb247
refactor: rewrite BOM Variance Report queries in QB
2022-09-20 17:56:47 +05:30
ruthra kumar
70f6484d9d
fix: get amount in words for debit note
2022-09-20 17:32:23 +05:30
Sagar Sharma
000c538d65
Merge branch 'develop' into refactor/report/bom-stock-report
2022-09-20 16:27:00 +05:30
Sagar Sharma
390ce5719d
fix: warehouse filter in BOM Stock Calculated Report
2022-09-20 16:25:20 +05:30
Sagar Sharma
8fd7c04920
refactor: rewrite BOM Stock Report queries in QB
2022-09-20 16:23:14 +05:30
Deepesh Garg
d4b01f6ffd
Merge branch 'develop' of https://github.com/frappe/erpnext into fix-remove-no-copy-for-ignore_pricing_rule
2022-09-20 14:58:48 +05:30
Nabin Hait
ecb5fff2ec
Merge pull request #32264 from deepeshgarg007/asset_depreciation_date
...
fix: Depreciation posting date only when calculate depreciation is checked
2022-09-20 14:48:03 +05:30
Deepesh Garg
ef7d7e7d71
Merge pull request #32204 from deepeshgarg007/pending_tds_vouchers
...
fix(UX): More predictable tax withholding application in invoices
2022-09-20 14:35:16 +05:30
Sagar Sharma
dad40b8d51
Merge branch 'develop' into refactor/report/item-shortage-report
2022-09-20 10:48:29 +05:30
Sagar Sharma
3dc754cac2
test: add test cases for Item Shortage Report
2022-09-20 10:48:05 +05:30
Sagar Sharma
f0a78aa559
refactor: rewrite Item Shortage Report queries in QB
2022-09-20 10:47:55 +05:30
Deepesh Garg
3d356763d0
Merge pull request #32217 from ruthra-kumar/bug_in_tax_on_multi_currency_payment_entry
...
fix: incorrect gl if tax on multi currency payment entry
2022-09-20 09:59:47 +05:30
Deepesh Garg
49538e81de
Merge pull request #32235 from maharshivpatel/fix-payment-schedule-description
...
fix: fetch description only if empty on the payment schedule
2022-09-20 09:13:43 +05:30
Deepesh Garg
1f4932966a
Merge branch 'develop' of https://github.com/frappe/erpnext into pending_tds_vouchers
2022-09-20 09:06:35 +05:30
Deepesh Garg
9aa1f84d45
chore: fix tests
2022-09-20 09:06:18 +05:30
Ernesto Ruiz
94199b7867
fix: add translate function to strings
2022-09-19 11:56:42 -06:00
Ernesto Ruiz
aa49ec815a
fix: add translate function to strings
2022-09-19 11:55:13 -06:00
Ernesto Ruiz
9decebe6e1
fix: Add strings to translate function
2022-09-19 10:13:30 -06:00
Sagar Sharma
a4db9abcb4
Merge branch 'develop' into fix/stock-entry/subcontract-order-item-reference
2022-09-19 18:52:27 +05:30
Sagar Sharma
3a9c08e7c9
fix: po_detail or sco_rm_detail not getting set while while mapping SE
2022-09-19 18:47:46 +05:30
Deepesh Garg
083309c056
fix: Incoming rate precision fixes for intra company transfer
2022-09-19 15:06:06 +05:30
ruthra kumar
efc9553561
Merge pull request #32251 from ruthra-kumar/set_default_supplier_currency_for_po_created_from_so
...
fix: use default supplier currency if default supplier is enabled
2022-09-19 12:44:51 +05:30
Deepesh Garg
fac82cf69b
fix: Depreciation posting date only when calculate depreciation is checked
2022-09-18 19:41:05 +05:30
Shashank Shirke
785eaf8e8f
fix: broken link for item valuation updated
...
Old URL (404 Not Found): https://docs.erpnext.com/docs/v13/user/manual/en/stock/item/item-valuation-fifo-and-moving-average
Updated URL: https://docs.erpnext.com/docs/v13/user/manual/en/stock/articles/calculation-of-valuation-rate-in-fifo-and-moving-average
2022-09-18 05:42:47 -07:00
Sagar Sharma
b747d9d05e
Merge branch 'develop' into fix/stock-entry/supplied-item-reference
2022-09-18 11:37:38 +05:30
Sagar Sharma
b90875575c
fix: make po_detail or sco_rm_detail mandatory for SE Send to Subcontractor
2022-09-18 11:37:07 +05:30
Deepesh Garg
110840aa98
Merge pull request #32244 from deepeshgarg007/project_po_linking
...
fix: Parent Level project linkning on creating PO from project
2022-09-17 20:29:40 +05:30
ruthra kumar
77fdc37cb7
fix: use default supplier currency if default supplier is enabled
2022-09-17 16:34:33 +05:30
Sagar Sharma
2f97370b8e
fix: sco_rm_detail in Stock Entry
2022-09-17 14:29:42 +05:30
rohitwaghchaure
3c01bf3a12
Merge pull request #32238 from rohitwaghchaure/fix-pricing-rules-issues
...
fix: suggestion threshold label and rule was not working for other item with min and max amount
2022-09-17 12:11:24 +05:30
Devin Slauenwhite
32e75ff808
feat: audible indication of scan status.
2022-09-16 17:58:01 -04:00
Devin Slauenwhite
613c8158a8
fix: actually reject process_scan when update_table fails.
2022-09-16 17:49:00 -04:00
Deepesh Garg
93e134aab0
fix: Parent Level project linkning on creating PO from project
2022-09-16 22:44:23 +05:30
Maharshi Patel
8c5b420aea
fix: remove no_copy for ignore_pricing_rule
2022-09-16 18:26:00 +05:30
Sagar Sharma
bd6af7c613
test: update test case for production plan pending-qty
2022-09-16 18:00:26 +05:30
ruthra kumar
5bd5dd7262
test: gl entries of payments with advance tax
2022-09-16 16:22:21 +05:30
Rohit Waghchaure
f5bd3fa952
fix: suggestion threshold label and rule was not working for other items with min and max amount
2022-09-16 16:03:08 +05:30
Sagar Sharma
5be7d42dfd
fix: production plan pending-qty
2022-09-16 14:39:39 +05:30
Maharshi Patel
f4b64686ae
fix: fetch description only if empty on the payment schedule
...
added fetch_if_empty on description field of payment_schedule.
2022-09-16 14:14:14 +05:30
Deepesh Garg
36d0906ea2
fix: TDS deduction via journal entry
2022-09-16 13:50:37 +05:30
ruthra kumar
f0ae77b23b
fix: incorrect gl if tax on multi currency payment entry
2022-09-16 12:40:40 +05:30
Deepesh Garg
0a6462e627
Merge branch 'develop' of https://github.com/frappe/erpnext into pending_tds_vouchers
2022-09-16 12:35:39 +05:30
Sagar Sharma
be0d9d8c13
Merge branch 'develop' into refactor/file/production_plan.py
2022-09-16 12:28:48 +05:30
Sagar Sharma
b8cf3b4c77
refactor: rewrite Production Plan queries in QB
2022-09-16 12:23:43 +05:30
Deepesh Garg
38d00f407e
Merge pull request #32225 from nabinhait/dunning-fix
...
fix: create dunning from sales invoice
2022-09-16 11:04:55 +05:30
Deepesh Garg
e4ef6c9645
Merge pull request #32219 from nabinhait/bank-clearnance-perm-issue
...
fix: No permission to read doctype
2022-09-16 11:04:42 +05:30
Nabin Hait
0286f2da78
Merge branch 'develop' into dunning-fix
2022-09-16 09:40:18 +05:30
Nabin Hait
a1fcabee0e
Merge pull request #32221 from rohitwaghchaure/consider-posting-time-for-internal-po
...
fix: consider posting time for internal transfer PO
2022-09-16 09:37:45 +05:30
anandbaburajan
43a3400221
fix: fix restore asset value after depreciation
2022-09-15 23:25:04 +05:30
anandbaburajan
5a8b28c194
fix: refactor asset capitilization
2022-09-15 22:52:25 +05:30
anandbaburajan
11ac20e5ee
fix: asset tests
2022-09-15 22:43:18 +05:30
Nabin Hait
786891c600
Merge branch 'develop' into bank-clearnance-perm-issue
2022-09-15 17:42:37 +05:30
Nabin Hait
0d732609f0
Merge branch 'develop' into consider-posting-time-for-internal-po
2022-09-15 17:42:26 +05:30
Nabin Hait
c5c6a69269
Merge branch 'develop' into cost-center-renaming
2022-09-15 17:42:13 +05:30
Nabin Hait
73f6c5fe35
Merge branch 'develop' into dunning-fix
2022-09-15 17:42:00 +05:30
anandbaburajan
ff5cad1cd6
fix: calculate depreciation properly on asset sale entry and scrap entry
2022-09-15 13:15:34 +05:30
Nabin Hait
29db084dc3
fix: create dunning from sales invoice
2022-09-15 13:11:53 +05:30
Nabin Hait
af21a11e1e
fix: abbreviation issue on renaming cost center
2022-09-15 12:09:18 +05:30
Rohit Waghchaure
cb763938dc
fix: consider posting time for internal transfer PO
2022-09-15 11:48:43 +05:30
Nabin Hait
c0da948a4e
fix: No permission to read doctype
2022-09-15 11:27:35 +05:30
Nabin Hait
3457105504
fix: test cases
2022-09-15 11:19:33 +05:30
Nabin Hait
a5b5885933
fix: test cases
2022-09-15 11:19:14 +05:30
Nabin Hait
cbf973d90f
fix: always set default expense account in company
2022-09-15 11:19:06 +05:30
Ankush Menat
97977cdb4b
fix: correct sql output format in CRM patch ( #32213 )
2022-09-14 19:19:05 +05:30
Abhinav Raut
f2209045f8
fix: pending accrual entries
2022-09-14 11:55:03 +05:30
Deepesh Garg
b6184ce471
test: Add tests
2022-09-14 09:13:02 +05:30
Deepesh Garg
b6d87ae25b
Merge branch 'develop' of https://github.com/frappe/erpnext into pending_tds_vouchers
2022-09-13 22:31:21 +05:30
Sagar Sharma
bf1fa014f4
test: add test case for item master maintain-stock
2022-09-13 22:12:56 +05:30
Sagar Sharma
7b878ea3d8
fix: unknown column error while updating value of maintain-stock in item master
2022-09-13 21:52:58 +05:30
Deepesh Garg
3fb1595a4e
fix: Fetch vouchers to show in Invoice
2022-09-13 20:31:31 +05:30
Deepesh Garg
246c1a9380
fix: Add child table for tax withheld vouchers
2022-09-13 20:05:20 +05:30
Nabin Hait
e24a4b18c4
Merge branch 'SaiFi0102-asset-capitalization' into develop
2022-09-13 15:00:21 +05:30
Nabin Hait
58d430fe3e
feat: Asset Capitalization
...
- manual selection of entry type
- GLE cleanup with smaller functions
- GLE considering periodical inventory
- test cases
2022-09-13 14:56:21 +05:30
Deepesh Garg
dc985e0e83
Merge pull request #32190 from maharshivpatel/fix-item-wise-sales-register
...
fix: item wise sales register taxes and charges
2022-09-13 13:53:51 +05:30
Shadrak Gurupnor
f2b7c9ee66
fix: validate for active sla ( #32132 )
2022-09-13 13:42:45 +05:30
Ankush Menat
fffc245922
fix(UX): make Item attachments public by default ( #32196 )
2022-09-13 13:41:00 +05:30
Deepesh Garg
f8bee0e75f
Merge pull request #32091 from nabinhait/lead-notes-patch
...
fix: Migrate old lead notes as per the new format
2022-09-13 12:20:50 +05:30
Rucha Mahabal
eb01f9729d
fix(Employee): shorter tab titles ( #32192 )
2022-09-13 10:34:35 +05:30
Deepesh Garg
51c37aeee3
Merge branch 'develop' into lead-notes-patch
2022-09-13 09:42:07 +05:30
Raffael Meyer
e00ece7a78
fix: remove EmployeeBoardingController ( #32139 )
...
fix: remove employee boarding controller
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2022-09-13 02:00:04 +05:30
Maharshi Patel
62163ab3d3
fix: item wise sales register taxes and charges
...
i have added separate column for other charges. Instead of adding all values to tax_total, it checks if account_type is tax, and then only it adds to total_tax otherwise it adds to the total_other_charges.
2022-09-12 23:44:56 +05:30
Ahmad
4f1cc41b86
fix: pick_list - picked qty getting set to 1
...
(cherry picked from commit 3256e2b8b7cee0e7b95ca58a6f22f96090e2ffaa)
2022-09-12 16:49:45 +00:00
Sagar Sharma
2336bcfe20
Merge branch 'develop' into refactor/report/bom-stock-calculated
2022-09-12 19:20:58 +05:30
rohitwaghchaure
b3b1df7184
Merge pull request #32181 from rohitwaghchaure/fix-min-max-amount-configuration
...
fix: promotional scheme min and max amount configuration
2022-09-12 18:30:01 +05:30
Sagar Sharma
d3cd3bc5ef
Merge branch 'develop' into refactor/report/bom-stock-calculated
2022-09-12 17:23:15 +05:30
Sagar Sharma
e1a98c1ff7
test: add test cases for BOM Stock Calculated report
2022-09-12 17:11:00 +05:30
Rohit Waghchaure
a8fd92ddc1
fix: promotional scheme min and max amount configuration
2022-09-12 16:53:52 +05:30
rohitwaghchaure
8f787c08a2
fix: customer code max characters limit issue ( #32177 )
2022-09-12 16:48:53 +05:30
Sagar Sharma
7a968a5f0d
fix: add missing warehouse filter in BOM Stock Calculated report
2022-09-12 16:12:51 +05:30
Sagar Sharma
56192daabf
fix: required_qty in BOM Stock Calculated report
2022-09-12 16:12:49 +05:30
Nihantra C. Patel
e2b4ae13fa
fix: Set filter condition and spell in AR
2022-09-12 14:09:42 +05:30
Ankush Menat
12d99b3292
refactor: use util method for checking if job is queued
2022-09-12 13:14:48 +05:30
Deepesh Garg
6b94b5334c
Merge pull request #32144 from deepeshgarg007/internal_purchase_invoice_rate
...
fix: Rate for internal PI have non stock UOM items
2022-09-12 09:09:43 +05:30
Sagar Sharma
a86023eb09
Merge branch 'develop' into refactor/report/process-loss-report
2022-09-11 19:15:16 +05:30
Sagar Sharma
5245928648
refactor: rewrite Process Loss Report queries in QB
2022-09-11 19:03:59 +05:30
ruthra kumar
0aeb7c6484
Merge pull request #32156 from ruthra-kumar/bug_multiple_call_to_ple_creation
...
fix: remove duplicate call to ple creation
2022-09-11 12:21:01 +05:30
ruthra kumar
4adc372f9a
fix: remove multiple call to ple creation
2022-09-11 11:52:17 +05:30
ruthra kumar
4576c1ebc3
Merge pull request #32137 from ruthra-kumar/delete_payment_ledger_entries_on_src_doc_delete
...
refactor(minor): delete linked payment ledger entries on source doc deletion
2022-09-11 11:21:24 +05:30
Sagar Sharma
5558191a2a
Merge branch 'develop' into refactor/report/work-order-stock-report
2022-09-10 16:30:15 +05:30
Sagar Sharma
d4c4dddfc3
refactor: rewrite Work Order Stock Report queries in QB
2022-09-10 16:29:47 +05:30
ruthra kumar
70313df531
fix: delete linked payment ledger entries no source doc deletion
2022-09-10 09:30:45 +05:30
Sagar Sharma
723fa9eebc
refactor: BOM Stock Calculated report
2022-09-09 19:11:36 +05:30
Nabin Hait
fefe95052d
fix: resolved merge conflict
2022-09-09 14:40:36 +05:30
Sagar Sharma
2e314a20f1
Merge branch 'develop' into fix/stock-entry/sco
2022-09-09 13:48:14 +05:30
Sagar Sharma
9a3dcb9ad1
fix: validate Subcontracting Order in Stock Entry
2022-09-09 13:46:50 +05:30
Sagar Sharma
30909a9b79
fix: status filter for Subcontracting Order in Stock Entry
2022-09-09 13:45:31 +05:30
Deepesh Garg
0f655e4430
fix: Rate for internal PI have non stock UOM items
2022-09-09 12:40:57 +05:30
Sagar Sharma
b49caf170c
Merge branch 'develop' into fix/v14/stock-entry/send-to-subcontractor
2022-09-09 11:37:12 +05:30
Deepesh Garg
33d0e09497
Merge pull request #32117 from deepeshgarg007/psoa_fontsize
...
fix: Reduce font size for Process Statement of accounts print/pdf
2022-09-09 11:18:13 +05:30
rohitwaghchaure
6da45144d0
Merge pull request #32135 from rohitwaghchaure/fixed-incorrect-gl-entries-for-internal-transfer
...
fix: reposting not working for internal transferred purchase receipt
2022-09-09 09:30:21 +05:30
Rohit Waghchaure
a03b4ce213
fix: reposting not working for internal transferred purchase receipt
2022-09-08 19:16:00 +05:30
Sagar Sharma
61110dbfe4
Merge branch 'develop' into fix/subcontracting-order/returned-qty
2022-09-08 18:26:50 +05:30
Sagar Sharma
3585daab95
fix: hide "Return of Components" button in closed SCO ( #32130 )
2022-09-08 18:23:56 +05:30
Sagar Sharma
aea7188304
test: add test case for returned-qty
2022-09-08 18:15:48 +05:30
Sagar Sharma
ccb2889cac
fix: SCO Supplied Items returned-qty
2022-09-08 18:15:45 +05:30
rohitwaghchaure
72d5366e96
Merge pull request #31918 from s-aga-r/fix/subcontracting-receipt/gl-entries
...
fix: Subcontracting Receipt GL Entries
2022-09-08 10:17:12 +05:30
rohitwaghchaure
448c5ff3dc
Merge pull request #32118 from rohitwaghchaure/provision-to-manual-reposting
...
fix: option to start reposting from repost item valuation
2022-09-07 16:57:43 +05:30
rohitwaghchaure
7dc8ab4069
Merge pull request #32115 from rohitwaghchaure/fixed-label-not-showing-for-filter
...
fix: inventory dimension filter's label not showing in the report
2022-09-07 16:38:59 +05:30
Rohit Waghchaure
f1c4aea7b5
fix: option to start reposting from repost item valuation
2022-09-07 16:38:17 +05:30
Deepesh Garg
6bfd193b0d
fix: Reduce font size for Process Statement of accounts print/pdf
2022-09-07 16:34:10 +05:30
ruthra kumar
741b5b4978
Merge pull request #32110 from ruthra-kumar/bank_import_statement_bug
...
fix: error on bank statement import
2022-09-07 15:22:14 +05:30
Sagar Sharma
f19049e643
Merge branch 'develop' into fix/subcontracting-receipt/gl-entries
2022-09-07 14:55:56 +05:30
Sagar Sharma
01c2e4d2cf
Merge branch 'develop' into fix/v14/stock-entry/send-to-subcontractor
2022-09-07 14:52:16 +05:30
Rohit Waghchaure
ef7def8f1d
fix: inventory dimension filter's label not showing in the reort
2022-09-07 14:43:12 +05:30
rohitwaghchaure
5b02adbd33
Merge pull request #32113 from rohitwaghchaure/fixed-internal-transfer-flow
...
fix: internal transfer flow
2022-09-07 14:26:14 +05:30
Rohit Waghchaure
9d1be48bd2
test: added test case for internal transfer
2022-09-07 13:51:52 +05:30
Devin Slauenwhite
aab2c9c682
fix: require barcode item barcode. ( #31957 )
...
* fix: require barcode item barcode.
* fix: make supplier mandatory in Item Supplier DocType
Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>
2022-09-07 12:59:46 +05:30
Rohit Waghchaure
b4a102d119
fix: internal transfer flow
2022-09-07 12:48:18 +05:30
ruthra kumar
a6fbb80b94
fix: import error on bank statement import
...
Name collision between frameworks file importer's internal log and
doctype fieldname - import_log.
Frameworks internal log overrode, doctypes field which caused failure
in basic fieldtype validation.
2022-09-07 11:19:54 +05:30
Sagar Sharma
008542b715
fix: AD not getting copied from SCO while creating a Material Transfer ( #32106 )
2022-09-07 10:15:43 +05:30
Deepesh Garg
8efd305afd
Merge pull request #32089 from frappe/mergify/bp/develop/pr-32086
...
fix: QR Code multi currency issue (backport #32086 )
2022-09-07 07:46:55 +05:30
Sagar Sharma
2f00413864
fix: consider Stock Entry purpose while getting total supplied qty
2022-09-06 16:42:15 +05:30
rohitwaghchaure
c6380a25d6
Merge pull request #32063 from rohitwaghchaure/fixed-fetch-from-parent
...
fix: inventory dimension issues
2022-09-06 10:45:36 +05:30
Rucha Mahabal
5ab5811770
feat: tabbed view for Employee form ( #31940 )
2022-09-06 10:18:14 +05:30
Rohit Waghchaure
75fcab04b1
test: test cases for PI and DN
2022-09-06 01:42:57 +05:30
Nabin Hait
4b13452022
fix: drop old notes column from lead and prospect
2022-09-05 18:28:09 +05:30
Nabin Hait
2a100abef1
perf: lesser SQL queries and no validation
...
Co-authored-by: Sagar Vora <sagar@resilient.tech>
2022-09-05 18:16:34 +05:30
Nabin Hait
3abd00f3bb
fix: Migrate old lead notes as per the new format
2022-09-05 18:10:53 +05:30
Sagar Sharma
74c2458bdb
Merge branch 'develop' into t3
2022-09-05 13:56:21 +05:30
Sagar Sharma
a349b58306
refactor(test): test_update_reserved_qty_for_subcontracting
2022-09-05 13:55:55 +05:30
Sagar Sharma
4a7add2169
fix: validate available qty for consumption in SCR
2022-09-05 13:27:03 +05:30
hamzaali15
987ac513c8
fix: QR Code multi currency issue
...
When try to scan qr code on app it is showing correct values for multi currencies because it is not getting base amount
(cherry picked from commit b10a2b87b65f3c29ed0aae7f30099e9c8ad75377)
2022-09-05 07:13:32 +00:00
Nabin Hait
57257a1795
Merge pull request #32061 from resilient-tech/fix-appointment-creation
...
fix(Appointment): create lead notes as child table
2022-09-05 12:25:45 +05:30
Deepesh Garg
3c055f94e1
Merge pull request #31982 from FHenry/dev_enhance_upgrade_process
...
fix: upgrade process to version-14 when currency opportunity was not set
2022-09-04 19:03:43 +05:30
Deepesh Garg
118b0c0f86
chore: fix message
2022-09-04 19:03:16 +05:30
Deepesh Garg
10d94ed539
Merge pull request #32045 from SolufyPrivateLimited/Solufy-JET
...
fix: Naming series in Journal Entry Template
2022-09-04 16:34:05 +05:30
HENRY Florian
86395c6adb
feat: better Item Price list view ( #31954 )
...
* feat: better Item Price list view
2022-09-04 16:25:03 +05:30
Deepesh Garg
acb88e5c57
Merge pull request #31850 from HarryPaulo/add-two-new-filters-gross-profit
...
feat: two new filters for gross profit
2022-09-04 15:56:54 +05:30
Deepesh Garg
1a61d4e8a8
Merge branch 'develop' into fix-consolidation-precision-error
2022-09-04 13:18:10 +05:30
Deepesh Garg
ad8d0efa29
chore: Linting Issues
2022-09-04 13:15:59 +05:30
Rohit Waghchaure
237299948a
fix: fetch from parent not working for custom field
2022-09-03 17:27:00 +05:30
rohitwaghchaure
0efc6a9abe
Merge pull request #32065 from rohitwaghchaure/not-able-to-make-variant-item
...
fix: not able to make variant item
2022-09-03 11:52:56 +05:30
Rohit Waghchaure
92b0f9cd7e
fix: not able to make variant item
2022-09-03 11:42:04 +05:30
Sagar Vora
875ff15109
test: dont create lead manually, add coverage for notes
2022-09-02 18:30:39 +05:30
Sagar Vora
58e553151e
fix(Appointment): create lead notes as child table
2022-09-02 12:42:37 +00:00
HENRY Florian
7919513c8a
Merge branch 'develop' into dev_enhance_upgrade_process
2022-09-02 13:01:06 +02:00
ruthra kumar
e424ad5ff2
Merge pull request #32054 from ruthra-kumar/bug_in_process_deferred_accounting
...
fix: type error on cancellation of Process Deferred Accounting
2022-09-02 16:20:31 +05:30
ruthra kumar
64f8010a25
Merge pull request #32052 from ruthra-kumar/key_error_on_consolidate_financial_report
...
fix: key error on consolidated financial report
2022-09-02 16:13:19 +05:30
ruthra kumar
1c385541fa
test: pda document submission and cancellation
2022-09-02 12:34:02 +05:30
ruthra kumar
08f2e4edc3
fix: incorrect import parameter for cancel PDA
2022-09-02 10:51:51 +05:30
ruthra kumar
6e8395cccd
fix: key error on consolidated financial report
...
accounts with same name but different account number will throw key
error on consolidated report
2022-09-02 09:55:24 +05:30
Sagar Sharma
68907ca783
chore: set BOM as default value for Backflush Raw Materials of Subcontract Based On ( #32048 )
...
chore: set BOM as default value for Backflush Raw Materials of Subcontract Based On in Buying Settings
2022-09-01 19:31:55 +05:30
Dhananjay Palshikar
75396c02d2
Allow Item Templates in Work Order Items
...
Item Variants can be a part of the items tables, however, when BOM items are fetched to be a part of the Work Order items, item variants were being filtered out.
The filtering out does not serve a purpose. Having Item variants in BOMs allows for template like behaviour.
2022-09-01 19:07:13 +05:30
Solufyin
2085626390
fix: Naming series in Journal Entry Template
2022-09-01 11:49:13 +05:30
HENRY Florian
b05fdb28ff
Merge branch 'develop' into dev_enhance_upgrade_process
2022-08-31 13:52:28 +02:00
Ankush Menat
30039e8e62
fix: encode thumbnail URL
...
If it contains space the URL won't load
2022-08-31 17:06:20 +05:30
Ankush Menat
4a38ce659d
refactor!: drop redisearch
...
incr: replace text and tag fields
incr: use rediswrapper's make key
incr: indexDefinition from redis
incr: replace index creation
incr: replace AutoCompleter
incr: replace product search ac
incr: replace client querying
fix: broken redisearch load test
fix: pass actual query to get suggestion
2022-08-31 17:06:20 +05:30
Deepesh Garg
a76d3827ec
chore: Add check for principal amount
2022-08-30 19:24:57 +05:30
Deepesh Garg
eefc9b7172
fix: Loan Interest accruals for 0 rated loans
2022-08-30 19:16:36 +05:30
Ankush Menat
ffa3071d36
fix: force delete old report docs ( #32026 )
2022-08-30 15:43:57 +05:30
Deepesh Garg
9e0e308a44
Merge pull request #32005 from niyazrazak/patch-4
...
fix: lost quotation not to expired
2022-08-30 10:33:01 +05:30
Raffael Meyer
73f4d5931d
fix: permissions for Task Type ( #32016 )
2022-08-29 21:56:07 +05:30
Ankush Menat
2d41704424
fix(patch): update sla doctype directly ( #32014 )
...
fix: update sla doctype directly
2022-08-29 20:50:27 +05:30
ruthra kumar
25072e5d32
Merge pull request #32009 from ruthra-kumar/add_remarks_to_payment_ledger
...
refactor: readd remarks field to payment ledger
2022-08-29 19:48:36 +05:30
ruthra kumar
d522f13d55
chore: add remarks migration to patches.txt
2022-08-29 15:59:56 +05:30
ruthra kumar
3a6b095ed4
chore: patch for migrating remarks to payment ledger
2022-08-29 15:59:56 +05:30
ruthra kumar
5782c4469a
refactor: re-add remarks field to payment ledger and AR/AP report
2022-08-29 15:59:37 +05:30
Deepesh Garg
6881b68ed7
Merge pull request #32006 from deepeshgarg007/cash_and_non_trade_discount_rounded_total
...
fix: Rounded total for cash and non trade discount invoices
2022-08-29 15:35:23 +05:30
Sagar Sharma
9dbaaa33f5
fix: AD not getting copied from SCO while creating a SE ( #32004 )
2022-08-29 15:07:20 +05:30
MOHAMMED NIYAS
69ffef8c0e
fix: lost quotation not to expired
2022-08-29 14:47:43 +05:30
HENRY Florian
61c143cb82
Merge branch 'develop' into dev_enhance_upgrade_process
2022-08-29 10:49:11 +02:00
Deepesh Garg
318da16b99
fix: Rounded total for cash and non trade discount invoices
2022-08-29 14:18:39 +05:30
Sagar Sharma
af5cbc881f
chore: allow return of components in SCO ( #31994 )
...
chore: allow return of components in sco
2022-08-26 22:49:40 +05:30
Deepesh Garg
87ca23736d
Merge pull request #31988 from ruthra-kumar/remove_precision_discount_percentage
...
chore: remove precision on discount_percentage of Sales Invoice Item
2022-08-26 16:03:57 +05:30
HENRY Florian
6cd7ef9cc3
Merge branch 'develop' into dev_enhance_upgrade_process
2022-08-26 11:33:22 +02:00
ruthra kumar
c42fef541a
chore: remove precision on discount_percentage of Sales Invoice Item
2022-08-26 13:15:55 +05:30
Solufyin
bd4b4ddd8b
fix: Purchase Order creation from Sales Order
2022-08-26 11:18:56 +05:30
Florian HENRY
d19b664ba9
chore: better text
2022-08-25 22:35:44 +02:00
Florian HENRY
ac66538651
chore: remove debug
2022-08-25 22:35:08 +02:00
Florian HENRY
9d02fbadb4
fix: upgrade process to version-14 when currency opportunity wass not set
2022-08-25 20:45:35 +02:00
ruthra kumar
6aa8fd0f7b
fix: restrict party types to Supplier/Customer for AR/AP report
2022-08-25 15:50:06 +05:30
Sagar Sharma
8566832dd5
fix: add validation for PO in Stock Entry ( #31974 )
2022-08-25 15:05:13 +05:30
Deepesh Garg
9e43c9cff3
Merge pull request #31943 from nabinhait/asset-repair
...
fix: gl entries for asset repair
2022-08-25 13:24:26 +05:30
rohitwaghchaure
b27f3ab327
Merge pull request #31967 from rohitwaghchaure/connection-added-for-work-order
...
fix: material request connection on work order
2022-08-25 12:29:10 +05:30
rohitwaghchaure
dae112eed2
Merge pull request #31966 from rohitwaghchaure/set-default-supplier-from-item
...
fix: default supplier not set in the PP
2022-08-25 12:25:00 +05:30
Rohit Waghchaure
9ab10def49
fix: material request connection on work order
2022-08-25 12:13:17 +05:30
Deepesh Garg
c1f6dd46d1
chore: fix against account
2022-08-25 12:10:52 +05:30
Rohit Waghchaure
5fd468d9ec
fix: default supplier not set in the PP
2022-08-25 11:44:12 +05:30
Deepesh Garg
e9b0c7177f
Merge branch 'develop' into fix-consolidation-precision-error
2022-08-25 11:41:20 +05:30
Samuel Danieli
915102a400
chore: german translations ( #31463 )
2022-08-25 11:23:38 +05:30
Deepesh Garg
5187a9a5ad
Merge pull request #31776 from HarryPaulo/fix-net-amout-sales-analytics
...
fix: for Tree Type item and item group show net amout
2022-08-25 11:05:18 +05:30
Deepesh Garg
9b626d06fc
Merge pull request #31909 from s-aga-r/filters/repost-item-valuation/voucher-no
...
fix: Add docstatus filter for voucher_no in Repost Item Valuation
2022-08-25 10:49:29 +05:30
rohitwaghchaure
1af22e5312
Merge pull request #31951 from rohitwaghchaure/maintenance-visit-issue
...
fix: Purposes not set in Maintenance Visit
2022-08-25 10:48:41 +05:30
Deepesh Garg
77906ea4ab
Merge pull request #31934 from ruthra-kumar/disable_discount_accounting_for_buying
...
refactor: disable discount accounting on Buying module(PI)
2022-08-25 10:34:30 +05:30
