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

6652 Commits

Author SHA1 Message Date
ruthra kumar
f160e49483
Merge pull request #37268 from GursheenK/ar-summary-party-filter 
fix: AP AR filters from Party link
 2023-09-28 11:54:34 +05:30
Gursheen Anand
4b28154f5e fix: process soa filter for multiselect 2023-09-27 13:04:13 +05:30
Deepesh Garg
8c5fcb8257
fix: PCV posting issues (#37029) 
* fix: PCV posting issues

* fix: process closing entries separately in a background job

* test: Update tests

* chore: fix broken ci
 2023-09-27 10:22:09 +05:30
ruthra kumar
a223935f14
Merge pull request #37248 from GursheenK/ar-summary-party-filter 
fix: AP & AR summary filters to match AR
 2023-09-27 09:41:01 +05:30
ruthra kumar
796cc0915a
Merge pull request #37194 from GursheenK/editable-purchase-invoice 
feat: editable purchase invoice
 2023-09-26 16:46:11 +05:30
Gursheen Anand
832d7e7d7b fix: set AR filters after rename 2023-09-26 15:08:40 +05:30
ruthra kumar
ed7f67b1a8 refactor: remove references in repost doctypes upon parent doc delet 2023-09-26 14:35:31 +05:30
Anand Baburajan
ee178ff2ce
chore: add disabled field for bank account (#37226) 2023-09-25 12:12:11 +05:30
Deepesh Garg
c7969b428d
Merge pull request #37116 from blaggacao/fix/payment-url 
fix: payment url display as link
 2023-09-24 21:50:53 +05:30
milanpethani
62ea097b14 fix: set customer currency in pos_invoice if exists 
if currency exists in the profile and customer currency doesn't exists still it will update currency to None, so update customer currency only if exists

(cherry picked from commit 041d52e82880610a99903ecf4c459e98bd1fff76)
 2023-09-24 12:23:58 +00:00
Gursheen Anand
61c6ebbb95 fix: validation for si 2023-09-23 20:30:50 +05:30
Gursheen Anand
8ef0d88708 fix: call validate before setting repost flag 2023-09-23 20:29:38 +05:30
Gursheen Anand
1856050ef9 fix: do not run bg job for single doc 2023-09-23 19:30:42 +05:30
Gursheen Anand
a856091ff4 refactor: remove repeated validation for voucher 2023-09-23 19:18:06 +05:30
Gursheen Anand
ba7212c98b refactor: remove unused method 2023-09-23 19:11:46 +05:30
Gursheen Anand
5346c67b02 fix: apply gl report filters 2023-09-23 17:50:45 +05:30
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
Gursheen Anand
c66c438575 test: reposted acc entries for pi 2023-09-22 11:22:25 +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
Gursheen Anand
c88f6d1fa7 fix: linting issues 2023-09-21 17:41:59 +05:30
Gursheen Anand
23470bf52d feat: allow repost for pi 2023-09-21 17:30:53 +05:30
Gursheen Anand
e77814fbc0 feat: add repost btn in invoice 2023-09-21 17:29:14 +05:30
Gursheen Anand
68effd93bd refactor: move reposting logic to common controller 2023-09-21 17:28:07 +05:30
Gursheen Anand
e922ec60eb feat: allow on submit fields 2023-09-21 17:26:20 +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
David Arnold
c99c486716
Merge branch 'develop' into fix/payment-url 2023-09-18 20:33:30 +02:00
David Arnold
7bc8ff21d4
fix: payment url display as link 2023-09-18 20:33:21 +02:00
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