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

38035 Commits

Author SHA1 Message Date
ruthra kumar
0890b414b1 chore: resolve linter issues 2023-12-27 17:31:34 +05:30
ruthra kumar
d54f8318fb fix: incorrect total when Accumulating values 2023-12-27 16:50:07 +05:30
VihangT
fe77b9d633
fix : correct logic for overlap error (#38967) 
fixing overlap error logic with taking care of sequential time job cards in overlap job card list
 2023-12-27 16:11:29 +05:30
rohitwaghchaure
47ee801d37
fix: incorrect qty in serial batch bundle against pick list (#38964) 2023-12-27 13:09:23 +05:30
s-aga-r
705ae7da14
Merge pull request #38962 from s-aga-r/FIX-38781 
fix: use `Stock Qty` while getting `POS Reserved Qty`
 2023-12-27 12:50:37 +05:30
s-aga-r
7223106417 fix: use Stock Qty while getting POS Reserved Qty 2023-12-27 10:32:13 +05:30
barredterra
5a5758423e Merge remote-tracking branch 'upstream/develop' into remove-unused-coa 2023-12-26 16:06:43 +01:00
rohitwaghchaure
b09c9354fb
fix: min order qty optional in production plan (#38956) 
* fix: min order qty optional in production plan

* fix: test cases
 2023-12-26 20:11:58 +05:30
rohitwaghchaure
d00f6672a8
fix: not able to import serial batch bundle using csv (#38950) 2023-12-26 15:24:04 +05:30
rohitwaghchaure
06d6220a2a
fix: do not make serial batch bundle for zero qty (#38949) 2023-12-26 15:23:32 +05:30
ruthra kumar
3011322b22
Merge pull request #38891 from ruthra-kumar/customer_wise_report_price_issue 
fix: incorrect price list in customer-wise item price report
 2023-12-26 11:27:20 +05:30
s-aga-r
e560029736
Merge pull request #38942 from s-aga-r/FIX-38151-2 
fix(ux): make PR and PI Item rate field readonly based on `Maintain Same Rate`
 2023-12-26 10:20:34 +05:30
s-aga-r
b1ba210332 fix(ux): make PR Item rate field readonly based on Maintain Same Rate 2023-12-25 22:41:18 +05:30
s-aga-r
cb9114442b fix(ux): make PI Item rate field readonly based on Maintain Same Rate 2023-12-25 22:29:17 +05:30
s-aga-r
eb5bb9f9a9 fix(ux): make PI Item rate field editable 2023-12-25 22:05:02 +05:30
Wolfram Schmidt
87ba3b64f7
chore: german translation for actual time (#38837) 
chore: german translation for actual time
 2023-12-24 16:22:26 +05:30
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
rohitwaghchaure
161ae1edd1
fix: reset the incoming rate on changing of the warehouse (#38925) 2023-12-22 17:37:17 +05:30
s-aga-r
a5d5223c0e fix: Reserved Stock report 2023-12-22 15:46:06 +05:30
s-aga-r
1a1629196d chore: improve Allowed Qty error msg 2023-12-22 15:29:56 +05:30
s-aga-r
d0ed8ef83b
Merge pull request #38558 from s-aga-r/ADD-ITEMS-STOCK-RESERVATION-DIALOG 
feat: provision to add items in Stock Reservation dialog
 2023-12-22 12:15:07 +05:30
hyaray
0773f66feb
chore: Update company.py (#38660) 
chore: Update company.py
 2023-12-22 08:41:51 +05:30
Ankush Menat
2dc49c834a
chore: fixup broken JSON files (#38915) 2023-12-22 07:36:27 +05:30
Ankush Menat
787333896c
perf: Drop unused/duplicate/sub-optimal indexes (#38884) 
* ci: enable more checks

* perf: Drop unused/duplicate indexes
 2023-12-21 20:09:10 +05:30
Anand Baburajan
283763dfb2
chore: additional_asset_cost field (#38904) 2023-12-21 16:52:25 +05:30
mergify[bot]
07175367d8
fix: reposting not fixing valuation rate for sales return using movin… (backport #38895) (#38897) 
* fix: reposting not fixing valuation rate for sales return using movin… (#38895)

fix: reposting not fixing valuation rate for sales return using moving average method
(cherry picked from commit 3a668bbe9694fdd6e8265869c6943e42f889ac41)

# Conflicts:
#	erpnext/stock/stock_ledger.py

* chore: fix conflicts

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-12-21 14:40:52 +05:30
mergify[bot]
61219ca4ce
fix: do not reset the basic rate for the material receipt stock entry (backport #38896) (#38898) 
fix: do not reset the basic rate for the material receipt stock entry (#38896)

(cherry picked from commit 98bfcc4c758b61f714c53ea0f00246731a30fdaf)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-12-21 14:23:08 +05:30
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
ruthra kumar
9a00edb031 fix: incorrect price list in customer-wise item price report 2023-12-20 17:47:31 +05:30
David Arnold
f73685f4f6
Merge remote-tracking branch 'origin/develop' into feat/so-po-advance-payment-status 2023-12-20 12:47:48 +01:00
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