Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
46,231 Commits 3 Branches 0 Tags 1 GiB
56b26852f3
Commit Graph

36099 Commits

Author SHA1 Message Date
Ankush Menat
704e6577e5 chore: use royalty free images 2023-08-10 17:29:55 +05:30
Ankush Menat
5fb92cbb49 fix: enqueue at front to speed up demo 2023-08-10 17:16:58 +05:30
Ankush Menat
3a21c90d10 fix: misc fixes in demo data 
- Generate demo data field copy
- absolute imports
- remove whitelisting where it's not required
- telemetry
- banner copy
- move to background
- clear bootinfo after setup
 2023-08-10 16:53:16 +05:30
Deepesh Garg
baf5cddd1b fix: Group Account total not showing in Financial Statements 2023-08-10 16:09:38 +05:30
ruthra kumar
936fb1decf
Merge pull request #36578 from ruthra-kumar/toggle_uom_hiding_on_print 
fix: unhide `uom` and `stock_uom` fields in print view
 2023-08-10 15:38:32 +05:30
ruthra kumar
18e3c67d97
Merge pull request #36573 from ruthra-kumar/system_generated_field_and_update_remarks 
refactor: 'is system generated' field and better remarks in Journal Entry
 2023-08-10 15:37:47 +05:30
Ankush Menat
f2eb3d0f94 chore: remove old build system file 
[skip ci]
 2023-08-10 15:24:07 +05:30
Ankush Menat
ba6de0b4ff Merge branch 'develop' into demo_data_on_install 2023-08-10 15:22:52 +05:30
ruthra kumar
11cd163db7 fix: unhide uom and stock_uom fields in print view 2023-08-10 14:40:47 +05:30
ruthra kumar
4ed4b0240d refactor: enable 'no-copy' 2023-08-10 14:32:37 +05:30
ruthra kumar
de17eaef38 refactor: set flag display condition 2023-08-10 10:05:25 +05:30
Ankush Menat
5169006085 fix: move company rename to long queue 2023-08-10 10:02:59 +05:30
s-aga-r
4a7fc1506f
fix: don't show disabled items in Item Shortage Report (#36550) 2023-08-10 09:40:58 +05:30
ruthra kumar
3997aa77d4 refactor: add is_system_generated field to Journal Entry 2023-08-09 20:50:11 +05:30
ruthra kumar
47cb349362 fix: better remarks on Cr note created by Reconciliation 2023-08-09 20:43:51 +05:30
Anand Baburajan
ad33cd73e8
perf: asset depreciation entry posting [develop] (#36555) 
* perf: optimise post_depreciation_entries and make_depreciation_entry

* chore: fixing minor mistake

* chore: fix asset_value_adjustment test
 2023-08-09 20:26:28 +05:30
Deepesh Garg
32863b4922 fix: Make default sales update frequency as monthly instead of each transaction 2023-08-09 15:36:28 +05:30
Ankush Menat
5740942de9 fix: lowercase fieldnames 2023-08-09 15:32:26 +05:30
ruthra kumar
3866be4c2a
Merge pull request #36560 from ruthra-kumar/broken_bench_update 
fix: broken `bench update` after subscription refactor
 2023-08-09 14:44:54 +05:30
s-aga-r
e415cb2873
Merge pull request #36554 from barredterra/hide-description-in-print-and-report 
fix(RFQ): hide description in print and report
 2023-08-09 13:54:47 +05:30
ruthra kumar
9db8769e65 fix: broken bench update after subscription refactor 2023-08-09 13:54:26 +05:30
Ankush Menat
b0c79a0467
perf(invoice): Faster return amount query (#36556) 
perf: Faster return amount query
 2023-08-09 13:37:19 +05:30
ruthra kumar
e64b004eca
feat: utility to repost accounting ledgers without cancellation (#36469) 
* feat: introduce doctypes for repost

* refactor: basic filters and validations

* chore: basic validations

* chore: added barebones function to generate ledger entries

* chore: repost on submit

* chore: repost in background

* chore: include payment entry and journal entry

* chore: ignore repost doc on cancel

* chore: preview method

* chore: rudimentary form of preview

* refactor: preview template

* refactor: basic background colors to differentiate old and new

* chore: remove commented code

* test: basic functionality

* chore: fix conflict

* chore: prevent repost on invoices with deferred accounting

* refactor(test): rename and test basic validations and methods

* refactor(test): test all validations

* fix(test): use proper name account name

* refactor(test): fix failing test case

* refactor(test): clear old entries

* refactor(test): simpler logic to clear old records

* refactor(test): make use of deletion flag

* refactor(test): split into multiple test cases
 2023-08-08 20:27:12 +05:30
barredterra
4fb844ab70 fix(RFQ): hide description in print and report 2023-08-08 16:30:53 +02:00
barredterra
68ad62f7d0 test(RFQ): get_link 2023-08-08 12:31:37 +02:00
barredterra
fd91f2c2e0 fix(RFQ): link to supplier portal 2023-08-08 12:31:01 +02:00
rohitwaghchaure
0b36e7d10e
fix: stock reconciliation negative stock error (#36544) 
fix: stock reco negative stock error
 2023-08-08 15:18:27 +05:30
ruthra kumar
11d5327d1b
refactor: use base_tax_withholding_net_total for treshold validation (#36528) 
* refactor: use base_tax_withholding_net_total for treshold validation

* fix: only for non payment entry doctypes
 2023-08-08 14:14:30 +05:30
Deepesh Garg
492ea3bcc8
fix: Debit credit difference while submitting Sales Invoice (#36523) 
* fix: Debit credit difference while submitting Sales Invoice

* test(fix): Update gl entry comparison

* test(fix): Update gl entry comparison
 2023-08-08 11:39:44 +05:30
s-aga-r
ecba6ee183
fix: enqueue submit/cancel action for stock entry having more than 50 line items (#36532) 2023-08-07 19:36:19 +05:30
Raffael Meyer
8cc3df7c2c
feat(RFQ): make sending attachments configurable (#36359) 2023-08-07 19:11:01 +05:30
rohitwaghchaure
28dfc88789
fix: stock entry decimal issue (#36530) 2023-08-07 17:31:38 +05:30
Raffael Meyer
21080afd92
feat(RFQ): make email message fully configurable (#36353) 
feat: make RFQ message fully configurable
 2023-08-07 17:12:31 +05:30
ruthra kumar
b86747c9d4
feat: ledger comparison report (#36485) 
* feat: Accounting Ledger comparison report

* chore: barebones methods

* chore: working state

* chore: refactor internal logic

* chore: working multi select filter on Account

* chore: working voucher no filter

* chore: remove debugging statements

* chore: report with currency symbol

* chore: working start and end date filter

* test: basic report function

* refactor(test): test all filters
 2023-08-07 11:28:07 +05:30
Ankush Menat
2eea90a873 perf: defer holiday list imports 
Only used for configuring but loaded whenever
get_doc("holiday list", ...) is done
 2023-08-07 10:08:34 +05:30
Ankush Menat
10a2191e3f
Merge pull request #36519 from ankush/lang_separator 
fix: use correct lang separator for frappe
 2023-08-07 10:06:23 +05:30
Ankush Menat
f574ac11ea perf: defer babel import 
Only required when configuring but will get loaded everywhere
 2023-08-07 10:03:40 +05:30
Ankush Menat
0218ca538f fix: use correct lang separator for frappe 2023-08-07 09:59:54 +05:30
Himanshu
38805603db
feat: subscription refactor (#30963) 
* feat: subscription refactor

* fix: linter changes

* chore: linter changes

* chore: linter changes

* chore: Update tests

* chore: Remove commits

---------

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-08-07 08:33:47 +05:30
mergify[bot]
b717e2b5bf
chore: don't merge asset capitalization gl entries (copy #36514) (#36515) 
chore: don't merge asset capitalization gl entries

(cherry picked from commit 3c8f292ac3943ddad52a7041d8910552d47abf0a)

Co-authored-by: anandbaburajan <anandbaburajan@gmail.com>
 2023-08-06 23:44:22 +05:30
Bernd Oliver Sünderhauf
5435c641a2
fix: Refine supplier scorecard standings. (#36414) 
Co-authored-by: Bernd Oliver Sünderhauf <pancho@mailbox.org>
 2023-08-05 23:13:14 +05:30
Deepesh Garg
93767eb7fc
fix: Tax withholding against order via Payment Entry (#36493) 
* fix: Tax withholding against order via Payment Entry

* test: Add test case

* fix: Nonetype exceptions
 2023-08-05 22:22:03 +05:30
Deepesh Garg
96035b87d5
fix: Lower deduction certificate for multi-company (#36491) 2023-08-05 22:21:06 +05:30
Corentin Flr
559d914c0b
fix(accounts): Translate columns in AP/AR report (#36503) 2023-08-05 22:18:36 +05:30
s-aga-r
758b31d895
fix: get incoming rate instead of BOM rate (#36496) 
* fix: get incoming rate instead of BOM rate

* test: add test case for SCR rm rate
 2023-08-05 19:28:38 +05:30
s-aga-r
e179499764
fix(ux): add Ordered Qty column in Get Items From > MR (#36486) 2023-08-05 19:26:11 +05:30
Michelle Alva
16bc1e228f
chore: typo in onboarding (#36504) 
* fix: typo in onboarding

* fix: typo
 2023-08-05 18:30:24 +05:30
ruthra kumar
466734fb4b fix(test): replace hardcoded reference to adv with dynamic one 2023-08-05 14:11:57 +05:30
Ritvik Sardana
b483364649 Merge branch 'develop' of https://github.com/frappe/erpnext into develop-ritvik-POS-runtime-effect 2023-08-05 11:26:47 +05:30
Ritvik Sardana
dbc000d655 fix: batched items method giving wrong quantity, so changed it back to previous way 2023-08-05 11:23:07 +05:30
mergify[bot]
b65ee6c2db
fix: cross connect delivery note and sales invoice (backport #36183) (#36457) 
fix: cross connect delivery note and sales invoice (#36183)

* fix: cross connect delivery note and sales invoice

* chore: remove unnecessary non_standard_fieldname

(cherry picked from commit 8501a1182ae8323d91438da30ddc8d93cf8c2789)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-08-05 10:57:23 +05:30
RitvikSardana
b86afb2964
feat: Financial Ratio Report (#36130) 
* feat: Financial Ratio report added

* fix: Made columns dynamic

* fix: Changed fieldtype of year column

* fix: Added Financial Ratios for all Fiscal Years

* fix: Added Validation of only Parent Having account_type of Direct Income, Indirect Income, Current Asset and Current Liability

* fix: Added 4 more ratios

* fix: added a function for repeated code

* fix: added account_type in accounts utils and cleaned report code

* fix: created function for avg_ratio_values

* fix: cleaning code

* fix: basic ratios completed

* fix: cleaned the code

* chore: code cleanup

* chore: remove comments

* chore: code cleanup

* chore: cleanup account query

* chore: Remove unused variables

---------

Co-authored-by: Ritvik Sardana <ritviksardana@Ritviks-MacBook-Air.local>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-08-04 22:05:30 +05:30
Gursheen Kaur Anand
edbefee10c
fix: payment allocation in invoice payment schedule (#36440) 
* fix: payment allocation in invoice payment schedule

* test: payment allocation for payment terms

* chore: linting issues
 2023-08-04 17:49:17 +05:30
Sumit Jain
49be740736
fix: Contact Doctype doesn't have any field called job_title 
fix: Contact Doctype doesn't have any field called `job_title`
 2023-08-04 17:45:16 +05:30
Deepesh Garg
17585f08ba
Merge pull request #36333 from GursheenK/AP-GL-not-matching 
fix: AP report does not show expense claim payables
 2023-08-04 17:42:54 +05:30
Ritvik Sardana
510543680b fix: batched items in POS 2023-08-04 16:55:30 +05:30
Ritvik Sardana
c9d5a62350 fix: POS Runtime Effect completed 2023-08-04 16:47:49 +05:30
Deepesh Garg
7276d593c3
Merge pull request #36458 from GursheenK/consolidated-financial-statements-roottype 
test: balance sheet report
 2023-08-04 09:55:36 +05:30
Deepesh Garg
04820b14da
Merge pull request #35644 from ruthra-kumar/book_gain_loss_in_je 
refactor: booking exchange gain/loss amount through journal
 2023-08-04 09:53:26 +05:30
Deepesh Garg
10529e1f5a
Merge pull request #36412 from pancho-s/Custom_Abbr_On_Setup 
feat: Reallow customizing company abbreviation on setup.
 2023-08-03 21:34:57 +05:30
Anand Baburajan
38a612c62e
chore: better cost center validation for assets (#36477) 2023-08-03 16:37:05 +05:30
Ritvik Sardana
5b1aa07ecb fix: fixed SABB error 2023-08-03 16:10:28 +05:30
Husam Hammad
27ebf14f9d
fix: handle None value in payment_term_outstanding 
* Fix payment entry bug: Handle None value in payment_term_outstanding

* fix: Handle None value in payment_term_outstanding V2

fix linting issue
 2023-08-02 16:28:05 +05:30
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
Gursheen Anand
002bf77314 test: balance sheet report 2023-08-01 23:24:18 +05:30
Gursheen Anand
cd98be6088 fix: check root type only when not none 2023-08-01 23:22:49 +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
Ritvik Sardana
17771a55fb fix: added code for batched items in POS 2023-08-01 19:28:40 +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
Deepesh Garg
333f2a565b fix: Add journal entry in demo 2023-08-01 10:10:50 +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
Bernd Oliver Sünderhauf
f333d2724a
Merge branch 'frappe:develop' into Custom_Abbr_On_Setup 2023-08-01 01:18:10 +02:00
Bernd Oliver Sünderhauf
bc8d05da0f feat: Reallow customizing company abbreviation on setup. 2023-07-31 23:46:47 +02:00
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
70c5df056d Merge branch 'develop' of https://github.com/frappe/erpnext into demo_data_on_install 2023-07-31 13:02:34 +05:30
Deepesh Garg
7805abbb2d fix: reset default company 2023-07-30 20: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
Deepesh Garg
c850f46c0a chore: Update records 2023-07-30 11:53:09 +05:30
Deepesh Garg
26ee50269a test: Update demo setup test 2023-07-30 11:52:49 +05:30
Deepesh Garg
371413a078 fix: Button to clear demo data 2023-07-29 22:39:07 +05:30
Deepesh Garg
3698af834b Merge branch 'develop' of https://github.com/frappe/erpnext into demo_data_on_install 2023-07-29 17:12:06 +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
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
Gursheen Anand
f5761e7965 refactor: future payments query 2023-07-28 16:01:30 +05:30
Rohit Waghchaure
1c2148b637 fix: multiple issues related to Production Plan 2023-07-28 15:38:00 +05:30
Gursheen Anand
e355dea4b5 fix: AP and AR summary 2023-07-28 14:51:28 +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
Gursheen Anand
fd5c4e0a64 fix: fetch ple for all party types 2023-07-28 11:41:03 +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
ruthra kumar
46ea814400 chore: cancel gain/loss je while posting reverse gl 2023-07-28 08:34:36 +05:30
ruthra kumar
567c0ce1e8 chore: don't make gain/loss journal for base currency transactions 2023-07-28 08:12:44 +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
Deepesh Garg
dacf013170
Merge pull request #36347 from deepeshgarg007/ac_ignore 
fix: Ignore account closing balance for financial statement
 2023-07-27 19:54:01 +05:30
Deepesh Garg
cf50bb45ad
Revert "fix: Default year start and end dates in reports" 2023-07-27 19:13:11 +05:30
Deepesh Garg
3db6ac5ac9
Merge pull request #36069 from GursheenK/purchase-sales-register-with-PE/JE 
feat: include payments in purchase / sales register report
 2023-07-27 18:13:37 +05:30
Gursheen Anand
4f9242d699 fix: dimension name in remark 2023-07-27 15:45:48 +05:30
Deepesh Garg
ccf1920a78 fix: Ignore account closing balance for financial statement 2023-07-27 15:40:36 +05:30
Rucha Mahabal
5d87c06332
refactor: remove hrms app translations (#36343) 2023-07-27 12:30:23 +05:30
Deepesh Garg
5dc8195d91
Merge pull request #36249 from deepeshgarg007/default_dates 
fix: Default year start and end dates in reports
 2023-07-27 12:19:44 +05:30
Ankush Menat
1d7dbd3456
perf: don't use ifnull where it's not required (#36336) 
ifnull isn't really required when doing `!= 'anything'` because if it's null then value will be falsy.
ifnull is only required when checking `= ''` if you treat `null = ''`

Actuall better fix would be make things explcitly non-nullable, then we won't ever have to add this on such fields.

ref: https://github.com/frappe/frappe/pull/21822
 2023-07-27 06:06:07 +00:00
Nabin Hait
56e7cc7e05
Merge pull request #36327 from nabinhait/pcv-fix 
fix: GL Entries should not be split based on cost center allocation in PCV
 2023-07-27 11:33:06 +05:30
Gursheen Anand
b1818137e7 fix: PE in sales register 2023-07-27 10:08:26 +05:30
ruthra kumar
804afaa647 chore(test): use existing company for unit test 2023-07-27 09:30:38 +05:30
ruthra kumar
d9d6856153 chore: rename some internal variables 2023-07-27 08:02:46 +05:30
ruthra kumar
acc7322874 chore: add msgprint for exc JE 2023-07-27 07:52:01 +05:30
ruthra kumar
47bbb37291 chore: use frappetestcase 2023-07-27 05:54:13 +05:30
ruthra kumar
025091161e refactor(test): assert ledger outstanding 2023-07-27 05:53:12 +05:30
ruthra kumar
bfa54d5335 fix(test): test case breakage in Github Actions 2023-07-26 22:33:58 +05:30
ruthra kumar
ae424fdfed test: assert ledger after cr note cancellation 2023-07-26 22:33:58 +05:30
ruthra kumar
95543225cf fix: cr/dr note should be posted for exc gain/loss 2023-07-26 22:33:58 +05:30
ruthra kumar
e3d2a2c5bd test: cr notes against invoice 2023-07-26 22:33:58 +05:30
ruthra kumar
506a5775f9 fix: incorrect gain/loss on allocation change on reconciliation tool 2023-07-26 22:33:58 +05:30
ruthra kumar
ba1f065765 refactor: create gain/loss on Cr/Dr notes with different exc rates 2023-07-26 22:33:58 +05:30