ruthra kumar
321fea322c
test: invoice outstanding when gl's are split on cost center allocat
2022-06-24 17:47:11 +05:30
ruthra kumar
71f6f78d94
fix: incorrect outstanding for invoice
2022-06-24 13:36:15 +05:30
Marica
1d683ca9f2
Merge pull request #31421 from s-aga-r/fix/production-plan/test/planned-qty
...
fix: add UOM validation for planned-qty
2022-06-24 12:40:03 +05:30
GangaManoj
416d578290
fix: Add missing comma
2022-06-23 15:14:31 +05:30
GangaManoj
1b1786532a
test: Test monthly depreciation by Written Down Value method
2022-06-23 15:14:31 +05:30
GangaManoj
2b7ab72a72
fix: Convert string to datetime object
2022-06-23 15:14:31 +05:30
GangaManoj
e62beaefc1
test: Test if final day of the month is taken if depr_start_date is the last day of its month
2022-06-23 15:14:31 +05:30
GangaManoj
154e258ad0
fix: Get last day of the monthif depr posting date is the last day of its month
2022-06-23 15:14:31 +05:30
GangaManoj
b07aae4da5
fix: Correct pro-rata amount calculation
2022-06-23 15:14:31 +05:30
GangaManoj
2d9153ea30
fix: Remove misleading comment
2022-06-23 15:14:31 +05:30
GangaManoj
ab13a178b5
fix: Replace asset life with total no of depreciations
2022-06-23 15:14:31 +05:30
Sagar Sharma
73a15adc67
Merge branch 'develop' into fix/production-plan/test/planned-qty
2022-06-23 11:20:22 +05:30
Deepesh Garg
79d5d35df9
Merge pull request #31395 from nihantra/bank_clear_summ
...
fix: filter set in Bank Clearance Summary
2022-06-23 10:54:56 +05:30
Sagar Sharma
70bc51a8fc
Merge branch 'develop' into fix/production-plan/test/planned-qty
2022-06-22 15:33:08 +05:30
s-aga-r
00807abe31
fix: add UOM validation for planned-qty
2022-06-22 14:28:17 +05:30
Deepesh Garg
db2484b6b2
Merge pull request #31418 from ruthra-kumar/payment_ledger_migration_logic_bug
...
fix: handle empty values("") in against_voucher columns on gl migration
2022-06-22 12:51:21 +05:30
Marica
4c0749e04a
Merge pull request #31406 from marination/bom-update-log-cleanup-perf
...
chore: Clear Progress section for completed logs & `on_submit` UX
2022-06-22 12:16:06 +05:30
Marica
46d02ec4b2
Merge branch 'develop' into bom-update-log-cleanup-perf
2022-06-22 11:50:06 +05:30
Marica
55d67a0d09
Merge pull request #31420 from HarryPaulo/translate-status-filter-orders
...
fix: translation for filter status on report
2022-06-22 11:45:59 +05:30
rohitwaghchaure
2ed06d7ceb
Merge pull request #31248 from rohitwaghchaure/fixed-transferred-materials-are-not-consumed
...
fix: transferred batches are not fetched while making Manufacture stock entry
2022-06-22 11:37:15 +05:30
hrzzz
8b1ff96e30
fix: translation for filter status on report
2022-06-21 15:10:19 -03:00
rohitwaghchaure
186224a12a
Merge branch 'develop' into fixed-transferred-materials-are-not-consumed
2022-06-21 22:45:05 +05:30
ruthra kumar
5826b7b071
fix: identify empty values "" in against_voucher columns
2022-06-21 19:50:50 +05:30
Vladislav
ce1b4e40a1
fix: update ru translate ( #31404 )
...
* Update ru.csv
* Update ru.csv
* Update ru.csv
* Update ru.csv
* Update ru.csv
* Update ru.csv
* Update ru.csv
* Update ru.csv
fix logic
* Update ru.csv
* Update ru.csv
* Update ru.csv
* Update ru.csv
* Update ru.csv
* Update ru.csv
* Update ru.csv
* Update ru.csv
* Update ru.csv
* Update ru.csv
* Update ru.csv
2022-06-21 19:25:05 +05:30
Ankush Menat
e866ec6e28
Merge pull request #31412 from s-aga-r/fix/bom/default
...
fix: set default_bom for item
2022-06-21 16:42:38 +05:30
s-aga-r
dc2830da4d
fix: set default_bom for item
2022-06-21 15:13:01 +05:30
Deepesh Garg
b16ab818c5
Merge pull request #31264 from ankush/internal_trasfer_precision_loss
...
fix: internal transfer GLE validation
2022-06-21 14:31:18 +05:30
marination
4cf2225a29
chore: Implement Log clearing interface in BOM Update Log
...
- Implement Log clearing interface in BOM Update Log
- Add additional info in sidebar: Log clearing only happens for 'Update Cost' type logs
- 'Replace BOM' logs have important info and is used in BOM timeline, so we'll let users decide if they wanna keep or discard it
2022-06-21 14:10:59 +05:30
Sagar Sharma
912d26361d
Merge branch 'develop' into fixed-transferred-materials-are-not-consumed
2022-06-21 13:23:37 +05:30
Marica
5ae8f5d4b8
Merge branch 'develop' into bom-update-log-cleanup-perf
2022-06-21 11:01:03 +05:30
Deepesh Garg
f572c20009
Merge branch 'develop' into internal_trasfer_precision_loss
2022-06-21 10:45:02 +05:30
Deepesh Garg
e0e2616054
Merge pull request #31350 from deepeshgarg007/sales_exchange_rate_validation
...
fix: Conversion rate validation for multi-currency invoices
2022-06-21 09:09:38 +05:30
barredterra
e2295b4e2f
fix: apply price list rate
2022-06-20 18:52:40 +02:00
Deepesh Garg
46e6c2cd0f
Merge branch 'develop' of https://github.com/frappe/erpnext into sales_exchange_rate_validation
2022-06-20 22:00:49 +05:30
Deepesh Garg
8f37393044
test: Add test case
2022-06-20 22:00:32 +05:30
marination
0320b59ea6
chore: Clear Progress section for completed logs & on_submit UX
...
- Delete `BOM Update Batch` table on 'Completed' log, to save space
- Hide Progress section on 'Completed' log
- Enqueue `on_submit` for 'Update Cost' job, getting leaf boms could take time for huge DBs. Users have to wait for screen to unfreeze.
- Add error handling to `process_boms_cost_level_wise` (Called via cron job and on submit, both in background)
2022-06-20 16:25:34 +05:30
Deepesh Garg
f337213f33
fix(India): Discounts in E-Invoicing
2022-06-19 21:19:02 +05:30
Deepesh Garg
169ff5a0dd
feat: Cash and Non trade discounts in Sales Invoice
2022-06-19 21:18:12 +05:30
Deepesh Garg
9aea017990
Merge pull request #31136 from ruthra-kumar/refactor_payment_reconciliation_tool
...
refactor: Payment Reconciliation tool will use Payment Ledger
2022-06-17 21:40:47 +05:30
Conor
ea28ed1bb3
refactor: if() to CASE WHEN ( #31360 )
...
* refactor: if() to CASE WHEN
* fix: remove duplicate order by
* fix: remove extraneous table
* style: reformat to black spec
Co-authored-by: Ankush Menat <ankush@frappe.io>
2022-06-17 21:17:48 +05:30
Deepesh Garg
4a90cd6d54
Merge branch 'develop' into refactor_payment_reconciliation_tool
2022-06-17 21:10:48 +05:30
Deepesh Garg
a0cab761b8
Merge pull request #31396 from deepeshgarg007/quotation_lost_update
...
fix: Quotation lost update
2022-06-17 21:09:03 +05:30
Deepesh Garg
e457288dba
chore: fix condition
2022-06-17 18:56:53 +05:30
Deepesh Garg
02f9441e1a
fix: Quotation lost update
2022-06-17 18:54:42 +05:30
Nihantra C. Patel
0097a2b60c
Update bank_clearance_summary.py
2022-06-17 18:35:11 +05:30
ruthra kumar
3a238b4daa
docs: specification of payment ledger
2022-06-17 17:57:07 +05:30
ruthra kumar
7312f22f35
refactor: update voucher outstanding from payment ledger
...
Outstanding amount is updated from payment ledger, only for
receivable/payable accounts. For remaining account types, update happens
from GL Entry.
2022-06-17 17:57:07 +05:30
ruthra kumar
524c175cf0
refactor: delink gl entry from reconciliation
2022-06-17 17:57:07 +05:30
ruthra kumar
ae8aa8f3e7
refactor: 'get outstanding invoices' popup in payment entry
...
Payment entry has option to select outstanding invoices using a popup
form. This change refactors the pop to use payment ledger to fetch +ve
outstanding invoices.
2022-06-17 17:57:07 +05:30
ruthra kumar
8c87674c62
refactor: outstanding_invoice function and helper class
...
outstanding invoice function has been refactored to use payment ledger
2022-06-17 17:57:07 +05:30
