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

47425 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ruthra kumar
c20995ec2f
Merge pull request #38893 from ruthra-kumar/typeerror_in_pos 
fix: typeerror on pos order summary to new order screen
 2023-12-21 12:21:59 +05:30
ruthra kumar
6a0a08b59c fix: typeerror on pos order summary to new order screen 2023-12-21 12:13:33 +05:30
Anand Baburajan
d370c60a6c
feat: total_asset_cost field (#38879) 2023-12-20 19:02:32 +05:30
mergify[bot]
a6ab53236e
fix: allow to set rate manually for service item in BOM (backport #38880) (#38882) 
fix: allow to set rate manually for service item in BOM (#38880)

(cherry picked from commit c2f692a4e4f3dd5089fe4949c6cd74574282fdb1)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-12-20 18:33:26 +05:30
NIYAZ RAZAK
ae353398d9
fix: local reference error in BOM (#38850) 
fix: local reference error
 2023-12-20 14:34:38 +05:30
Ankush Menat
9983283f95
perf: use estimated rows instead of actual rows (#38830) 2023-12-20 13:16:09 +05:30
ruthra kumar
6d5bdc6c68
fix: typerror on tree doctypes - Item Group, Customer Group, Supplier Group and Territory (#38870) 
* refactor: typerror on set_root_readonly

* refactor: remove 'cur_frm' usage in supplier_group

* refactor: remove 'cur_frm' usage in territory.js

* refactor: remove 'cur_frm' from sales_person.js
 2023-12-20 12:30:10 +05:30
ruthra kumar
80e69210db
Merge pull request #38838 from pps190/fix-use-party-account-currency 
fix: use party account currency when party account is specified
 2023-12-20 12:29:04 +05:30
mergify[bot]
793e3ad78e
fix: if not budget then don't validate (backport #38861) (#38864) 
fix: if not budget then don't validate (#38861)

(cherry picked from commit d375164100158db9b974742caa3e05062c481d7d)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-12-19 18:31:18 +05:30
mergify[bot]
4057682c87
fix: incoming rate for sales return with Moving Average valuation method (backport #38849) (#38863) 
* fix: incoming rate for sales return with Moving Average valuation method (#38849)

(cherry picked from commit 7fdac62393ee1e96969cca38a4ce0c07993dce7e)

# Conflicts:
#	erpnext/stock/doctype/delivery_note/test_delivery_note.py

* chore: fix conflicts

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-12-19 18:29:56 +05:30
mergify[bot]
5e68b7e3a6
fix: on closed unreserved the production plan qty (backport #38848) (#38859) 
fix: on closed unreserved the production plan qty (#38848)

(cherry picked from commit 2184e8ef58379f53ef8f1d069afa26e64796b073)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-12-19 18:01:37 +05:30
s-aga-r
495b47db16
Merge pull request #38842 from SvbZ3r0/po-get-fg-item-qty 
fix: set `fg-itm-qty` based on `qty` instead of the other way round in Subcontracting POs
 2023-12-19 15:23:30 +05:30
mergify[bot]
4aa960b744
fix: item variant with manufacturer (backport #38845) (#38847) 
* fix: item variant with manufacturer (#38845)

(cherry picked from commit e0c8ff10daeed0829266aea9142805f68ceedb2b)

* chore: fix test case

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-12-19 14:59:33 +05:30
ruthra kumar
dd6c192695
Merge pull request #38797 from rtdany10/ar-credit-note-fix 
fix: wrong paid and cn amount on pos invoice
 2023-12-19 11:02:01 +05:30
Dany Robert
8772628912 test: partial payment for pos invoice 2023-12-19 10:00:51 +05:30
Gughan Ravikumar
a99d0a65b0 fix: set fg-itm-qty based on qty instead of the other way round 2023-12-19 07:56:02 +05:30
Devin Slauenwhite
a09241e3c7 fix(test): expect account currency when party account is specified. 2023-12-18 19:09:25 +00:00
Devin Slauenwhite
c7b961ffa2 fix: use party account currency when party account is specified 2023-12-18 18:03:53 +00:00
mergify[bot]
32a608f948
fix: not able to make inter-company po from so (backport #38826) (#38828) 
fix: not able to make inter-company po from so (#38826)

(cherry picked from commit 23042dfc3c0d02374c5710ed679731b1910f9b9a)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-12-18 18:13:47 +05:30
Ankush Menat
8d79365e0d
perf: index return_against on delivery note (#38827) 
There's a multi-column index but that's useful IFF all parts of column
are part of query.

return against on it's own is VERY unique because it's a primary key, we
don't need a multi-column index here.
 2023-12-18 18:06:44 +05:30
mergify[bot]
71e833c3f2
fix: not able to cancel SCR with Batch (backport #38817) (#38821) 
* fix: not able to cancel SCR with Batch (#38817)

(cherry picked from commit fb5090fd3f23ada507fe8abc5a899f4b06e48d7e)

# Conflicts:
#	erpnext/subcontracting/doctype/subcontracting_receipt/test_subcontracting_receipt.py

* chore: fix test case

* chore: fix test case

* chore: fix test case

* chore: fix test case

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-12-18 17:56:05 +05:30
ruthra kumar
b5f3013005
Merge pull request #38820 from ruthra-kumar/ignore_err_in_statements 
refactor: ignore ERR journals in Statment of Accounts
 2023-12-18 15:55:11 +05:30
ruthra kumar
39ef75e2d0 refactor: ignore ERR journals in Statment of Accounts 2023-12-18 13:39:26 +05:30
Raffael Meyer
42813d38c3
Merge pull request #38803 from barredterra/group-current-accounts 2023-12-17 19:23:01 +01:00
Deepesh Garg
55147781f3
Merge pull request #38807 from deepeshgarg007/canada_demo 
fix(demo): Demo setup for Canadian COA
 2023-12-17 14:05:07 +05:30
Deepesh Garg
c9fd182268 fix(demo): Demo setup for canadian COA 2023-12-17 13:36:58 +05:30
rohitwaghchaure
0743289925
fix: serial and batch bundle return not working (#38754) 
* fix: serial and batch bundle return not working

* test: added test case for delivery note return against denormalized serial no
 2023-12-17 12:42:07 +05:30
barredterra
259f313af7 fix: groups for current accounts in German CoAs 2023-12-16 21:11:54 +01:00
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
Dany Robert
5cb5e09dbb fix: wrong paid and cn amount on pos invoice 2023-12-16 04:35:43 +00:00
Ankush Menat
fa1c7b663c
fix: Reset SLA on issue doesn't work (#38789) 
This was broken since last refactor where it was spun off to work with
all types of doctypes but client side code was never adapted.
 2023-12-15 22:00:01 +05:30
Raffael Meyer
a9a84cc7d4
Merge pull request #38742 from ljain112/fix-pur-reg 2023-12-15 15:22:19 +01:00
Deepesh Garg
ff967c45f7
Merge pull request #38691 from deepeshgarg007/init_values 
fix: Init internal child table values
 2023-12-15 18:14:45 +05:30
s-aga-r
9a5c422074
Merge pull request #38778 from s-aga-r/FIX-7327 
fix: wrong currency in Stock Balance report
 2023-12-15 15:28:52 +05:30
s-aga-r
5a83a16e60 fix: wrong currency in Stock Balance report 2023-12-15 14:45:09 +05:30
Anand Baburajan
1704180f38
fix: asset patch failure due to missing shift_based column (#38776) 
* fix: add missing daily_prorata_based in get_asset_finance_books_map

* fix: reload Asset Finance Book doctype
 2023-12-15 14:43:33 +05:30
ruthra kumar
0cf9ff0a04
Merge pull request #38766 from ruthra-kumar/7101_only_treat_none 
fix: validation error on reconciling PE to Journals as Invoice
 2023-12-15 13:09:06 +05:30
Gursheen Kaur Anand
41ae2a2dc5
Merge pull request #38767 from GursheenK/skip-bank-jvs-in-tax-report 
fix: skip JVs against bank accounts in tax report
 2023-12-15 12:57:40 +05:30
Gursheen Anand
f7b2380ec1 fix: skip jvs against bank accounts 2023-12-15 12:30:15 +05:30
ruthra kumar
5eeb650dfd fix: validation error on reconciling PE to Journals as Invoice 
With the same exchange rate on Journal Entry and Payment Entry,
reconcilition should not post exc gain/loss journal and should not
throw validation error
 2023-12-15 11:46:12 +05:30
s-aga-r
a1b95606b1
Merge pull request #38720 from s-aga-r/FIX-6545 
fix(ux): don't override Item Name and Description in MR
 2023-12-15 10:57:24 +05:30
s-aga-r
726ac6bda1 fix(ux): don't override Item Name and Description in MR 2023-12-15 10:56:54 +05:30
rohitwaghchaure
d6201ce5c7
fix: homepage not working (#38755) 2023-12-14 22:47:32 +05:30
Raffael Meyer
e7e23fbc96
Merge pull request #38533 from barredterra/date-format-system-settings 2023-12-14 16:38:00 +01:00
Raffael Meyer
e7544e9fc1
Merge pull request #38505 from barredterra/lead_name_from_email 2023-12-14 13:48:19 +01:00
Ankush Menat
eaf86a6461
fix: timezone aware SLA banner (#38745) 2023-12-14 15:53:57 +05:30
ljain112
f53ba178a8 fix: show bill_date and bill_no in Purchase Register 2023-12-14 12:28:32 +05:30
ruthra kumar
c68ad73c6e
Merge pull request #38717 from ruthra-kumar/7101_payment_reconciiation_bug 
fix: fetch exc rate of multi currency journals on reconciliation
 2023-12-14 09:35:12 +05:30
Ankush Menat
6851c5042f
Revert "fix(ux): don't update qty blindly" (#38728) 2023-12-13 23:14:20 +05:30
Raffael Meyer
da96578afb
Merge pull request #38725 from barredterra/preview-rfq 2023-12-13 17:31:08 +01:00