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

6628 Commits

Author SHA1 Message Date
ruthra kumar
c5e4e01747
Merge pull request #37202 from ruthra-kumar/ignore_ple_on_pcv_cancellation 
refactor: ignore PLE's on PCV cancellation
 2023-09-22 13:28:40 +05:30
ruthra kumar
301092dad1 refactor: ignore PLE's on PCV cancellation 2023-09-22 12:40:51 +05:30
ruthra kumar
150728deaa refactor: button on PE to filter associated Journals 2023-09-22 11:30:47 +05:30
ruthra kumar
d4773872aa
Merge pull request #37069 from marination/advance-unlink-impact 
fix: Recalculate `advance_paid` in SO/PO after unlinking from advance entry
 2023-09-22 08:35:27 +05:30
ruthra kumar
f31a527505
Merge pull request #37120 from vorasmit/fix-dup-advance 
fix: handle multiple references with same name
 2023-09-21 14:20:04 +05:30
Ankush Menat
bf01f3227f chore: remove import script 
Unused
 2023-09-20 16:22:49 +05:30
Smit Vora
3e282bfbce
chore: add regional support for getting payment entries (#37119) 
chore: add regional support for get payment entries
 2023-09-19 20:47:21 +05:30
Deepesh Garg
e19e04b050
feat: Add a process document for Subscription (#37126) 
* feat: Add a process document for Subscription

* chore: Remove print statements

* feat: Input for generating invoice before currenc invoice date

* chore: patch for backward compatability

* refactor: Unit tests for subscription

* chore: set status on insert
 2023-09-19 18:39:44 +05:30
ruthra kumar
5acbf3f262
Merge pull request #37127 from ruthra-kumar/better_date_filters_in_get_outstanding_invoices 
refactor: better date filters in `Get Outstanding Invoices` dialog
 2023-09-18 13:20:32 +05:30
RitvikSardana
3764c01028
fix: accounting dimensions required while creating POS Profile (#36668) 
* fix: accounting dimensions required while creating POS Porfile

* fix: accounting dimensions fetched while closing POS

* chore: code cleanup

* fix: ad set in final consolidated invoice

* chore: code cleanup

* chore: code cleanup

* fix: accounting dimension validation from backend

* chore: code cleanup

* chore: code cleanup

* chore: code cleanup

* fix: added edge case when acc dimension is created after creating pos profile

* test: added test case for Pos Closing For Required Accounting Dimension In Pos Profile

* test: fixed the test case

* test: fixing test case

* fix: changed test case location

* test: fixing test case

* test: fixing test case

---------

Co-authored-by: Ritvik Sardana <ritviksardana@Ritviks-MacBook-Air.local>
 2023-09-18 13:07:14 +05:30
ruthra kumar
9004721859 refactor: better date filters in Get Outstanding Invoices dialog 2023-09-18 12:46:08 +05:30
Smit Vora
a9c85e4179 fix: handle multiple references with same name 2023-09-17 16:14:21 +05:30
Deepesh Garg
5e21e7cd1d
fix: Don't allow merging accounts with different currency (#37074) 
* fix: Don't allow merging accounts with different currency

* test: Update conflicting values

* test: Update conflicting values
 2023-09-17 15:54:06 +05:30
ruthra kumar
21f94918a3
Merge pull request #36893 from marination/bank-reco-code-cleanup 
refactor: Bank Reconciliation Tool APIs
 2023-09-17 08:07:30 +05:30
Gursheen Kaur Anand
099468e3cf
fix: company wise deferred accounting fields in item (#37023) 
* fix: move deferred accounts in accounting section

* fix: move deferred check boxes in item accounting

* fix: show company wise acc in filters

* fix: fetch item deferred account from child table

* fix: tests using deferred acc

* refactor: use cached value

* fix: cached value call

* feat: patch to migrate deferred acc

* fix: hardcode education module doctypes in patch

* chore: resolve conflicts

---------

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-09-16 21:25:31 +05:30
ruthra kumar
94ce43b0d5 refactor: add unreconcile btn to purchase invoice 2023-09-15 16:21:50 +05:30
ruthra kumar
2be025311a test: bank reconciliation API methods 2023-09-15 14:44:07 +05:30
ruthra kumar
85ebaa3aed
Merge pull request #36879 from ruthra-kumar/unreconcile_feature 
feat: Unreconcile Payments
 2023-09-14 12:17:46 +05:30
Gursheen Kaur Anand
5976d0d13f
fix: prorate factor in subscription invoice total (#36880) 
fix: prorate factor calculation
 2023-09-14 12:05:05 +05:30
Deepesh Garg
6664bc98a0
Merge pull request #37041 from vorasmit/fix-advances 
fix: multiple fixes for booking advances in seperate account
 2023-09-13 20:24:57 +05:30
marination
8a4954d713 test: Impact on SO of advance PE submit and unlinking/replacement by SI 2023-09-13 19:09:03 +05:30
Deepesh Garg
1d014122c1
Merge pull request #36980 from anandbaburajan/SI_DI_internal_and_external_links 
fix: + btn not appearing for delivery note connection
 2023-09-13 15:16:11 +05:30
Smit Vora
c09807845f fix: ensure correct preview and set latest transaction date 2023-09-12 13:25:51 +05:30
marination
2ad62be2c7 chore: Convert db.sql to QB queries 2023-09-12 00:00:06 +05:30
marination
b9750f324b fix: Remove get_matching_vouchers_for_bank_reconciliation 
- There should only be one hook to add queries to `get_linked_payments`
- `get_matching_queries` will be the only hook just like before
 2023-09-11 21:51:10 +05:30
Smit Vora
43061f4416 fix: correct set_query filters 2023-09-11 19:16:25 +05:30
Deepesh Garg
b34c03d306
Merge pull request #36843 from GursheenK/process-soa-pdf-name 
fix: show customer name for naming series in process soa
 2023-09-10 12:20:53 +05:30
ruthra kumar
d398775715 test: multi currency invoice unreconciliation 
exchange gain/loss associated with the unreconcile invoice should be
cancelled as well
 2023-09-09 07:30:58 +05:30
ruthra kumar
5c09fdf941 refactor(test): more modularization 2023-09-09 06:54:50 +05:30
ruthra kumar
1d93d66c30 refactor: cancel gain/loss JE on multi currency transactions 2023-09-08 21:29:13 +05:30
Sagar Vora
1b853857aa chore: remove unused variable job 2023-09-06 14:14:22 +05:30
anandbaburajan
e1a94a9ba1 fix: move SI and DI connected links to internal_and_external_links 2023-09-05 21:38:06 +05:30
Anand Baburajan
174f95d699
fix: ask for asset related accounts only when needed (#36960) 
* fix: only ask for asset_received_but_not_billed account when needed

* chore: remove unnecessary if condition

* fix: only ask for expenses_included_in_asset_valuation account when needed
 2023-09-05 17:45:23 +05:30
ruthra kumar
6fd1c1bca2 refactor: display allocated amount in account currency with symbol 2023-09-05 09:34:01 +05:30
ruthra kumar
67980188a7 test: more granular unreconciliation 2023-09-05 08:34:26 +05:30
ruthra kumar
9b6eac23b6 refactor: unlink individual vouchers from payments 2023-09-05 08:34:26 +05:30
ruthra kumar
b4dc2bdf28 chore: type info 2023-09-05 08:34:26 +05:30
ruthra kumar
de910ab152 refactor: single fetch and unlinking logic for JE and PE 2023-09-05 08:34:26 +05:30
ruthra kumar
285963acdb feat: unreconcile support for journal entry 2023-09-05 08:34:26 +05:30
ruthra kumar
cce96669f0 refactor: modularisation and group by voucher_no 2023-09-05 08:34:26 +05:30
ruthra kumar
0ccb6d8242 chore: rename and add trigger in journal entry 2023-09-05 08:34:26 +05:30
ruthra kumar
69683776a5 chore: code cleanup 2023-09-05 08:34:26 +05:30
ruthra kumar
1981f3837a chore: fetch logic for payment entry 2023-09-05 08:34:26 +05:30
ruthra kumar
25fe752185 chore: move functions to a separate file in utils 2023-09-05 08:34:26 +05:30
ruthra kumar
5981c7e0ad chore: move dialog building function to utils.js file 2023-09-05 08:34:26 +05:30
ruthra kumar
58dc0e52e1 refactor: add UI elements 2023-09-05 08:34:26 +05:30
ruthra kumar
6bbe47c671 chore: delete unreoncile doc upon parent doc deletion 2023-09-05 08:34:26 +05:30
ruthra kumar
489a545bbb chore: track changes 2023-09-05 08:34:26 +05:30
ruthra kumar
42df0d3d67 refactor: remove references using framework 2023-09-05 08:34:26 +05:30
ruthra kumar
41eb2c9f5a feat: filter on voucher no 2023-09-05 08:34:26 +05:30