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

9107 Commits

Author SHA1 Message Date
ruthra kumar
b43e068852
Merge pull request #35659 from ruthra-kumar/fix_attribute_error_in_payment_reconciliation 
fix: attribute error on payment reconciliation tool
 2023-06-13 10:16:26 +05:30
ruthra kumar
b672616617
Merge pull request #35620 from ruthra-kumar/err_higher_allowance_for_debit_credit_diff 
fix: allow custom rounding loss allowance in Exchange Rate Revaluation
 2023-06-13 09:46:08 +05:30
ruthra kumar
bada5796fa fix: attribute error on payment reconciliation tool 2023-06-13 09:32:24 +05:30
ruthra kumar
96a0132501 fix: allow user to set rounding loss allowance for accounts balance 2023-06-12 22:05:08 +05:30
Gursheen Anand
5e9821dce2 test: modify test to check posting date 2023-06-12 18:00:15 +05:30
ruthra kumar
42f4f80e0c
fix: Payment against credit notes will be considered as payment against parent invoice in Accounts Receivable/Payable report (#35642) 
* fix: payment against credit note should be linked to parent invoice

* test: AR/AP report for payment against cr note scenario

* fix: cr_note shows up as outstanding invoice

Payment made against cr_note causes it be reported as outstanding invoice
 2023-06-12 17:35:13 +05:30
Gursheen Anand
a06017c2c3 fix: Use advance account from Reconciliation document for fetching Payment Entries 2023-06-12 15:24:53 +05:30
Deepesh Garg
2f24546b21
fix: Make difference entry button not working (#35622) 2023-06-12 15:20:28 +05:30
Deepesh Garg
e30c3eafef fix: Stock ledger preview 2023-06-12 11:46:51 +05:30
Gursheen Anand
7591f1010b fix: Make get party account method return a list instead of a single default account. 2023-06-12 11:06:03 +05:30
David Arnold
c1b42b858d
fix: set Phone and Email option in doctypes (#35549) 2023-06-11 19:34:41 +05:30
ruthra kumar
dcbd7d5f1f
fix: incorrect TCS amount while customer has advance payment (#35397) 
* fix: incorrect TCS amount while customer has advance payment

* test: only unallocated advance should for threshold breach validation
 2023-06-10 20:55:30 +05:30
Raffael Meyer
b91bb17779
refactor: get default contact or address (#35248) 
* refactor: get_party_shipping_address

* refactor: get_default_contact

* chore: adding docstrings

* fix: keep original order

* fix: use get_all instead of get_list

---------

Co-authored-by: ruthra kumar <ruthra@erpnext.com>
 2023-06-08 19:49:09 +05:30
Gursheen Anand
b65e58c1ae test: add tests for advance liability entries 
Add Sales and Purchase Invoice Tests to check if GL entries and Outstanding Amount are generated correctly when advance entries are recorded as liability.

Few changes to return value of added column in Payment Entry References.
 2023-06-08 18:15:37 +05:30
ruthra kumar
992d61bd90 chore: fix travis 2023-06-08 15:11:46 +05:30
Gursheen Anand
4ee163742a fix: Using one field for both advance liability accounts 2023-06-08 13:15:23 +05:30
Devin Slauenwhite
54935438e1 fix: reconcile invoice against credit note 2023-06-07 15:55:37 -04:00
Devin Slauenwhite
7973951c37 fix: missing attribute error 2023-06-07 15:55:16 -04:00
Devin Slauenwhite
f68ab3dfff test: reconcile credit against invoice 2023-06-07 15:14:24 -04:00
Deepesh Garg
0bd4de4504 fix: Remove special treatment for P&L Accounts 2023-06-07 22:33:35 +05:30
Deepesh Garg
f732cac678
fix: Project in item-wise sales register (#35596) 2023-06-07 22:06:05 +05:30
Dirk van der Laarse
3b409af9a0
fix: exclude disabled customers when fetching customers on process statement of accounts (#35539) 
fix: exclude disabled when fetching customers
 2023-06-07 22:01:44 +05:30
Raffael Meyer
e1f3b7cbc8
fix: pass translated label to change button type (#35564) 
fix: change button type for translated labels

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2023-06-07 21:49:02 +05:30
Nikhil Kothari
83a7584475 fix: tests now create filters with checkbox enabled 2023-06-07 15:00:05 +05:30
Nikhil Kothari
e1116bbbbb fix: added server side check for allow/restrict 2023-06-07 14:20:42 +05:30
Nikhil Kothari
83c46085fb feat: added support for mandatory dimensions per account 2023-06-07 14:14:57 +05:30
DaizyModi
5155d5bfb2 chore: remove whitelisting for methods not accessed from UI 2023-06-07 12:05:17 +05:30
Ankush Menat
4507cb3cd7
fix: enqueue_after_commit wherever it makes sense (#35588) 2023-06-07 11:58:36 +05:30
marination
eb1db5eaa3 chore: Remove instances of bank_party_mapper and use new_doc 2023-06-07 11:54:51 +05:30
Marica
75387bbaef
Merge branch 'develop' into bank-trans-party-automatch 2023-06-06 19:03:26 +05:30
marination
752a92bd8b chore: Remove Bank Party Mapper implementation 
- Matching by Acc No/IBAN can easily happen with Bank Accounts. It's not a tedious query
- Historical lookups for  Party Name/Desc match are very tricky. The user could have manually set a match and we would not know. Also this leaves the Bank Party Mapper only useful for Party Name/Desc lookups, which feels excessive.
- We want to reduce the number of places the same data is stored and reduce confusion
- The Party Name/Desc will optionally happen fuzzily, or not at all
- There will be no Mapper lookups
 2023-06-06 18:59:07 +05:30
Nabin Hait
47ce6de57d feat: ability to create quotation against a prospect 2023-06-06 15:19:04 +05:30
Deepesh Garg
2e52a63b0d feat: Accounting Ledger Preview 2023-06-04 19:20:28 +05:30
rohitwaghchaure
14292ffc6f
Merge pull request #34564 from rohitwaghchaure/serial-no-normalization 
Feat: Serial No Normalization and Serial Batch Bundle
 2023-06-02 18:13:02 +05:30
Deepesh Garg
abc6fe0b06
refactor!: Remove custom cashflow report mapper (#35523) 
* refactor: Remove custom cashflow mapper

* chore: patch to delete docs

* fix: Cleanup defaults during install

* fix: Remove custom cashflow mapper from consolidated financial statement
 2023-06-02 17:48:59 +05:30
Rohit Waghchaure
74ab20f97a fix: travis for POS merge invoice and putaway rule 2023-06-02 17:14:18 +05:30
Rohit Waghchaure
f8bf4aa7c8 fix: travis for work order, pos invoice and landed cost voucher 2023-06-02 17:14:17 +05:30
Rohit Waghchaure
48fbf99e6d fix: travis for sales and purchase invoice 2023-06-02 17:14:17 +05:30
Rohit Waghchaure
d3ceb07936 fix: travis 2023-06-02 17:14:17 +05:30
Rohit Waghchaure
c2d7461d3c fix: travis issue 2023-06-02 17:14:17 +05:30
Rohit Waghchaure
9b72845f0f feat: serial and batch bundle for pick list 2023-06-02 17:14:16 +05:30
Rohit Waghchaure
648efca940 feat: auto create serial and batch bundle 2023-06-02 17:14:16 +05:30
Rohit Waghchaure
0eaf6de5de feat: serial and batch bundle for POS 2023-06-02 17:14:16 +05:30
Rohit Waghchaure
467046436b refactor: serial no ledger and batchwise balance history report 2023-06-02 17:14:16 +05:30
Rohit Waghchaure
5bb3173676 refactor: rename doctype serial and batch ledger to serial and batch entry 2023-06-02 17:14:15 +05:30
Rohit Waghchaure
e6143abb8a refactor: added new file serial batch bundle 2023-06-02 17:14:14 +05:30
Rohit Waghchaure
6c9b212dd1 fix: removed sales and purchase fields from serial nos 2023-06-02 17:14:14 +05:30
Gursheen Anand
74619269f0 feat: Record Advance Payments as Liability 
Ability to let user record advance payments as liability instead of a negative asset.

Issue #34282
 2023-06-02 17:13:51 +05:30
Nabin Hait
f11d9b019d
fix: Ignore permissions while submitting account closing balance record (#35536) 2023-06-02 16:57:00 +05:30
Raffael Meyer
09872301bd
Merge branch 'develop' into bank-trans-party-automatch 2023-06-01 18:03:10 +02:00