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
5782c4469a
refactor: re-add remarks field to payment ledger and AR/AP report
2022-08-29 15:59:37 +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
ruthra kumar
c42fef541a
chore: remove precision on discount_percentage of Sales Invoice Item
2022-08-26 13:15:55 +05:30
ruthra kumar
6aa8fd0f7b
fix: restrict party types to Supplier/Customer for AR/AP report
2022-08-25 15:50:06 +05:30
Deepesh Garg
e9b0c7177f
Merge branch 'develop' into fix-consolidation-precision-error
2022-08-25 11:41:20 +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
ruthra kumar
e5b04d54ff
fix: display amount in account currency if party is supplied
2022-08-25 10:05:25 +05:30
ruthra kumar
ee889afd4c
Merge pull request #31942 from ruthra-kumar/bug_ar_ap_report_include_payment_against_po
...
fix: include payment against PO in AR/AP report
2022-08-25 09:40:45 +05:30
ruthra kumar
36f5883dda
test: payments against so/po will show up as outstanding amount
...
1. Class will use FrappeTestCase fixture
2. setup and teardown methods are introduced
3. test for payments against SO
2022-08-24 13:59:42 +05:30
ruthra kumar
fdd167cac1
fix: include payment against PO in AR/AP report
2022-08-24 12:24:55 +05:30
ruthra kumar
277ef04b60
test: remove discount accounting tests
2022-08-23 15:17:27 +05:30
ruthra kumar
a956e20f29
refactor: disable discount accounting on Buying module(PI)
2022-08-23 11:36:00 +05:30
Deepesh Garg
9fd0c25c9f
Merge pull request #31910 from deepeshgarg007/cash_and_non_trade_discount_fix
...
fix: Cash and non trade discount calculation
2022-08-23 10:19:09 +05:30
Maharshi Patel
42de9ca49e
fix: TDS calculation for advance payment
...
"against_voucher": ["is", "not set"] was used in query due to which if TDS was added on "advance" payment vouchers and then reconciled against purchase invoice. it will not find those vouchers and consider this as first-time threshold due to which it will calculate Tax for all transactions.
(cherry picked from commit a4521437825a960e14556fa3963bd1bd1a55a2dc)
2022-08-22 03:29:46 +00:00
Deepesh Garg
3b15966cc9
fix: Cash and non trade discount calculation
2022-08-21 17:51:05 +05:30
Saqib Ansari
756fe4b375
fix(pos): edge case while closing pos ( #31748 )
...
* fix(pos): edge case while closing pos
* fix: linter
* fix: setting posting_time in pos invoice merge log
2022-08-19 10:22:00 +05:30
ruthra kumar
72a7ed5b58
Merge pull request #31871 from ruthra-kumar/fix_gross_profit_valuation_rate
...
fix: incorrect buying amount in Gross Profit rpt
2022-08-18 16:08:19 +05:30
ruthra kumar
967dd398e7
fix: incorrect buying amount in Gross Profit rpt
2022-08-17 16:21:03 +05:30
ruthra kumar
ea84c157e0
Merge pull request #31856 from ruthra-kumar/incorrect_tax_due_to_exchange_rate
...
fix: incorrect tax amt due to different exchange rate in PR and PI
2022-08-17 15:05:57 +05:30
ruthra kumar
5fd0770372
fix: incorrect tax amt due to different exchange rate in PR and PI
2022-08-16 16:41:33 +05:30
hrzzz
3ef551872a
fix: remove spaces and order import
2022-08-15 09:23:56 -03:00
hrzzz
27891ecb77
feat: two new filters for gross profit
2022-08-15 09:14:23 -03:00
Deepesh Garg
79ac50d0f7
fix: Unable to make payment entry against Fees using education app
2022-08-11 19:31:31 +05:30
Saqib Ansari
33762dbbac
fix(pos): error while consolidating pos invoices
2022-08-10 14:17:28 +05:30
Akash Krishna
32b30bc5de
Tds report ( #31801 )
...
* fix: TDS Computation Summary Report not loading, too many values to unpack
2022-08-09 17:41:02 +05:30
Raffael Meyer
6b510546ae
fix: german translations ( #31732 )
2022-08-09 15:11:52 +05:30
Deepesh Garg
b85dbdc3c1
Merge pull request #31777 from ruthra-kumar/intercompany_po_bug
...
fix: intercompany SO created from Purchase Order throws exception
2022-08-08 16:06:09 +05:30
Sagar Vora
a3625b3817
fix: set billing_address
for purchases in get_party_details
2022-08-08 06:04:10 +00:00
ruthra kumar
af0a353b79
fix: intercompany SO throws exception
2022-08-04 14:01:23 +05:30
ruthra kumar
ef312b8fc4
test: posting_date should not affect outstanding amount calculation
2022-08-04 09:38:01 +05:30
ruthra kumar
5f1562c5b2
fix: posting_date of linked vouchers should not affect outstanding
...
posting_date filter should not be applied for linked vouchers.
2022-08-04 09:38:01 +05:30
HarryPaulo
ea88451875
fix: getting error to show sales invoice group or print rep… ( #31756 )
...
fix: formatter getting error to show sales invoice group or print report.
1 - When I view the Gross Profit report in Sales Invoice mode, the table is all broken.
Error on browser console:
TypeError: Cannot read properties of undefined (reading 'indent')
2 - When I try to print, no matter the Group (Sales Invoice, Item Code, Item Group...) nothing happens. in browser log console I have the following error:
TypeError: Cannot read properties of undefined (reading 'content')
i fixed both errors and all working perfectly.
2022-08-03 11:21:30 +05:30
Devin Slauenwhite
9c580dde39
fix: linter ( #31763 )
2022-08-03 11:16:59 +05:30
Suraj Shetty
273c6ff598
Merge pull request #31690 from phot0n/fix-payments-stuff
2022-07-27 14:37:15 +05:30
phot0n
0048bcb067
chore: fix linter
2022-07-27 12:34:52 +05:30
Deepesh Garg
1e3918d637
Merge pull request #31286 from SolufyPrivateLimited/solufy_rec_pay_report
...
fix: Added total of future amount, Remaining Balance in Payable and Receivable reports
2022-07-27 08:26:16 +05:30
Deepesh Garg
98b42ce786
Merge pull request #31676 from ruthra-kumar/fix_tax_withholding_checkbox_on_PI
...
fix: enable tax withholding checkbox in PI with supplier_tds
2022-07-25 12:56:29 +05:30
Gavin D'souza
cb73528c9c
test: Use assertSequenceEqual for comparision between Tuple / Lists
...
Use AssertSequence for type agnostic checks
2022-07-25 11:54:49 +05:30
phot0n
ef14da21bc
fix: payment utils import paths
...
Since we're splitting payments app from frappe, updating
ERPnext paths as well
2022-07-25 10:38:09 +05:30
ruthra kumar
b461724416
fix: enable tax withholding checkbox in PI with supplier_tds
2022-07-22 14:32:14 +05:30
ruthra kumar
04c1019242
fix: update SO's percentage billed on credit note
...
Credit Note created from Sales Return will update precentage billed in
Sales Order accordingly
2022-07-21 13:05:34 +05:30
ruthra kumar
739d328412
Merge pull request #31537 from ruthra-kumar/add_index_to_payment_ledger
...
refactor: create index for payment ledger
2022-07-21 12:50:39 +05:30
Saqib Ansari
d578afab55
fix: rounding errors while closing pos ( #31654 )
2022-07-21 12:18:28 +05:30
Saqib Ansari
2eaa8b17bd
fix(pos): validate product bundles while submitting pos invoice ( #31615 )
2022-07-21 12:17:58 +05:30
Rucha Mahabal
f222284c33
Merge branch 'develop' into hr-separation
2022-07-20 15:47:40 +05:30
Rucha Mahabal
f2532a6aaa
Merge branch 'develop' into hr-separation
2022-07-20 14:22:27 +05:30
Nabin Hait
516be870df
fix: Renamed status field to gle_processing_status
2022-07-20 11:07:02 +05:30
Rucha Mahabal
b30f66c029
chore: use get_single_value
in place of get_value
2022-07-19 17:51:03 +05:30
Nabin Hait
69b906438d
fix: set status on submit/cancel
2022-07-19 15:05:56 +05:30
Nabin Hait
914a388ee3
test: Added test for PCV cancellation
2022-07-19 14:34:01 +05:30
Nabin Hait
4caaab32d1
perf: Optimization of gl entry processing logic in period closing voucher
2022-07-19 14:33:49 +05:30
Deepesh Garg
a6ff4db2ec
fix: Supplier details in TDS monthly report ( #31599 )
2022-07-19 10:14:44 +05:30
Rucha Mahabal
db586afc7b
chore: Remove Salary Component Accounts doctype from Accounts module
2022-07-13 13:38:58 +05:30
Rucha Mahabal
d8aa1c59f1
Merge branch 'develop' into hr-separation
2022-07-12 19:27:19 +05:30
Deepesh Garg
9b40f70ac2
Merge branch 'develop' into add_index_to_payment_ledger
2022-07-11 21:18:10 +05:30
Deepesh Garg
0b822dade0
Merge pull request #31566 from deepeshgarg007/ignore_account_currency
...
fix: Allow multi currency invoice against single party account
2022-07-11 21:14:02 +05:30
Rucha Mahabal
5a51951224
test: Basic Payment Entry for Employee
2022-07-11 14:36:33 +05:30
Deepesh Garg
c83fbd5c50
fix: Allow multi currency invoice against single party account
2022-07-11 13:43:01 +05:30
Rucha Mahabal
cd9a01be5f
test: Loan entries in Bank Reco Statement report
2022-07-11 11:57:25 +05:30
ruthra kumar
74d9fc2155
refactor: create index for payment ledger
2022-07-11 11:17:27 +05:30
Rucha Mahabal
f6fb00b59d
test: Matching Loan Repayment query in Bank Reco
2022-07-08 19:28:38 +05:30
Rucha Mahabal
108cce2785
refactor: rewrite raw sql queries with frappe.qb and database API
2022-07-07 19:00:19 +05:30
Rucha Mahabal
ef02e58859
Merge branch 'develop' into hr-separation
2022-07-07 13:46:54 +05:30
Sagar Sharma
f9885746a8
Merge branch 'develop' into subcontracting
2022-07-07 09:56:23 +05:30
Nihantra C. Patel
3e670eda68
fix: Set the condition to create a purchase receipt
2022-07-05 21:19:50 +05:30
Deepesh Garg
37f7801cfb
Merge pull request #29884 from resilient-tech/remove-india
...
refactor: remove India specific code
2022-07-05 18:50:41 +05:30
Sagar Sharma
f75d35ed60
Merge branch 'develop' into subcontracting
2022-07-05 11:25:08 +05:30
ruthra kumar
104c45ecc4
fix: test pr output for amount and currency
2022-07-04 18:04:29 +05:30
Deepesh Garg
ac9d38aa1c
Merge pull request #31499 from ruthra-kumar/bug_use_account_currency_on_reconciliation_tool
...
fix: Use account currency on Payment Reconciliation tool
2022-07-03 19:20:29 +05:30
Sagar Vora
05351bee8b
Merge remote-tracking branch 'upstream/develop' into remove-india
2022-07-03 18:07:44 +05:30
Deepesh Garg
b168d2fc25
Merge branch 'develop' of https://github.com/frappe/erpnext into e_invoice_discounts
2022-07-03 11:02:32 +05:30
Deepesh Garg
38352b3e46
test: Add test for einvoice discounts
2022-07-02 22:27:20 +05:30
Deepesh Garg
b4f6429e32
Merge branch 'develop' of https://github.com/frappe/erpnext into e_invoice_discounts
2022-07-02 18:42:31 +05:30
Rucha Mahabal
466bf99835
fix: Remove Expense Claim from Bank Reconciliation
...
- add hooks `get_matching_queries` and `bank_reconciliation_doctypes` to extend the functionality in other apps
2022-07-01 19:01:17 +05:30
ruthra kumar
c9d67defd8
test: PR output should have account currency
2022-07-01 13:02:14 +05:30
ruthra kumar
219855311d
fix: wrong amount fetched in payment reconciliation tool
...
- fetch amount on account currency for outstanding invoices and
- unreconcilied dr/cr notes
- fix currency field name in payment ledger entry creation
2022-07-01 12:47:07 +05:30
Rucha Mahabal
3051f6e7f2
fix: Update triggers on Payment Reconciliation
2022-06-30 21:37:55 +05:30
Deepesh Garg
536e768ba9
fix: Internal PI link in Sales Invoice
2022-06-30 21:29:54 +05:30
Sagar Sharma
6589c5f5e9
Merge branch 'develop' into subcontracting
2022-06-29 17:29:24 +05:30
Rucha Mahabal
ef63c61ebd
Merge branch 'develop' into hr-separation
2022-06-29 12:35:51 +05:30
Deepesh Garg
3bbbf02ca8
Merge pull request #31460 from ruthra-kumar/bug_ar/ap_rpt_delivery_note
...
fix: 'attribute error' on AR/AP report with delivery note filter
2022-06-29 08:06:34 +05:30
Sagar Sharma
78ff1783b1
Merge branch 'develop' into subcontracting
2022-06-28 22:20:32 +05:30
Rucha Mahabal
6a65c8aff4
Merge branch 'develop' into hr-separation
2022-06-28 11:51:59 +05:30
Rucha Mahabal
2b255bdddb
fix: Bank Statement loan amount query
2022-06-27 19:18:13 +05:30
ruthra kumar
3cd34ebab6
fix: 'attribute error' on AR/AP report with delivery note filter
2022-06-27 17:29:25 +05:30
Sagar Vora
7f390fb755
Merge branch 'develop' into remove-india
2022-06-26 18:10:44 +05:30
Deepesh Garg
9c1eb770ba
Merge pull request #31442 from ruthra-kumar/incorrect_outstanding_on_multiple_cost_centers
...
fix: incorrect outstanding for invoice
2022-06-25 19:42:14 +05:30
Deepesh Garg
6acd0325be
fix: General Ledger and TB opening entries mismatch issues
2022-06-24 21:45:05 +05:30
ruthra kumar
321fea322c
test: invoice outstanding when gl's are split on cost center allocat
2022-06-24 17:47:11 +05:30
Sagar Vora
b6133c300e
test: create TDS payable account
2022-06-24 16:46:52 +05:30
Sagar Vora
4a2a02286a
test: create tax withholding category instead of updating
2022-06-24 15:49:19 +05:30
Sagar Vora
69ff61c838
fix: add Lower Deduction Certificate to the Accounting workspace for now
2022-06-24 15:12:43 +05:30
Sagar Vora
593147d337
test: move code to ensure fixtures get created
2022-06-24 14:37:11 +05:30
Sagar Vora
ff10f557c0
test: use Sales Expenses instead of VAT to test disabled account
2022-06-24 13:49:20 +05:30
ruthra kumar
71f6f78d94
fix: incorrect outstanding for invoice
2022-06-24 13:36:15 +05:30
Sagar Vora
0810674c8a
Merge remote-tracking branch 'upstream/develop' into remove-india
2022-06-24 13:08:40 +05:30
Rucha Mahabal
eac58abcc5
chore: Remove HR related reports from other modules
...
- Project Profitability report: Projects
- Employee Hours Utilization Based on Timesheet: Projects
- Unpaid Expense Claims: Accounts
2022-06-23 20:50:55 +05:30
Rucha Mahabal
1ff0e4519f
chore: Extract Expense Claim, FnF, Gratuity, Employee Advance related code from accounting
...
- Added hooks `advance_payment_doctypes`, `invoice_doctypes`, `period_closing_doctypes` for other apps to extend accounting functionality
- Removed `set_query` code from `journal_entry.js` and `payment_entry.js`
- removed `update_status_for_full_and_final_statement` trigger on JE submission/cancellation
- refactored `payment_entry.py`: split functions for validating reference doctypes for easy overriding, removed hrms references from `get_reference_details` and `get_payment_entry`
- removed dead code: functions `get_bill_no_and_update_amounts`, `get_total_amount_exchange_rate_base_on_currency`, `get_total_amount_exchange_rate_for_employee_advance`, `get_amounts_based_on_ref_doc`, `get_amounts_based_on_reference_doctype`
2022-06-23 16:17:34 +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
Rucha Mahabal
f6fbcc99a3
chore: Removed payroll dependencies from Loan Management, moved to hrms app
...
- Salary Slip Loan dt moved to hrms, removed from erpnext app
- Repay from Salary field removed from Loan and Loan Repayment, installed on hrms app setup
- fixed references to salary slip loan fields
2022-06-21 18:13:01 +05:30
s-aga-r
f6ef3068d7
Merge branch 'develop' into subcontracting
2022-06-20 23:10:31 +05:30
s-aga-r
6d89b2fa28
refactor: backport old subcontracting code
2022-06-20 23:10:02 +05:30
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
Sagar Vora
ec9861266e
Merge remote-tracking branch 'upstream/develop' into remove-india
2022-06-19 22:57:22 +05:30
Deepesh Garg
169ff5a0dd
feat: Cash and Non trade discounts in Sales Invoice
2022-06-19 21:18:12 +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
ruthra kumar
9cdc388c97
test: payment reconciliation tool
...
unit test cases for partial reconciliation, return invoice against
invoice, invoice against journals and journal against journal have
been added
2022-06-17 17:57:07 +05:30
ruthra kumar
65f47bca31
refactor: payment reconciliation tool
...
PR uses payment ledger for outstanding invoice and unreconcilied
cr/dr notes.
2022-06-17 17:57:07 +05:30
ruthra kumar
7b383880c6
feat: helper class for quering Payment Ledger
2022-06-17 17:57:07 +05:30
ruthra kumar
05467ffce2
test: use fixture for payment entry test cases ( #31390 )
...
refactor: use fixture for payment entry test cases
2022-06-17 17:23:29 +05:30
Conor
74a782d81d
refactor: DB independent quoting and truthy/falsy values ( #31358 )
...
* refactor: DB independent quoting and truthy/falsy values
* style: reformat to black spec
* fix: ifnull -> coalesce
* fix: coalesce -> Coalesce
* fix: revert pypika comparison
* refactor: convert queries to QB
* fix: incorrect value types for query
`=` query makes no sense with list of values
* fix: remove warehouse docstatus condition
* fix: keep using base rate as rate
Co-authored-by: Ankush Menat <ankush@frappe.io>
2022-06-17 17:01:27 +05:30
s-aga-r
ca24b5287e
chore: make "is_subcontracted" field read-only in PR and PI
2022-06-17 16:47:49 +05:30
s-aga-r
5002f1f1e5
feat: Add hidden field "is_old_subcontracting_flow" in PO, PR and PI
2022-06-17 16:47:41 +05:30
Ankush Menat
74007c8e91
fix(UX): hide irrelevant UOM fields ( #31392 )
...
fix(UX): hide UOM-related fields if they are inconsequential
2022-06-17 15:10:21 +05:30
Ankush Menat
10583eb3ce
fix: UOM handling for transaction without item ( #31389 )
...
If invoice is made without item code then UOM, Stock UOM and
conversion_factor all need to be manually added, this is confusing and
leads missing them out leads to errors.
Simplest solution:
- if either UOM exists then set both to same uom conversion factor to
- also set conversion factor based on UOM conversions
2022-06-17 12:13:27 +05:30
Jingxuan He
b4a93da9f3
chore: Fix a potential variable misuse bug ( #31372 )
...
* Fix a potential variable misuse bug
* chore: Separate check (separate line) for empty table in Pricing Rule
* chore: Code readability & check for field in row (now row itself)
Co-authored-by: marination <maricadsouza221197@gmail.com>
2022-06-16 12:16:59 +05:30
Ankush Menat
86919d2a6d
test: silent test failure in stock assertions ( #31377 )
...
If actual values are not present then test is silently passing, # of
actual values should be at least equal to expected values.
2022-06-15 21:19:09 +05:30
Ankush Menat
5c6f22f275
refactor: simpler batching for GLE reposting ( #31374 )
...
* refactor: simpler batching for GLE reposting
* test: add "actual" test for chunked GLE reposting
2022-06-15 19:30:26 +05:30
Rushabh Mehta
c0f9b34ede
fix(minor): move variants to separate tab ( #31354 )
...
* fix(minor): move variants to separate tab
* fix(minor): variants tab
* fix(minor): add counts
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
Co-authored-by: Ankush Menat <ankush@frappe.io>
2022-06-15 16:08:05 +05:30
Rucha Mahabal
0f83e7af56
fix: removed expense claim, advance and salary slip updates from PE/JE events
...
- moved them to HRMS app hooks
2022-06-15 13:58:41 +05:30
Conor
b8f728a40a
refactor: use CURRENT_DATE instead of CURDATE() ( #31356 )
...
* refactor: use CURRENT_DATE instead of CURDATE()
* style: reformat to black spec
* refactor: use QB for auto_close queries
Co-authored-by: Ankush Menat <ankush@frappe.io>
2022-06-15 12:07:33 +05:30
Sagar Sharma
406114374b
Merge branch 'develop' into subcontracting
2022-06-14 06:44:29 -07:00
s-aga-r
9a68af36ec
Merge branch 'develop' into subcontracting
2022-06-14 19:13:10 +05:30
Ankush Menat
2535d5edd0
perf: GLE reposting with progress and chunking ( #31343 )
...
If stock voucher count goes >1000 then fetching all gles and reposting
them all at once requires much more memory and can cause crash.
- This PR ensures that GLE reposting is done in chunks of 100 vouchers.
- This PR also starts keeping track of how many such chunks were
processed so in future progress is resumed in event of timeout.
2022-06-14 18:20:33 +05:30
Deepesh Garg
d05d15346a
fix: Conversion rate validation for multi-currency invoices
2022-06-14 12:50:49 +05:30
Deepesh Garg
5b2ba087a3
Merge branch 'develop' of https://github.com/frappe/erpnext into quotation_issues
2022-06-14 10:50:47 +05:30
Conor
00ef499739
refactor: use db independent offset syntax ( #31345 )
...
* chore: use db independent offset syntax
* fix: typo
* style: reformat code to black spec
Co-authored-by: Ankush Menat <ankush@frappe.io>
2022-06-14 10:49:07 +05:30
Sagar Sharma
f755430098
Merge branch 'develop' into subcontracting
2022-06-13 03:00:53 -07:00
Ankush Menat
697fbe946a
Merge pull request #31337 from gavindsouza/get_fiscal_years-refactor
...
refactor: get_fiscal_years API
2022-06-13 14:56:33 +05:30
Solufyin
0410752fcf
Merge branch 'frappe:develop' into solufy_rec_pay_report
2022-06-13 13:20:41 +05:30
Gavin D'souza
0727d1d99b
refactor: get_fiscal_years API
...
* Optimize fiscal year options generation
* Don't pass unrequired criterions / values to prepared query
* Use QB notation for raw query
2022-06-13 12:43:08 +05:30
Deepesh Garg
ea276a7b86
Merge branch 'develop' into refactor_ar/ap_report
2022-06-13 12:34:47 +05:30
ruthra kumar
3018756482
refactor: remove 'show remarks'
2022-06-13 10:56:33 +05:30
ruthra kumar
71521b6550
refactor: unit test for AR/AP report
2022-06-13 10:56:33 +05:30
ruthra kumar
cd9d70d6ee
refactor: show advance payments in AR/AP report
2022-06-13 10:56:33 +05:30
ruthra kumar
dfe3082596
refactor: AR/AP will use payment ledger
2022-06-13 10:56:30 +05:30
Deepesh Garg
eb93564db6
Merge branch 'develop' of https://github.com/frappe/erpnext into quotation_issues
2022-06-11 21:56:24 +05:30
Deepesh Garg
243625898e
fix(India): Sales taxes and charges template fetching in quotation
2022-06-10 22:05:58 +05:30
barredterra
f6695909c4
fix: remove DATEV from accounting workspace
2022-06-10 15:51:02 +02:00
Deepesh Garg
3d76b1a093
Merge pull request #31182 from ruthra-kumar/migrate_gl_to_payment_ledger_using_sql
...
refactor: migrating data from GL to payment ledger using raw SQL
2022-06-10 17:15:58 +05:30
hendrik
74b274f555
fix: update Period Closing Voucher per Company
...
Validate period closing voucher company-wise
2022-06-10 14:52:53 +05:30
Ankush Menat
450bef8443
Merge pull request #31240 from ankush/repost_match_gle
...
fix: unnecessary GLE reposts
2022-06-10 14:51:45 +05:30
Ankush Menat
1646fbe478
refactor: remove add_fetch ( #31315 )
...
- Sales Team already had fetch from set up
- Set up fetch from on sales partner in sales transaction
Reason for removal: the JS code applies arbitrarily to any field called "sales_person"
2022-06-10 13:52:17 +05:30
Deepesh Garg
9562c28408
Merge pull request #31198 from HarryPaulo/gross-profit-monthly-schedule
...
feat: two new groupby mode on gross profit: Monthly, Payment Term
2022-06-10 12:52:35 +05:30
Deepesh Garg
a2f34d74f3
Merge pull request #31225 from vishdha/fix_date_range_print
...
fix: Print/PDF for financial statement reports displays either wrong date range or wrong fiscal year
2022-06-10 10:52:53 +05:30
Deepesh Garg
43bf327f9b
Merge pull request #31216 from sunhoww/patch-4
...
fix: Trial Balance failing to ignore Finance Book
2022-06-09 20:34:33 +05:30
Sun Howwrongbum
ee2949aa3f
fix: typo in sql condition
2022-06-09 19:28:59 +05:30
Deepesh Garg
b9dbb36d0e
chore: Linting Issues
2022-06-09 18:58:04 +05:30
Marica
60968419e7
Merge pull request #31296 from ruthra-kumar/misalinged_columns_in_AR_report
...
fix: misaligned columns in print format of AR/AP report
2022-06-09 17:35:21 +05:30
ruthra kumar
bbaa14af16
fix: misaligned columns in print format of AR/AP report
2022-06-09 15:14:44 +05:30
Ankush Menat
eb53a9727d
perf: commit GL reposting periodically
...
If you have a huge list of docs to repost then maintaining transaction
throughtout entire GL reposting is not only unnecessary but also creates
performance issues. Periodically commiting the changes prevents lost
progress and reduces memory usage.
2022-06-09 11:37:43 +05:30
Ankush Menat
67c26325ee
fix: unnecessary GLE reposts
...
In Sales/Purchase invoices credit/debit are flipped and negated while making GLE,
this is unflipped while posting them but if we compare the flipped ones
it will always result in comparison failure and repost it.
2022-06-09 11:37:40 +05:30
Nihantra C. Patel
43b0f2efe6
[DEV] Accounts: Added total of future amount, Remaining Balance in Payable and Receivable reports.
2022-06-08 17:36:42 +05:30
Rushabh Mehta
b29edb302c
Merge pull request #31284 from rmehta/item-form-cleanup
...
fix(ux): Add tabs in Item
2022-06-08 17:01:57 +05:30
Sagar Sharma
f7a52f76d4
Merge branch 'develop' into subcontracting
2022-06-08 04:27:24 -07:00
Rushabh Mehta
5c6937865c
fix(ux): Add tabs in Item
2022-06-08 16:30:44 +05:30
Ankush Menat
f830b57fd4
test: sales register report with conditions
2022-06-07 15:23:32 +05:30
Ankush Menat
25f9d58c34
Merge pull request #31209 from ankush/purch_return_gle
...
fix: purchase invoice standalone return GLEs
2022-06-07 14:28:17 +05:30
Deepesh Garg
eae4f64dd8
Merge pull request #31233 from deepeshgarg007/pi_cancel_provisional_gl_entries
...
fix: Reverse provisional entries on Purchase Invoice cancel
2022-06-07 13:31:02 +05:30
Ankush Menat
7726271e2a
fix: purchase invoice return GLe
...
voucher_wise_stock_value contains tuples and the condition was looking
for string, so it's never triggered.
Caused by https://github.com/frappe/erpnext/pull/24200
2022-06-07 12:08:20 +05:30
Deepesh Garg
dc8e80ea81
test: Add test coverage for cancellation
2022-06-07 11:35:03 +05:30
Vishal Dhayagude
934cb97d90
Merge branch 'develop' into fix_date_range_print
2022-06-06 21:34:14 +05:30
Deepesh Garg
fe5b9e8bbb
Merge branch 'develop' into patch-4
2022-06-06 16:45:20 +05:30
vishdha
53774e0f52
chore: minor change in fetching start and end date
2022-06-06 16:00:56 +05:30
vishdha
3513d54c0a
fix: Print/PDF for financial statement reports displays either wrong date range or wrong fiscal year
2022-06-06 16:00:56 +05:30
Ankush Menat
c3219ebad1
fix(Sales Register): incorrect query with dimensions
...
If accounting dimension is also part of the default filters then same
query is repeated with incorrect syntax.
e.g. `item_group = (child1, child2)` instead of `in` query.
fix: don't add default filter if they are part of dimensions to be
added.
2022-06-06 12:39:12 +05:30
Sagar Sharma
74fae72939
Merge branch 'develop' into subcontracting
2022-06-06 10:27:25 +05:30
Deepesh Garg
aad887bab9
Merge branch 'develop' into patch-4
2022-06-06 09:16:22 +05:30
Deepesh Garg
8b56f0559e
Merge branch 'develop' into item_wise_report_perf
2022-06-06 09:01:37 +05:30
Deepesh Garg
86a24f3d22
fix: Simply cancel reverse entries
2022-06-05 19:12:24 +05:30
Deepesh Garg
61fa4eb6c9
fix: Reverse provisional entries on Purchase Invoice cancel
2022-06-05 18:23:24 +05:30
Deepesh Garg
a200e7e1fb
fix: Remove redundant query
2022-06-05 11:16:12 +05:30
s-aga-r
992ba974e2
Merge branch 'develop' into subcontracting
2022-06-03 13:25:49 +05:30
Deepesh Garg
3f376cc3a5
fix: Parent dimension filters in orders
2022-06-02 13:57:54 +05:30
Sun Howwrongbum
48bde2de2a
fix: Trial Balance failing to ignore Finance Book
2022-06-01 20:20:16 +05:30
hrzzz
c4af63ad98
feat: two new groupby mode: Monthly, Payment Term
2022-05-31 10:46:56 -03:00
Mitchy25
a0c412a0dd
Ignore Cancelled GL Entries
...
Profitability Analysis includes 'is_cancelled' GL Entries which means that the profit numbers are incorrect. This change will ensure that the profit figures ignore cancelled GL Entries.
2022-05-31 15:25:09 +12:00
ruthra kumar
4c74637c91
refactor: remove naming expression for payment ledger
2022-05-30 19:06:56 +05:30
HarryPaulo
4b04694c2c
fix(pos): freeze screen while processing pos invoices ( #30850 )
2022-05-27 12:16:07 +05:30
Sagar Sharma
bcaac8f90f
Merge branch 'develop' into subcontracting
2022-05-26 15:01:23 +05:30
Saqib Ansari
ca75d814a3
fix: timesheet fetching in sales invoice
...
(cherry picked from commit 216c32f4bc13376335ae31bd09fe6b5c01855ba2)
2022-05-25 14:45:41 +00:00
xdlumertz
c5e922c76b
fix: Chart data for monthly periodicity in Cash Flow report ( #31039 )
...
fix: Chart data for monthly periodicity in Cash Flow report
2022-05-25 19:39:59 +05:30
Deepesh Garg
efa5b5b3db
Merge pull request #31038 from alyf-de/taxes-title-field
...
feat: show title when linking Taxes and Charges Template
2022-05-25 19:28:59 +05:30
Deepesh Garg
d68187caae
Merge branch 'develop' into loan_doc_reco_queries
2022-05-25 18:50:54 +05:30
Deepesh Garg
9e4a36089e
chore: Linting Issues
2022-05-25 18:10:42 +05:30
Deepesh Garg
a1f53f8d31
chore: Linting Issues
2022-05-25 17:59:40 +05:30
Deepesh Garg
147fc8fde7
fix: Loan Doc query in Bank Reconciliation Statement
2022-05-25 17:58:30 +05:30
Deepesh Garg
ac17ecb84b
Merge branch 'develop' into party_account_currency_check
2022-05-25 16:21:06 +05:30
Deepesh Garg
bc34737709
chore: Update test case
2022-05-25 15:42:47 +05:30
Sagar Sharma
07dc5f180d
Merge branch 'develop' into subcontracting
2022-05-21 10:02:47 +05:30
ruthra kumar
dac678e3fc
test: payment ledger entry
2022-05-20 18:21:47 +05:30
ruthra kumar
e888975007
refactor: link payment ledger with gl entry creation
2022-05-20 18:21:47 +05:30
ruthra kumar
59ed7c854d
refactor: ignore linked Payment Ledger Entry in basic transactions
2022-05-20 18:21:47 +05:30