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

6580 Commits

Author SHA1 Message Date
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
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
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
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
f7865da4d2 refactor: gain/loss should use same posting date as payment 2023-09-04 21:40:40 +05:30
ruthra kumar
04bc353e7f
Merge pull request #36940 from ruthra-kumar/invalid_gain_loss_in_expense_claim 
fix: invalid gain/loss JE created on base currency Expense Claim
 2023-09-04 13:56:01 +05:30
ruthra kumar
75d95acb23 fix: invalid gain/loss JE created on base currency Expense Claim 2023-09-04 13:05:57 +05:30
ruthra kumar
27e0dd9fdc
Merge pull request #36911 from ruthra-kumar/deduplicate_gain_loss_journal_creation 
fix: deduplicate gain/loss JE creation for journals as payment
 2023-09-03 10:11:43 +05:30
ruthra kumar
d6a3b9a5c7 refactor: use payment's CC for gain/loss if company default is unset 2023-09-03 09:21:23 +05:30
Deepesh Garg
f3282b1bb3
Merge pull request #36908 from barredterra/unreconcile-bank-transaction 
fix: only show "Unreconcile" if reconciled
 2023-09-02 17:11:56 +05:30
Deepesh Garg
30aba9414c
Merge pull request #36900 from GursheenK/pcv-request-timeout 
fix: reduce threshold for background job in PCV
 2023-09-02 17:11:08 +05:30
barredterra
91e574609f fix: only show "Unreconcile" if reconciled 2023-09-01 19:23:27 +02:00
Gursheen Anand
b6e6f2ef8d fix: reduce threshold for bg job fn 2023-09-01 12:36:40 +05:30
ruthra kumar
a7e0709ae8 fix: difference amount in UI should not be calculated 2023-09-01 12:18:55 +05:30
ruthra kumar
64d835374b fix: calcuate received/paid amount on rate change in PE 2023-08-31 17:58:26 +05:30
Gursheen Anand
060da2c5bc fix: remove report field db set 2023-08-29 16:16:50 +05:30
Gursheen Anand
a006b66e45 test: auto email for ar report 2023-08-29 14:51:35 +05:30
Corentin Flr
5c4df3e0e3
fix: Setup flake8 to stop turning trailing commas into tuples (#36850) 2023-08-29 10:59:58 +05:30
Deepesh Garg
1c237f455e
fix(demo): COA fixes for Mexico country (#36840) 2023-08-29 10:50:12 +05:30
Gursheen Kaur Anand
26e8b8f959
fix: create entries for only PR items present in LCV (#36852) 
* fix: check if item code exists in lcv before creating gle

* refactor: use qb to fetch lcv items
 2023-08-29 09:03:31 +05:30
Gursheen Anand
f07f4ce86f fix: generate pdf only when result exists 2023-08-28 17:14:15 +05:30
ruthra kumar
9895bc3246
Merge pull request #36844 from ruthra-kumar/validation_error_on_payment_entry 
fix: allocation error on partial payment against sales order
 2023-08-28 15:11:36 +05:30
ruthra kumar
2fdbe82835 test: assert rounded amount is calculated 2023-08-28 14:30:37 +05:30
ruthra kumar
67a0969b78 test: allocation err misfire on Sales Order 2023-08-28 14:21:21 +05:30
ruthra kumar
714b8289c1 fix: fetch rounded total while pulling reference details on SO 2023-08-28 14:01:12 +05:30
Gursheen Anand
5c2a949593 feat: add field for specifying pdf name 2023-08-28 13:11:28 +05:30
Gursheen Anand
0a9187ea42 fix: show letterhead and terms for AR pdf 2023-08-28 13:09:51 +05:30
ruthra kumar
d40504b973 test: Exchange Rate Revaluation functions and its impact on ledger 2023-08-27 14:33:34 +05:30
Abdo
6b75c03f34
chore: translate currency (#36777) 
chore: translate currency
 2023-08-26 19:37:28 +05:30
Deepesh Garg
1449e38b39
Merge pull request #36799 from deepeshgarg007/tds_on_debit_note 
fix: Tax withholding reversal on Debit Notes
 2023-08-24 19:30:54 +05:30
Deepesh Garg
5f75aea6fa fix(demo): Default accounts for demo company 2023-08-24 17:58:51 +05:30
Deepesh Garg
6349b67df4 fix(demo): Default accounts for demo company 2023-08-24 17:54:14 +05:30
Deepesh Garg
6d9cebfee9 fix: Tax withholding reversal on Debit Notes 2023-08-24 11:49:03 +05:30
ruthra kumar
758ea7bfe1
Merge pull request #35330 from ruthra-kumar/cr_note_posts_gl_for_itself 
refactor: cr/dr note should be standalone even when created from another invoice
 2023-08-23 20:38:14 +05:30
ruthra kumar
60eee564bf refactor: Payment btn criteria for Cr/Dr notes 2023-08-23 17:58:15 +05:30
ruthra kumar
bf6bf79ae3
Merge pull request #36650 from ruthra-kumar/refactor_payment_reconcliation_ui 
perf: improve responsiveness of payment reconciliation tool
 2023-08-23 09:12:36 +05:30
ruthra kumar
e93b927051 chore: clean up stale code in reconciliation tool 2023-08-22 05:32:56 +05:30
ruthra kumar
d01f0f2e96 refactor: filter for journal entries 2023-08-21 20:50:34 +05:30
ruthra kumar
86bac2cf52 refactor: filter on advance payments 2023-08-21 20:50:34 +05:30
ruthra kumar
52f609e67a refactor: filter on cr/dr notes 2023-08-21 20:50:34 +05:30
ruthra kumar
e48f8139eb refactor: trigger on value change 2023-08-21 20:50:34 +05:30
ruthra kumar
7a381affce refactor: limit output to 50 in reconciliation tool 2023-08-21 20:50:32 +05:30
Ankush Menat
86cac1e1d2
fix: add missing items labels back (#36737) 
[skip ci]
 2023-08-21 15:59:52 +05:30
Smit Vora
c47adcfdd9 fix: advance in seperate account 2023-08-21 15:12:11 +05:30
Deepesh Garg
ddd929ef9b
Merge pull request #36696 from RitvikSardana/develop-ritvik-pos-mode-of-payment 
fix: mode of payment fetched from pos profile company in POS
 2023-08-20 15:37:15 +05:30