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

768 Commits

Author SHA1 Message Date
Deepesh Garg
fbeaf2b398 Revert "fix: set against type in controllers" 
This reverts commit 4c5a83d6cf7e4b39a403b1e99a2b1c443f854ac9.
 2024-01-14 11:04:00 +05:30
Deepesh Garg
41d9225bd1
Revert "fix: GL values in transaction currency via JV" 2024-01-14 10:51:30 +05:30
barredterra
8039dc5194 Merge branch 'develop' into unreconcile-bank-transaction-on-cancel 2024-01-11 13:54:07 +01:00
Deepesh Garg
f057dc6867
Merge pull request #39256 from deepeshgarg007/opening_ignore_tempplate 
fix: Ignore default payment terms template for opening invoices
 2024-01-10 16:06:03 +05:30
barredterra
5b4c5d59d8 Merge branch 'develop' into unreconcile-bank-transaction-on-cancel 2024-01-09 18:12:30 +01:00
Deepesh Garg
53bf44d2b8 fix: Ignore default payment terms template for opening invoices 2024-01-09 15:57:38 +05:30
Nabin Hait
ec07b42ea2
Merge pull request #38530 from bosue/duplicate_zero_quantity_check2 
refactor: Consolidate duplicate zero-quantity Items checks for transactions.
 2024-01-09 13:12:25 +05:30
rohitwaghchaure
f09e2130a1
fix: serial / batch barcode scanner (#39114) 2024-01-04 14:58:02 +05:30
Deepesh Garg
5b1571879c fix: flaky demo test case 2024-01-04 10:48:01 +05:30
Deepesh Garg
beee98da6d
feat: Against voucher filter in General Ledger (#39100) 2024-01-03 10:03:27 +05:30
Deepesh Garg
3f9693b31f
fix: GL values in transaction currency via JV (#38914) 2023-12-31 20:00:03 +05:30
Deepesh Garg
cd37fd790b
fix: Validate account in Sales/Purchase Taxes and Charges Template (#39013) 2023-12-29 12:52:22 +05:30
Deepesh Garg
3b4b2275de
fix: Multiple subscription fixes (#39005) 2023-12-29 08:25:38 +05:30
barredterra
0a95b38166 fix: unreconcile Bank Transaction on cancel of payment voucher 2023-12-27 23:05:37 +01:00
Gursheen Kaur Anand
47f7b65058
feat: voucher subtype for general ledger (#38822) 
* feat: add voucher subtype column to gle

* feat: add logic to set voucher subtypes

* feat: fetch voucher subtype in ledger report

* fix: order of conditions
 2023-12-24 16:13:31 +05:30
Deepesh Garg
863116f1cd
Merge pull request #37232 from GursheenK/make-against-field-dynamic 
fix: make GL and JV against fields dynamic links
 2023-12-16 22:27:50 +05:30
Deepesh Garg
2588970d55 fix: Init internal child table values 2023-12-12 15:18:54 +05:30
rohitwaghchaure
89326bd657
fix: auto delete draft serial and batch bundle (#38637) 2023-12-10 11:05:58 +05:30
Bernd Oliver Sünderhauf
4918aeb4c6 refactor: Consolidate duplicate zero-quantity transaction Items checks. 2023-12-03 19:57:32 +01:00
s-aga-r
a008f5f611
Merge pull request #38493 from s-aga-r/FIX-6325 
fix: don't update previous doc on rate change
 2023-12-03 10:08:44 +05:30
Gursheen Kaur Anand
9087e1443e
fix: SO ordered qty on PO item removal (#38378) 
* fix: update ordered_qty for SO when PO items removed

* refactor: use cached value

---------

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-12-02 19:53:00 +05:30
s-aga-r
68f5dd3e7b fix: don't update previous doc on rate change 2023-12-01 14:45:01 +05:30
Gursheen Kaur Anand
4a047fefb8
Merge branch 'develop' into make-against-field-dynamic 2023-11-29 12:30:20 +05:30
Marica
b9f5a1c85d
fix: Negative Qty and Rates in SO/PO (#38252) 
* fix: Don't allow negative qty in SO/PO

* fix: Type casting for safe comparisons

* fix: Grammar in error message

* fix: Negative rates should be allowed via Update Items in SO/PO

* fix: Use `non_negative` property in docfield & emove code validation
 2023-11-27 09:05:22 +05:30
Gursheen Kaur Anand
01f133f8c8
Merge branch 'develop' into make-against-field-dynamic 2023-11-24 15:23:44 +05:30
Smit Vora
b206b0583b fix: fetch item_tax_template values if fields with fetch_from exisit 2023-11-23 15:10:47 +05:30
ruthra kumar
74f9e34182 chore: update new unreconcile doctype name in JS and PY files 2023-11-22 05:59:20 +05:30
Gursheen Anand
09439334ca refactor: use both fields to store against values 2023-11-08 12:57:00 +05:30
Gursheen Kaur Anand
6280031722
Merge branch 'develop' into make-against-field-dynamic 2023-11-06 17:06:03 +05:30
Gursheen Kaur Anand
1b808e1d7c
fix: standard submit perm in repost ledger for editable invoices (#37826) 
* fix: ignore perm while reposting ledger

* fix: use flag in save

* fix: remove unnecessary save
 2023-11-02 14:01:26 +05:30
ruthra kumar
7e600a6494 refactor: pass gain loss posting date to controller 2023-10-23 12:12:59 +05:30
ruthra kumar
5bb3e290d2
Merge pull request #37330 from ruthra-kumar/provision_to_pick_exc_rate_on_transaction_date 
refactor: checkbox to toggle exchange rate inheritence in PO->PI
 2023-10-17 09:45:33 +05:30
ruthra kumar
08315522bb refactor: checkbox to toggle exchange rate inheritence in PO->PI 2023-10-16 16:25:19 +05:30
ruthra kumar
0cdd6435a5 refactor: add validation for Advances in SI/PI 2023-10-11 14:42:23 +05:30
vr-greycube
4ada5a488e
fix: Use default Cost Center of the Company for additional discount (#37234) 
fix: Set cost center as default company cost center 

When Discount Accounting in enabled in Selling Settings, use Company default Cost Center while making GL entries for additional_discount_account
 2023-09-27 10:38:32 +05:30
ruthra kumar
ed7f67b1a8 refactor: remove references in repost doctypes upon parent doc delet 2023-09-26 14:35:31 +05:30
Gursheen Anand
4c5a83d6cf fix: set against type in controllers 2023-09-25 19:55:40 +05:30
Gursheen Anand
7ebf083683 refactor: use repost accounting legder 2023-09-23 19:13:33 +05:30
Gursheen Anand
68effd93bd refactor: move reposting logic to common controller 2023-09-21 17:28:07 +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
RitvikSardana
03f0abf6de
fix: after applying coupon code, field in_words not updated (#37133) 
* fix: after applying coupon code, field in_words not updated

* fix: changed the order of the function set_total_in_words
 2023-09-19 13:08:17 +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
RitvikSardana
d2f03c8a65
fix: payment recon not showing payment entry when party_type is Student (#36920) 
* fix: payment recon not showing payment entry when party_type is Student

* chore: code cleanup

* fix: payment recon based on account_type which is fetched from Party Type master
 2023-09-05 12:00:54 +05:30
ruthra kumar
9a1588f1cc fix: typo in doctype name and qb 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
42df0d3d67 refactor: remove references using framework 2023-09-05 08:34:26 +05:30
ruthra kumar
fbdfb8151c chore: delete references upon parent deletion 2023-09-05 08:34:26 +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
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