Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
44,216 Commits 3 Branches 0 Tags 1 GiB
c5ca8d74c4
Commit Graph

6006 Commits

Author SHA1 Message Date
Deepesh Garg
a3c89dbc10
fix: TDS deduction in payment entry (#33747) 
* fix: TDS deduction in payment entry
 2023-01-22 23:31:19 +05:30
Xeanth
ad437fd5ba
fix: use stock qty to calculate POS reserved stock (#33735) 2023-01-22 18:06:01 +05:30
Deepesh Garg
2f03dcb5b6
fix: Better budget exceeding validation messages (#33713) 
* fix: Better budget exceeding validation messages

* chore: remove unwanted changes
 2023-01-21 19:33:14 +05:30
rohitwaghchaure
b5d2eedfa6
Merge pull request #33759 from rohitwaghchaure/fix-incorrect-actual-qty-for-packed-item 
fix: incorrect actual qty for the packed item
 2023-01-20 23:38:55 +05:30
Rohit Waghchaure
02566a02a8 fix: incorrect actual qty for the packed item 2023-01-20 22:38:56 +05:30
Dany Robert
1e607cd4c7
fix(pricing rule): free item duplication (#33746) 
* fix(pricing rule): free item duplication

* chore: linting issues
 2023-01-20 20:07:37 +05:30
Ritwik Puri
17045f88a1
fix: use hash based naming for tax withheld vouchers child table (#33643) 2023-01-20 18:53:39 +05:30
Deepesh Garg
6b31c27ed6
fix: Missing constructor args in Bank Reco Tool (#33705) 2023-01-17 21:03:39 +05:30
Deepesh Garg
db9beb3cdd
fix: Rate from LDC in TDS reports (#33699) 2023-01-17 14:53:24 +05:30
Deepesh Garg
0639d9e32a
chore: Typo in payment reconciliation (#33686) 2023-01-17 08:06:30 +05:30
Devin Slauenwhite
179a31ed5e
feat: disable currency exchange api. (#33593) 2023-01-16 21:00:10 +05:30
Deepesh Garg
adaeba1554
fix(minor): Label updates in Statement of Accounts (#33639) 
fix(minor): Label updates in Satement of Accounts
 2023-01-16 14:03:54 +05:30
ruthra kumar
9627b46ee7
Merge pull request #33661 from ruthra-kumar/performance_tuning_payment_reconciliation 
perf: improve reconciliation performance for JE with 100s of accounts
 2023-01-16 09:41:17 +05:30
ruthra kumar
56aa1866da
Merge pull request #33663 from ruthra-kumar/attribute_error_on_repost_ple_tool 
fix: attribute error while submitting Repost PLE
 2023-01-16 09:36:22 +05:30
ruthra kumar
2c50f43cdd fix: attribute error while submitting Repost PLE 2023-01-15 20:51:54 +05:30
ruthra kumar
828eaf0930 fix: minor filter issue while reconciliation tool from bench console 2023-01-15 18:09:51 +05:30
Raffael Meyer
67cf7e1728
refactor: use DocStatus (#33594) 2023-01-15 17:34:16 +05:30
Deepesh Garg
afb33f2049
Merge pull request #33271 from sonali8848/filters-on-bank-reconciliation 
feat: Date filters on bank reconciliation tool
 2023-01-12 18:25:05 +05:30
Deepesh Garg
232726288a chore: fix fieldnames and order 2023-01-12 17:44:07 +05:30
Deepesh Garg
0ed938a490
fix: Incorrect exchange rate in payment entries (#33481) 
* fix: Incorrect exchange rate in payment entries

* test: Update failing tests
 2023-01-10 20:12:43 +05:30
Gughan Ravikumar
4d5067d6d4
fix(accounts): currency fields no longer read as strings by validation function in Payment Entry (#33535) 
explicitly cast paid_amount and received_amount to float in the Payment Entry set_unallocated_amount validation function
 2023-01-09 23:26:51 +05:30
sonali
917b2190aa fix: remove comments 2023-01-09 20:07:24 +05:30
Anand Baburajan
3ae47ab32c
Merge branch 'develop' into asset_depreciation_schedule 2023-01-04 01:34:08 +05:30
Deepesh Garg
1a83a67d41
fix: Get payment entry button not visible in Bank Clearance doc (#33518) 2023-01-03 21:34:49 +05:30
Deepesh Garg
9a3d947e89
fix: Exchange gain and loss booking on multi-currency invoice reconciliation (#32900) 
* fix: Exchange gain and loss booking on multi-curreny invoice reconciliation

* test: Update test cases

* chore: Ignore SQL linting rule

* chore: Joural Entry for exchange gainand loss booking

* chore: Journal entry for exchange gain loss booking

* test: Update test case

* chore: Default exchange gain and loss account
 2023-01-03 16:55:15 +05:30
anandbaburajan
312e51e8b2 chore: more refactoring and adding test for duplicate asset_depr_schedule 2023-01-03 15:09:04 +05:30
Anand Baburajan
72c2e77a5d
Merge branch 'develop' into asset_depreciation_schedule 2023-01-02 17:07:58 +05:30
anandbaburajan
7c5168eeac chore: allow manually submitting and cancelling asset depr schedule 2023-01-02 17:07:28 +05:30
ruthra kumar
914b23038c
refactor: Exchange rate revaluation to handle accounts with zero account balance (#33165) 
* refactor: new type for JE - Exchange Gain or Loss

* refactor: skip few validations for Exchanage Gain Or Loss type Jour

* refactor: ERR create 2 journals for handling zero and non-zero compa

1. Additional check box accounts table to identify accounts with zero balance
2. Accounts with zero balance only in either of the 2 currencies will be handled on separate Journal

* refactor: skips few validation for allowing 0 debit/credit

* fix: General Ledger presentaion currency

* test: fix test case in general ledger

* test: fix failing test case in AR report
 2023-01-02 14:33:14 +05:30
sonali
12822f7c36 fix: data format 2022-12-30 14:06:19 +05:30
Deepesh Garg
ad53ecf2b4 fix: Multi-currency issues in Bank Recociliation Tool 2022-12-30 13:37:41 +05:30
sonali
d65243eb65 feat: consolidated auto bank reconciliation 
Added a button of Auto Reconcile, to reconcile the bank entries as per the matching reference number with the bank transaction and count of transactions reconciled message will be pop up on clicking the auto reconcile button.
 2022-12-29 16:12:25 +05:30
sonali
c764f14f53 fix: pre-commit 2022-12-29 13:58:06 +05:30
sonali
35c29e0226 fix: pre-commit 2022-12-29 13:45:15 +05:30
sonali
f1810803e1 fix: passing from_date and to_date filters in test cases 
passing from_date and to_date filters in  test_linked_payments and test_debit_credit_output  for unit testing
 2022-12-29 13:07:06 +05:30
sonali
e2614b8a21 fix: pre-commit 2022-12-29 12:21:45 +05:30
sonali
3aaa2f5326 fix: filtered as per reference date 
On bank reconciliation, transactions will be filtered as per date selected in 'from_date' and 'to_date' fields , In dialog, all the bank entries will  be fetched as per the posting date selected and if filtered by reference date checkbox is tick then then there will be two fields 'from_reference_date' and 'to_reference_date' then all bank entries in dialog box came as per reference date, selected. And by default journal entry checkbox is tick.
Also sorted the bank transactions and bank entries as per ascending order date wise.
 2022-12-29 12:05:22 +05:30
Deepesh Garg
617518389a
fix: Conversion factor error for invoices without item code (petty expenses) (#32714) 
* fix: Set default uom conversion factor to 1 for invoices

* chore: set default conversion_factor as 1

* chore: remove print statements
 2022-12-29 10:41:36 +05:30
Dany Robert
cabaed9ed2
fix(pricing rule): consider child tables in condition (#33469) 2022-12-28 18:05:55 +05:30
Anand Baburajan
6f4e6fafa9
Merge branch 'develop' into asset_depreciation_schedule 2022-12-27 07:36:32 +05:30
anandbaburajan
6d791cabd1 chore: more refactoring 2022-12-26 22:13:11 +05:30
Deepesh Garg
8a79efab4b
feat: Accounting Dimension updation in Payment Request and Entry (#33411) 2022-12-26 10:17:55 +05:30
anandbaburajan
03662be150 chore: have different functions for draft. active and cancelled depr schedules 2022-12-25 18:05:19 +05:30
Anand Baburajan
b17ef34042
Merge branch 'develop' into asset_depreciation_schedule 2022-12-23 11:02:17 +05:30
sonali
81e5f71172 fix: json issue 2022-12-21 14:02:54 +05:30
Deepesh Garg
31c95deb88 chore: More fixes 2022-12-20 11:45:51 +05:30
Deepesh Garg
ff48634cbb Merge branch 'develop' of https://github.com/frappe/erpnext into payment_request_flow 2022-12-20 11:42:15 +05:30
Deepesh Garg
e25b98b620 chore: Update test case 2022-12-20 11:42:05 +05:30
Deepesh Garg
6238fd9d9e
Merge pull request #33341 from deepeshgarg007/tds_tcs_cost_center 
fix: Cost Center for tax withholding invoices
 2022-12-17 19:24:34 +05:30
sonali
05b6fce03d feat:filters on bank reconciliation 
Added date filters on bank transactions, payment entries and journal entries and sorted list as per date in ascending order.
 2022-12-17 17:15:28 +05:30