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

45991 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Devin Slauenwhite
dedf24b86d
fix: don't allow negative rates (#36027) 
* fix: don't allow negative rate

* test: don't allow negative rate

* fix: only check for -rate on items child table
 2023-08-02 16:26:55 +05:30
Deepesh Garg
b715453ae3
Merge pull request #36450 from cogk/fix-typo-in-query-for-financial-statement-report 
fix: Fix query for financial statement report
 2023-08-01 23:36:25 +05:30
Anand Baburajan
a8df875820
chore: use datatable for asset depr sch table view (#36449) 
* chore: use datatable for asset depr sch table view

* chore: remove unnecessary code
 2023-08-01 21:14:27 +05:30
Corentin Flr
bd3fc7c434
fix: Fix query for financial statement report 2023-08-01 14:35:11 +02:00
ruthra kumar
ab933df5bb
fix: overallocation validation misfire on normal invoices (#36349) 
* fix: overallocation validation misfire on normal invoices

* test: assert misfire doesn't happen
 2023-08-01 13:12:16 +05:30
Anand Baburajan
2ab3d75274
feat: asset activity (#36391) 
* feat: asset activity

* chore: add more actions to asset activity

* chore: fix failing test due to timestamp mismatch error

* chore: rewriting asset activity messages

* chore: add report and add it to workspace

* chore: show user in list view
 2023-08-01 12:00:24 +05:30
mergify[bot]
3f09f811bf
fix: allow fully depreciated existing assets (copy #36378) (#36379) 
* fix: allow fully depreciated existing assets

(cherry picked from commit 9489cba275525a93d92c00f62569888a219a8912)

# Conflicts:
#	erpnext/assets/doctype/asset/asset.json
#	erpnext/assets/doctype/asset/depreciation.py

* chore: fix conflicts in asset.json

* chore: fix conflicts in depreciation.py

---------

Co-authored-by: anandbaburajan <anandbaburajan@gmail.com>
 2023-08-01 11:20:04 +05:30
ruthra kumar
a93ae9c826
Merge pull request #36434 from ruthra-kumar/replace_get_cached_with_get_single_value 
fix: incorrect usage `get_cached_value` on single doctypes
 2023-08-01 10:02:33 +05:30
abdosaeed95
4f473eb090
fix: typo in loyalty program throw message (#36432) 2023-08-01 10:01:01 +05:30
ruthra kumar
ba15810639 fix: incorrect usage get_cached_value on single doctypes 2023-08-01 07:58:09 +05:30
Gursheen Kaur Anand
11bd15e580
fix: root type in account map for balance sheet (#36303) 
* fix: root type in account map

* fix: fetch gle by root type in consolidated financial statement

* refactor: consolidated financial statement gle query

* fix: filter accounts by root type
 2023-07-31 23:27:16 +05:30
Ankush Menat
f31d07554d
perf: avoid full table scan in sle count check (#36428) 2023-07-31 22:13:47 +05:30
rohitwaghchaure
f83a100a8d
fix: not able to make material request (#36416) 2023-07-31 19:13:23 +05:30
Devin Slauenwhite
e8eeeb16e2
fix: group item reorder by (warehouse, material_request_type) (#35818) 
* fix: group item reorder by (warehouse, material_request_type)

* fix: update reorder error message

* chore: linter

* fix: correct error message

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>

* chore: linter

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-07-31 12:47:14 +00:00
xdlumertz
652398fad2
fix: Defined "Open" Status as default (#36421) 
Defined "Open" Status as default of the child doctype (Quality Review Objective), because without it the main doctype (Quality Review) has "Passed" status.
This happens because in the "set_status" function, the status is updated according to the status of the child records.
 2023-07-31 12:34:33 +00:00
Vimal
ce36d1f668
fix: job card suggest holiday as start date (#35958) 2023-07-31 17:51:31 +05:30
xdlumertz
05b07e098a
fix: process_owner is not link User (#36420) 
-Changed "fetch from" since field is not a binding field
-Change field "full_name" from Hidden to Read Only
 2023-07-31 17:34:55 +05:30
Gursheen Kaur Anand
1ddfaa7605
fix: ignore cancelled gle in voucher-wise balance report (#36417) 
fix: ignore cancelled gle
 2023-07-31 14:29:20 +05:30
Deepesh Garg
c6d8f15b10
Merge pull request #36389 from AlexandreLumertz/patch-2 
fix: Party type translation in error message
 2023-07-30 18:42:01 +05:30
Deepesh Garg
c6b024c34b
Merge pull request #36167 from barredterra/percentage-rounding 
fix: rounding of percentage fields
 2023-07-30 14:41:30 +05:30
Deepesh Garg
b38d300a92
Merge pull request #36320 from barredterra/german-translation-supplier 
fix(Supplier): german translations
 2023-07-30 14:40:15 +05:30
Deepesh Garg
eeddeeeeb3
Merge pull request #36369 from ashish-greycube/patch-11 
fix: in payment_entry 'Unallocated Amount' cal is broken
 2023-07-30 14:37:24 +05:30
Ankush Menat
c0642cf528
fix: only publish repost progress to doc subscriber (#36400) 
Huge size of string gets blasted to everyone on site. Due to some memory
leak (cause unknown) till sockets are open the strings are also in
process' memory.

related https://github.com/frappe/frappe/issues/21863
 2023-07-29 09:32:11 +00:00
rohitwaghchaure
b71dafd1f1
Merge pull request #36375 from ramonus/job-card-fix 
fix: Job Card validation fixed when displaying total completed quantity
 2023-07-29 15:01:16 +05:30
Deepesh Garg
caad4537c5
Merge pull request #36149 from GursheenK/balancing-accounting-dimensions 
fix: make offsetting entry for acc dimensions in general ledger
 2023-07-29 12:29:03 +05:30
Deepesh Garg
f999b75ed6 Merge branch 'develop' of https://github.com/frappe/erpnext into balancing-accounting-dimensions 2023-07-29 11:53:03 +05:30
Deepesh Garg
ecca9cb023 fix: Add company filters for account 2023-07-29 11:52:54 +05:30
Deepesh Garg
3173546d5c
Merge pull request #36198 from HarryPaulo/fix-pricing-rule-on-point-of-sale 
fix: inserting of items with pricing rule with qty range
 2023-07-29 09:58:05 +05:30
ruthra kumar
3b58055410
refactor(test): introduce and make use of mixins in unit tests (#36382) 
* refactor(test): create and use test mixin

* chore(test): replace get_user_default with variable
 2023-07-28 21:02:21 +05:30
xdlumertz
bc470591ac
fix: translate 
fix: translate
 2023-07-28 12:31:29 -03:00
rohitwaghchaure
ee7da639e7
Merge pull request #36380 from rohitwaghchaure/fixed-fieldtype-from-currency-to-flt 
fix: change fieldtype from Currency to Float for the valuation rate in reports
 2023-07-28 20:35:46 +05:30
s-aga-r
bc6cbb9e25
Merge pull request #36365 from AlexandreLumertz/patch-1 
fix: removed "fetch_from"
 2023-07-28 18:12:21 +05:30
xdlumertz
1c687a4afd fix: removed "fetch_from" 
* fix: removed ("fetch_from": "goal.objective")
The field ended up being disabled because of this.
 2023-07-28 18:10:45 +05:30
s-aga-r
d9ac7f9b87
Merge pull request #36221 from s-aga-r/FIX-ISS-23-24-02079 
perf: use `LEFT JOIN` instead of `NOT EXISTS`
 2023-07-28 17:51:24 +05:30
rohitwaghchaure
4e58503075
Merge pull request #36377 from rohitwaghchaure/fixed-pp-sub-assembly-available-items 
fix: multiple issues related to Production Plan
 2023-07-28 17:26:06 +05:30
Rohit Waghchaure
c82cb379a5 fix: change fieldtype from Currency to Float for the valuation rate in the stock report 2023-07-28 17:21:05 +05:30
s-aga-r
148d466ae5 fix: long queue process_boms_cost_level_wise 2023-07-28 17:05:17 +05:30
s-aga-r
58d867503b perf: use LEFT JOIN instead of NOT EXISTS 2023-07-28 16:44:41 +05:30
Rohit Waghchaure
1c2148b637 fix: multiple issues related to Production Plan 2023-07-28 15:38:00 +05:30
ramonalmato
49981fecc7 fix: Job Card validation fixed when displaying total completed quantity 2023-07-28 10:57:31 +02:00
Ankush Menat
e36c8ce5be
perf: move project status reminder to hourly (#36372) 
Only used for sending daily/weekly/bi-daily

[skip ci]
 2023-07-28 12:53:22 +05:30
Ashish Shah
f9fa34ff40
fix: in payment_entry 'Unallocated Amount' cal is broken 2023-07-28 11:10:51 +05:30
ruthra kumar
50d294fd1e
Merge pull request #36126 from ruthra-kumar/idx_issue_upon_journal_reconciliation 
fix: incorrect `idx` on Journals after reconciliation
 2023-07-28 09:33:29 +05:30
rohitwaghchaure
dac9fd64a8
Merge pull request #36328 from rohitwaghchaure/fixed-purchase-receipt-timeout-on-cancel-develop 
fix: timeout error while cancelling the Purchase Receipt
 2023-07-27 23:26:59 +05:30
Deepesh Garg
829387c2bc
Merge pull request #36360 from deepeshgarg007/fy_default_dates 
fix: Default year start and end dates in reports
 2023-07-27 22:35:35 +05:30
Deepesh Garg
fff83bc847
Merge pull request #36092 from HarryPaulo/fix-paid-amount-payment-method-group 
fix: paid_amount when the group is mode of payment
 2023-07-27 21:21:52 +05:30
Deepesh Garg
ebdf1959fd
Merge pull request #36254 from deepeshgarg007/remove_auto_repeat 
fix: Remove auto repeat (subscription) button from Sales and Purchase documents
 2023-07-27 21:18:03 +05:30
Deepesh Garg
a25f34c3d5
Merge pull request #36313 from barredterra/delete-root-item-group 
fix(Item Group): allow root deletion
 2023-07-27 21:14:44 +05:30
Deepesh Garg
2341061852 fix: Default year start and end date in reports 2023-07-27 21:03:32 +05:30
Deepesh Garg
4496a6760e fix: Default year start and end dates in reports 2023-07-27 20:54:55 +05:30