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

9443 Commits

Author SHA1 Message Date
ruthra kumar
58d04e1f42 refactor: use different GL build logic for advance as liability 
(cherry picked from commit 58114e7b24788f0244b89401235a6a20721b9603)
 2023-12-01 07:07:55 +00:00
ruthra kumar
aaef9d68c0 refactor: post to GL and Payment Ledger on advance as liability 
(cherry picked from commit 78ab11f9914725266eb8cf8b98dd81a5f544d79d)
 2023-12-01 07:07:54 +00:00
ruthra kumar
bb8ac94adc test: assert ledger entries on partial reconciliation 
with `Advance as Liability`, partial reconciliation should not post
duplicate ledger entries for same reference

(cherry picked from commit 3263f2023c0a6ceabfbdd1eeb5202843d4532b76)
 2023-12-01 07:07:54 +00:00
mergify[bot]
8819d6c173
add supplier group filter in purchase register (backport #38421) (#38483) 
add supplier group filter in purchase register (#38421)

* add supplier group field in purchase register

* Update purchase_register.js

(cherry picked from commit e2a519464b3214b0a6594498dc86bc3af15197c3)

Co-authored-by: NandhiniDevi <95607404+Nandhinidevi123@users.noreply.github.com>
 2023-12-01 11:51:09 +05:30
mergify[bot]
2d9ba88870
fix(ux): make valuation field read only when it can't be modified (backport #38450) (#38464) 
* fix(ux): make `basic_rate` field read-only based on purpose

(cherry picked from commit abc7d3002467946984be5b41d79024da92047dd3)

* fix(ux): make PR `rate` field read-only having PO ref

(cherry picked from commit ae294ee4702fa8e0367c07c881d632811beb67ae)

* fix(ux): make PI `rate` field read-only having PR ref

(cherry picked from commit 3d4156cc7d90522f37f4c91e4ccf4145412109a9)

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-11-30 17:30:35 +05:30
ruthra kumar
f44bb0df50 refactor: use flt on outstanding on AR/AP summary report 
(cherry picked from commit e4bdd3a28d7fa29b0460ad6661ff39a219c1fc5c)
 2023-11-30 10:55:51 +00:00
mergify[bot]
5e6a4d257e
feat: enable automatic type annotations (backport #38452) (#38454) 
feat: enable automatic type annotations (#38452)

(cherry picked from commit 63313eef6f6618f52c7e6194f7abd345cf920b15)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2023-11-30 14:43:16 +05:30
ruthra kumar
7a1744691f refactor: pass on filter to upfront outstanding query as well 
(cherry picked from commit cfd3230c75b5e549b98b2362947ee8744c98e920)
 2023-11-30 07:26:32 +00:00
Gursheen Anand
573c4d2bfc chore: fix imports for renamed report 
(cherry picked from commit aee2e12f3944ae4db2dd77a31d0c544c1bacb65a)
 2023-11-28 12:53:53 +00:00
Sagar Vora
721b429d93 fix: make parameters of create_subscription_process optional (and other minor fixes) (#38360) 
(cherry picked from commit 5a53a4b044be7e889080329056c7911970d92da8)
 2023-11-27 14:53:39 +00:00
ruthra kumar
8564d58afe refactor: handle rounding loss on AR/AP reports 
(cherry picked from commit 592ce45da7659dcf4ca148f5924dbe0d783956bf)
 2023-11-27 06:22:52 +00:00
mergify[bot]
4699887f1c
fix: Payment Reco Issue and chart of account importer 
fix: Payment Reco Issue and chart of account importer
 2023-11-27 10:31:12 +05:30
ruthra kumar
378dc50aa4 chore: resolve conflict 2023-11-27 09:09:04 +05:30
Gursheen Anand
25bf475d5a fix: check reposting settings before allowing editable si 
(cherry picked from commit 894ae1fe0f8da1931f705d433c15b19410486186)
 2023-11-27 03:35:39 +00:00
Gursheen Anand
ac7615ac01 fix: allow on submit for child table fields 
(cherry picked from commit 5fae2f6d57bac332263d8c73e3d090f485b5844d)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
 2023-11-27 03:35:39 +00:00
Gursheen Anand
6a3c3b4cac fix: do not set repost flag without validating voucher 
(cherry picked from commit ad5edbb1de95befa1b6f312dcb7df6d8c5a8ce6c)
 2023-11-27 03:35:38 +00:00
Gursheen Anand
85bd649c64 refactor: validate reposting settings for editables inv 
(cherry picked from commit 780b827adcba571b46ee73404f9a038c36dd0eb9)
 2023-11-27 03:35:38 +00:00
mergify[bot]
cda5ff40f1
refactor: bank transaction (#38182) 
refactor: bank transaction (#38182)

(cherry picked from commit 5426b93387c8a4599b11d5e064d4d8b37078aca1)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2023-11-26 18:57:01 +05:30
Deepesh Garg
64d9c5d61c
Merge pull request #38316 from frappe/mergify/bp/version-15-hotfix/pr-38269 
fix: skip fixed assets in product bundle (backport #38269)
 2023-11-24 16:30:29 +05:30
Gursheen Anand
ca2ad175d3 fix: annual income and expenses in digest 
(cherry picked from commit 52305e3000decb84aad1a99557e13a0bb2b68ec4)
 2023-11-24 09:51:30 +00:00
ruthra kumar
7fc4e211bc refactor: update project costing based on frequency 
(cherry picked from commit dd016e6ced432b6f8754042fbad808b1cba56cec)
 2023-11-24 06:20:11 +00:00
ruthra kumar
deed9f5840 perf: optimize total_purchase_cost update 
(cherry picked from commit aa17110bde44603574d4532afaa6cf1181423ac5)
 2023-11-24 06:20:10 +00:00
Gursheen Anand
e4d9ef1293 fix: condition in other bundle utils 
(cherry picked from commit 8bdb61cb87802723a0db1aaa29c30c15c740ec6b)
 2023-11-24 04:30:38 +00:00
ruthra kumar
7282dd1a85 chore: speed up Purchase Invoice cancellation 
(cherry picked from commit 1efff268b036dd27f7472bc7ec494aafac9edbc8)
 2023-11-24 04:16:22 +00:00
ruthra kumar
3720b7171b chore: index to speed up queries on JE child table reference 
(cherry picked from commit 24fcd67f8bcf8cc8b387856983b97d8778eac084)
 2023-11-24 04:16:22 +00:00
mergify[bot]
30c349b010
add flt() for None type error (backport #38299) (#38306) 
add flt() for None type error (#38299)

(cherry picked from commit 64b44a360af8c2d3a6a9cb99e03358b97cdf9fa5)

Co-authored-by: NandhiniDevi <95607404+Nandhinidevi123@users.noreply.github.com>
 2023-11-23 22:42:37 +05:30
mergify[bot]
72647b8624
feat: add Bank Transaction to connections in Journal and Payment Entry (backport #38297) (#38301) 
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2023-11-23 15:09:23 +01:00
ruthra kumar
100ce27a60 chore: update new unreconcile doctype name in JS and PY files 
(cherry picked from commit 74f9e34182563b5dd3ef71d93b66596a12be5e91)
 2023-11-23 05:09:24 +00:00
ruthra kumar
df70e048cf chore: rename 'unreconcile payments' to 'unreconcile payment' 
(cherry picked from commit 9006c9b7478ceee5f7662d62e8eb02a08a309906)
 2023-11-23 05:09:23 +00:00
ruthra kumar
d01a480149 refactor: optimize outstanding vouchers query 
(cherry picked from commit 8b04c1d4f6356bc332c5dd8f6f8711d778e030cd)
 2023-11-23 10:14:25 +05:30
ruthra kumar
c84c97577f
Merge branch 'version-15-hotfix' into mergify/bp/version-15-hotfix/pr-38234 2023-11-21 13:43:58 +05:30
ruthra kumar
034375b4f5 refactor(test): make use of utility methods 
(cherry picked from commit 547993f80103fa192563a82447c39fe122918767)
 2023-11-21 07:03:06 +00:00
ruthra kumar
9600a2cdb7 test: overalloction on reconciliation when PO is involved 
(cherry picked from commit 946228d783cb58cd2809f4b0bc0a854c49cc4060)
 2023-11-21 07:03:06 +00:00
ruthra kumar
337707b9cc fix: overallocation on Payment with PO/SO 
(cherry picked from commit 23df4205f8abfca6764d84665cb9877703c1a470)
 2023-11-21 07:03:05 +00:00
ruthra kumar
15f40a7af6 test: prevent rounding loss based validation error 
(cherry picked from commit 56e991b7f49e4677605f74b1de7d00ab40bf09cc)
 2023-11-21 12:16:36 +05:30
ruthra kumar
1ed65524e5 refactor: add flag to POS Invoice 
(cherry picked from commit 83a13e22b7f4aa8ba2c406389af4e7fa8aad55d0)
 2023-11-20 08:36:51 +00:00
ruthra kumar
5da9a22e4c refactor: set default for 'update_billed_amount_in_delivery_note' 
(cherry picked from commit ee0c64215d160f0bd493bcefc9e94a5a90d318d2)
 2023-11-20 08:36:50 +00:00
ruthra kumar
2186e1cce4
Merge pull request #38197 from frappe/mergify/bp/version-15-hotfix/pr-38159 
refactor: provision to truncate `remarks` in General Ledger and Accounts Receivable/Payable reports (backport #38159)
 2023-11-20 12:31:44 +05:30
Vishakh Desai
aef955c920 fix: Supplier Quotation fields (#37963) 
(cherry picked from commit c2bda2c70535ad9e8a61e752bbb551f387460125)

# Conflicts:
#	erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
 2023-11-20 04:42:48 +00:00
ruthra kumar
c2cb86b40a refactor: add substring logic in ar/ap report 
(cherry picked from commit a9bf906545dc7c89613c7f6211c35e62b8d7b989)
 2023-11-20 04:38:26 +00:00
ruthra kumar
9ee8a78083 refactor: provision to set remarks length in accounts settings 
(cherry picked from commit 97090ff3679104d77a031f29d4acafb8b7ac1580)
 2023-11-20 04:38:26 +00:00
Dany Robert
eab18e6f71 fix: test case for rounded total with cash disc 
(cherry picked from commit cc60c328fe349f7d53c77799e8e91973c2790746)
 2023-11-19 13:49:19 +00:00
Devin Slauenwhite
384d6b516c fix: payment entry rounding error 
(cherry picked from commit 3d1e3a9cded735c420cb6c0ceb17c62034983076)
 2023-11-19 13:17:51 +00:00
Vishakh Desai
a420e13765 fix: pass check permission in render_address 
(cherry picked from commit 45299fe4b3e23774920d7c35f7fb66e786cf5aa5)
 2023-11-18 12:08:58 +00:00
mergify[bot]
20e15ebd22
fix: allow regional gl in payment entry for gl preview (#38136) 
fix: allow regional gl in payment entry for gl preview (#38136)

(cherry picked from commit 7e43d7b1312fd665bdcde7db7c67d192f746e60a)

Co-authored-by: Smit Vora <smitvora203@gmail.com>
 2023-11-17 12:40:18 +05:30
ruthra kumar
c9674683d1 fix: add revaluation journal filter in Payable report 
(cherry picked from commit 134201794ace2863c02458b3e1797da816802d06)
 2023-11-17 10:01:35 +05:30
Deepesh Garg
d51237195a
fix: GL Entries for receiving non CWIP assets using Purchase Receipt (#38123) 
* fix: GL Entries for receiving non CWIP assets using Purchase Receipt

* test: Update tests
 2023-11-16 13:38:10 +05:30
Gursheen Anand
cb4bb5b4ee fix: test total unallocated amount in payment 
(cherry picked from commit 2499675ad121ab370f672e6f9ffdcda3c8c76b8e)
 2023-11-16 05:07:00 +00:00
Gursheen Anand
376e09680c test: payment against partial return invoices 
(cherry picked from commit 09f9764bbdec90d1b9f85ccc5a368bf85547bea1)
 2023-11-16 05:07:00 +00:00
Gursheen Anand
22b39ac4b4 fix: reset dr_or_cr for every reference 
(cherry picked from commit a59c942cd487e0440625663034760eb89171e2ef)
 2023-11-16 05:06:59 +00:00