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
Rohit Waghchaure
bc3ab45af2
fix: opening entry causing discepancy between stock and trial balance
2022-09-23 15:21:09 +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
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
