Commit Graph

43195 Commits

Author SHA1 Message Date
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
2235f31ffe
Merge pull request #32295 from s-aga-r/refactor/report/bom-stock-report
refactor: rewrite `BOM Stock Report` queries in `QB`
2022-09-20 23:06:57 +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
4f2486a67a
Merge pull request #32284 from maharshivpatel/fix-remove-no-copy-for-ignore_pricing_rule
fix: remove no_copy for ignore_pricing_rule
2022-09-20 16:19:16 +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
2186a89781
Merge pull request #32280 from s-aga-r/refactor/report/item-shortage-report
refactor: rewrite `Item Shortage Report` queries in QB
2022-09-20 11:14:32 +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
377576f131
Merge pull request #32274 from s-aga-r/fix/stock-entry/subcontract-order-item-reference
fix: `po_detail` or `sco_rm_detail` not getting set while while mapping SE
2022-09-19 19:18:54 +05:30
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
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
b944849bd4
Merge pull request #32250 from s-aga-r/fix/stock-entry/supplied-item-reference
fix: make `po_detail` or `sco_rm_detail` mandatory for SE Send to Subcontractor
2022-09-18 14:54:08 +05:30
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
3b5284ec2b
Merge pull request #32247 from s-aga-r/fix/stock-entry/sco-rm-detail
fix: add SCO supplied item reference while mapping the Stock Entry
2022-09-17 15:42:03 +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
Sagar Sharma
43ebfa7982
Merge pull request #32236 from s-aga-r/fix/production-plan/pending-qty
fix: production plan pending-qty
2022-09-16 18:29:46 +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