brotherton-erpnext

Author	SHA1	Message	Date
s-aga-r	afd7d59c73	fix: `AttributeError` while saving subcontracting order	2023-08-26 13:10:47 +05:30
rohitwaghchaure	d4218a88ad	chore: fixed bom creator linter issue (#36827 )	2023-08-26 12:54:13 +05:30
s-aga-r	27d56461c5	Merge branch 'develop' into SCR-SCRAP-ITEMS	2023-08-26 12:07:58 +05:30
s-aga-r	ed4f498704	feat: allow scrap items when backflush based on is Material Transfer	2023-08-26 11:38:45 +05:30
s-aga-r	08bc33689c	fix(ux): make `Get Scrap Items` button hidden for submitted and cancelled doc	2023-08-26 10:57:49 +05:30
Deepesh Garg	5c48074bed	Merge branch 'develop' of https://github.com/frappe/erpnext into view-projects-in-customer-portal	2023-08-25 21:05:59 +05:30
Deepesh Garg	a7137514b6	chore: Update patch	2023-08-25 21:05:49 +05:30
HENRY Florian	e462edc628	chore: update fr translation for Naming Series (#36785 ) * chore: update fr translation for Naming Series * chore: update fr translation * chore: update fr translation * chore: update fr translation	2023-08-25 20:40:31 +05:30
s-aga-r	c8d7433e30	refactor(minor): `subcontracting_receipt.js`	2023-08-25 20:23:39 +05:30
s-aga-r	1504ff8b6c	fix: ignore scrap items while distribute additional cost	2023-08-25 20:18:30 +05:30
ruthra kumar	447b73fa77	Merge pull request #36821 from ruthra-kumar/increase_test_coverage_for_receivable_payable_report test: use mixin and increase coverage in receivable report	2023-08-25 18:09:16 +05:30
ruthra kumar	ce81ffd844	test: increase coverage in ar/ap report	2023-08-25 17:28:54 +05:30
s-aga-r	879d31a588	fix: recalculate rate while getting scrap items	2023-08-25 16:13:08 +05:30
ruthra kumar	bb7bed4c1a	refactor(test): make use of mixin in ar/ap report tests	2023-08-25 14:46:10 +05:30
Deepesh Garg	91ca2309da	Merge pull request #36802 from GursheenK/tax_withholding_jvs_with_no_partytype fix: fetch JVs without party value in tax withholding report	2023-08-25 14:43:41 +05:30
ViralKansodiya	388a42ec7e	fix: Asset Category filter is not working in asset depreciation and b… (#36806 ) fix: Asset Category filter is not working in asset depreciation and balances Co-authored-by: ubuntu <viralkansodiya167@gmail.com>	2023-08-25 11:44:05 +05:30
s-aga-r	9b47617117	feat: button to get Scrap Items	2023-08-25 10:53:13 +05:30
s-aga-r	7a6db924d5	fix: validate scrap items	2023-08-25 09:56:48 +05:30
s-aga-r	199071b773	fix(ux): make `Recalculate Rate` field hidden for scrap items	2023-08-25 09:36:12 +05:30
s-aga-r	40a6b5cefe	fix: don't recalculate rate for scrap items	2023-08-25 09:35:29 +05:30
s-aga-r	a6b2cf3acd	fix: reduce scrap cost from FG total cost	2023-08-25 07:30:55 +05:30
s-aga-r	794edbb334	feat: add `Scrap Cost Per Qty` field in SCR Item	2023-08-24 22:02:29 +05:30
Deepesh Garg	1449e38b39	Merge pull request #36799 from deepeshgarg007/tds_on_debit_note fix: Tax withholding reversal on Debit Notes	2023-08-24 19:30:54 +05:30
Deepesh Garg	abc5fdd47b	Merge pull request #36804 from deepeshgarg007/demo_coa fix(demo): Default accounts for demo company	2023-08-24 19:30:17 +05:30
s-aga-r	f78b6d0081	refactor: code cleanup	2023-08-24 18:56:16 +05:30
Deepesh Garg	8ed8698fdf	Merge pull request #36596 from Nihantra-Patel/pos_receipt_mail fix: POS Invoice Email Receipt Mail	2023-08-24 18:33:49 +05:30
Deepesh Garg	0120588f5f	chore: Handle edge cases	2023-08-24 18:32:16 +05:30
Deepesh Garg	299e32befd	chore: Linting Issues	2023-08-24 18:02:06 +05:30
Deepesh Garg	5f75aea6fa	fix(demo): Default accounts for demo company	2023-08-24 17:58:51 +05:30
Deepesh Garg	6349b67df4	fix(demo): Default accounts for demo company	2023-08-24 17:54:14 +05:30
rohitwaghchaure	3c15feadf6	feat: Multi-level BOM Creator (#36494 ) * feat: Multi-level BOM Creator * fix: renamed BOM Configurator to BOM Creator * fix: added Cost in the tree * fix: finished good cost * fix: valuation rate in tree ui * chore: conflicts and removed unnecessary files * test: test cases for BOM Creator * fix: added shortcut for the BOM Creator * fix: added validation for Final Product	2023-08-24 17:24:44 +05:30
s-aga-r	a33b75f2cd	feat: allow manually entry for scrap items in SCR	2023-08-24 16:37:57 +05:30
Gursheen Anand	7c1417e199	chore: fix linting issues	2023-08-24 12:55:54 +05:30
Gursheen Anand	8f1e00906f	fix: fetch JVs with no party selected in filters	2023-08-24 12:55:00 +05:30
Ankush Menat	ab6e600b9e	fix: demo data setup w/o territory (#36798 ) This can fail because it's translated.	2023-08-24 12:23:33 +05:30
s-aga-r	d1e877b6f0	refactor: Subcontracting Receipt Item form view	2023-08-24 12:16:12 +05:30
s-aga-r	4e7cccbdf0	feat: `Is Scrap Item` field in Subcontracting Receipt Item	2023-08-24 11:53:09 +05:30
Deepesh Garg	6d9cebfee9	fix: Tax withholding reversal on Debit Notes	2023-08-24 11:49:03 +05:30
Dany Robert	89ddf3272e	fix(regional): item wise tax calc issue	2023-08-24 05:56:56 +00:00
s-aga-r	49be1190d9	Merge pull request #36786 from s-aga-r/SCR-QI feat: `Quality Inspection` for Subcontracting Receipt	2023-08-24 11:06:51 +05:30
s-aga-r	8010a157b1	fix: use `flt` for qty and rate fields	2023-08-24 11:06:19 +05:30
Dany Robert	9e1b2c9f57	fix: item wise split up rounding	2023-08-24 05:02:14 +00:00
s-aga-r	f31eb74234	test: add test case for SCR Quality Inspection	2023-08-24 10:22:21 +05:30
s-aga-r	723563c167	fix: SCR return status (#36793 )	2023-08-24 10:13:47 +05:30
Raffael Meyer	54ffe41b54	feat(MR): Project and Cost Center in Connections (#36794 )	2023-08-24 10:12:18 +05:30
ruthra kumar	758ea7bfe1	Merge pull request #35330 from ruthra-kumar/cr_note_posts_gl_for_itself refactor: cr/dr note should be standalone even when created from another invoice	2023-08-23 20:38:14 +05:30
Deepesh Garg	2ed73c17c3	Merge pull request #36720 from git-avc/lost_reason_opportunity fix: lost opportunity reason dialog don't appears	2023-08-23 19:42:22 +05:30
Anand Baburajan	bb3bd02f53	chore: styling improvements for asset depr sch table (#36792 ) * chore: improve asset depr sch table * chore: fix text color	2023-08-23 19:22:25 +05:30
Anand Baburajan	56b26852f3	fix: use current asset depr schedule to make temp schedule (#36783 ) fix: use current depr schedule to make temp schedule	2023-08-23 18:01:59 +05:30
ruthra kumar	60eee564bf	refactor: Payment btn criteria for Cr/Dr notes	2023-08-23 17:58:15 +05:30
s-aga-r	c9ae9df902	fix(ux): increase `Quality Inspection` dialog width	2023-08-23 13:58:43 +05:30
s-aga-r	3fab6610cb	feat: setup Quality Inspection for Subcontracting Receipt - SCR[docstatus=0, is_return=0] Create > Quality Inspection(s) - Filters for Quality Inspection field in Subcontracting Receipt Items table	2023-08-23 13:58:40 +05:30
s-aga-r	3fdcd33b92	feat: `Quality Inspection` in `Subcontracting Receipt`	2023-08-23 12:15:35 +05:30
s-aga-r	5b62bbe073	Merge pull request #36752 from s-aga-r/FR-35157 feat: `Update Items` for Subcontract Purchase Order	2023-08-23 11:13:28 +05:30
Dany Robert	0ebcc2cf2c	fix: round item_wise_tax_detail in taxes	2023-08-23 04:51:09 +00:00
Dany Robert	dfb5b88abb	chore: linters	2023-08-23 04:01:00 +00:00
Dany Robert	c20258d2a3	fix: tax calc changes in js	2023-08-23 03:59:08 +00:00
ruthra kumar	bf6bf79ae3	Merge pull request #36650 from ruthra-kumar/refactor_payment_reconcliation_ui perf: improve responsiveness of payment reconciliation tool	2023-08-23 09:12:36 +05:30
Deepesh Garg	53926b0620	Merge pull request #36758 from RitvikSardana/develop-ritvik-ap-currency fix: Accounts Payable Currency bug	2023-08-22 22:27:54 +05:30
mergify[bot]	a77e9d36cc	fix: Procurement Tracker report not showing material request items (backport #36768 ) (#36774 ) fix: Procurement Tracker report not showing material request items (#36768) (cherry picked from commit 6a9935c00e502a28fa976c963a218f7e11b891ec) Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>	2023-08-22 22:09:45 +05:30
Dany Robert	3ead28906c	feat: item(row) wise tax amount rounding	2023-08-22 14:41:07 +00:00
s-aga-r	305d39f6a1	test: add test case for Subcontract PO update items	2023-08-22 18:24:30 +05:30
mergify[bot]	611c2bf775	fix: not able to make stock entry (backport #36759 ) (#36767 ) fix: not able to make stock entry (#36759) (cherry picked from commit 873ee384a1f0832faf84015167f7bdc697f1dc46) Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>	2023-08-22 17:36:56 +05:30
s-aga-r	b9b1717e96	fix: re-validate PO while updating items	2023-08-22 16:53:54 +05:30
s-aga-r	9588bb7443	fix: validate FG Item and Qty	2023-08-22 16:29:14 +05:30
Anand Baburajan	87e2309e8e	fix: avoid duplicate asset activity entries on asset capitalization (#36756 )	2023-08-22 15:30:04 +05:30
RitvikSardana	9349bc77c5	fix: Accounts Payable Currency bug	2023-08-22 14:12:42 +05:30
Raffael Meyer	9d29ec8eac	fix: attachments should be an empty list by default (#36757 ) fix: attachments should be an empty list by default	2023-08-22 13:35:12 +05:30
Anand Baburajan	8f04945cef	fix: incorrect schedule in asset value adjustment (#36747 )	2023-08-22 12:36:09 +05:30
Raffael Meyer	4b75b6f309	feat(RFQ): optionally send document print (#36363 )	2023-08-22 12:26:01 +05:30
ruthra kumar	3fd2778ae4	Merge pull request #36748 from ruthra-kumar/clean_up_reconcilition chore: clean up stale code in reconciliation tool	2023-08-22 06:19:52 +05:30
ruthra kumar	e93b927051	chore: clean up stale code in reconciliation tool	2023-08-22 05:32:56 +05:30
ruthra kumar	991770ed4a	fix: incorrect gl balance on AR summary rpt on multi company setup	2023-08-21 21:32:23 +05:30
ruthra kumar	a4ff76c920	Merge pull request #36727 from ruthra-kumar/fix_broken_advance_field_in_ar_summary_rpt fix: broken advance field in Accounts Receivable summary rpt	2023-08-21 20:53:03 +05:30
ruthra kumar	d01f0f2e96	refactor: filter for journal entries	2023-08-21 20:50:34 +05:30
ruthra kumar	86bac2cf52	refactor: filter on advance payments	2023-08-21 20:50:34 +05:30
ruthra kumar	52f609e67a	refactor: filter on cr/dr notes	2023-08-21 20:50:34 +05:30
ruthra kumar	e48f8139eb	refactor: trigger on value change	2023-08-21 20:50:34 +05:30
ruthra kumar	7a381affce	refactor: limit output to 50 in reconciliation tool	2023-08-21 20:50:32 +05:30
ruthra kumar	af52f21ece	test: add test for receivable summary report	2023-08-21 17:56:50 +05:30
ruthra kumar	06f86ad5e0	Merge pull request #36728 from ruthra-kumar/fetch_gain_loss_in_ar_ap_report fix: include gain/loss journal in AR/AP reports	2023-08-21 17:22:31 +05:30
Ankush Menat	86cac1e1d2	fix: add missing items labels back (#36737 ) [skip ci]	2023-08-21 15:59:52 +05:30
s-aga-r	faf9f13215	feat: allow `Update Items` for Subcontracted PO not having SCO created	2023-08-21 15:58:11 +05:30
Smit Vora	c47adcfdd9	fix: advance in seperate account	2023-08-21 15:12:11 +05:30
s-aga-r	450949cadd	Merge pull request #36709 from s-aga-r/FIX-36695 fix: don't throw if item does not have default BOM	2023-08-21 14:43:03 +05:30
ruthra kumar	0dc5e5c430	refactor: use payment ledger to fetch advance amount	2023-08-21 09:19:38 +05:30
ruthra kumar	896b123fb1	fix: broken advance field in Accounts Receivable summary rpt	2023-08-20 21:17:27 +05:30
ruthra kumar	e3104f1898	fix: include gain/loss journal in AR/AP reports	2023-08-20 20:13:31 +05:30
Deepesh Garg	a7f921a557	Merge pull request #36666 from batonac/batonac-plaid-fixes fix: Plaid Integration status and categories	2023-08-20 16:02:30 +05:30
Deepesh Garg	ddd929ef9b	Merge pull request #36696 from RitvikSardana/develop-ritvik-pos-mode-of-payment fix: mode of payment fetched from pos profile company in POS	2023-08-20 15:37:15 +05:30
mergify[bot]	87d02511a3	fix: timeout error coming during reposting (backport #36715 ) (#36717 ) fix: timeout error coming during reposting (#36715) (cherry picked from commit 620b21fec59e40178fde96085003d419804f21e0) Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>	2023-08-19 15:37:33 +05:30
avc	f10a93f6ee	fix: lost reason opportunity dialog don't appears Fix #36719	2023-08-18 17:33:37 +02:00
ruthra kumar	a34cb8a8dc	Merge pull request #36710 from ruthra-kumar/fix_broken_consolidated_financial_report fix: broken consolidated report due to finance book filter	2023-08-18 14:54:03 +05:30
ruthra kumar	96847db0ec	fix: broken consolidated report due to finance book filter	2023-08-18 14:04:46 +05:30
Gursheen Kaur Anand	6a7b45f689	Merge branch 'develop' into view-projects-in-customer-portal	2023-08-18 13:32:08 +05:30
s-aga-r	2e22b019a0	fix: throw if `BOM No` is not set	2023-08-18 13:24:49 +05:30
Gursheen Anand	e8f6c286d1	fix: remove portal menu items in pre-model sync patch	2023-08-18 13:21:37 +05:30
s-aga-r	268c19e745	fix: don't throw if item does not have default BOM	2023-08-18 13:14:53 +05:30
ruthra kumar	8f695123cd	refactor: criteria for `Credit Note Issued` and `Debit Note Issued`	2023-08-18 10:13:48 +05:30
Deepesh Garg	21e6db2bc7	Merge pull request #36060 from rtdany10/skip_tcs fix: skip tax witholding category if not account set for company	2023-08-17 20:56:37 +05:30
Ritvik Sardana	1bdd43d0f6	fix: mode of payment fetched from pos profile company in POS	2023-08-17 17:29:01 +05:30
Deepesh Garg	c70abaa43a	Merge pull request #36684 from deepeshgarg007/gl_transaction_currency feat: Transaction currency columns in GL report	2023-08-17 16:06:23 +05:30
rohitwaghchaure	3f6ff8e0b7	perf: enabled indexing for voucher no in SABB (#36688 )	2023-08-17 13:48:37 +05:30
Shariq Ansari	5d9dde92fa	Merge pull request #36685 from shariquerik/api-fix	2023-08-17 13:09:14 +05:30
Ankush Menat	6bf79f18c8	chore: skip demo banner if another one present	2023-08-17 12:37:29 +05:30
Shariq Ansari	21c1141fdb	chore: linter fix	2023-08-17 12:14:13 +05:30
Raffael Meyer	552bbb1d46	fix(RFQ): make "update password" and "submit quotation" buttons the same size (#36667 ) fix(RFQ): button styling	2023-08-17 12:04:05 +05:30
Shariq Ansari	7ec6909159	fix: check tax and charges if it is passed	2023-08-17 11:59:47 +05:30
Deepesh Garg	35be3ac5a1	feat: Transaction currency columns in GL report	2023-08-17 11:31:40 +05:30
Deepesh Garg	98adfb4c9a	Merge pull request #36492 from RitvikSardana/develop-ritvik-POS-runtime-effect fix: POS runtime effect	2023-08-17 10:54:48 +05:30
ruthra kumar	3345165206	Merge pull request #36649 from ruthra-kumar/perf_latest_details_only_pulled_for_linked_vouchers perf: pull latest details only for referenced vouchers	2023-08-17 09:00:29 +05:30
Deepesh Garg	124c0dbd88	fix(UX): Ignore prepared report	2023-08-16 19:10:39 +05:30
Gursheen Anand	d119d2ec32	fix: delete doc without filters	2023-08-16 17:35:07 +05:30
ruthra kumar	f6e4ac2b62	refactor(test): payments to invoice with -ve outstanding	2023-08-16 16:19:53 +05:30
Gursheen Anand	c071523e35	fix: delete portal settings for education doctypes	2023-08-16 12:23:10 +05:30
Ritvik Sardana	0d95fc0f20	fix: test_serial_no_case_1 test case works	2023-08-16 11:41:24 +05:30
Kevin Shenk	43f530b077	fix: Plaid Integration status and categories "pending" is a boolean not a string, and "category" doesn't exist in some edge cases	2023-08-15 13:34:59 -04:00
ruthra kumar	924911e743	Merge pull request #36663 from ruthra-kumar/readd_permissions_in_journal fix: re-add permission that was unintentionally removed	2023-08-15 17:06:24 +05:30
ruthra kumar	45662fa646	fix: re-add permission that was unintentionally removed Remove `Reversal OF ITC` and re-add permissions. Both of them unintended changes	2023-08-15 16:23:47 +05:30
Anand Baburajan	e0c79d3b53	chore: add validation for depreciation expense account in asset category (#36659 )	2023-08-15 10:17:15 +00:00
Deepesh Garg	1e07f6eef9	fix(demo): More exception handling on demo data generation (#36652 )	2023-08-15 10:45:36 +05:30
Gughan Ravikumar	cdf100d552	fix: Naming Series preview when no previous transaction present	2023-08-15 09:38:29 +05:30
ruthra kumar	0e2fb1188a	refactor(test): ledger entries will be against itself	2023-08-15 09:03:02 +05:30
Babuuu	89e89de961	Fix tax amount in customer portal (#36453 ) The net total is the value that is currently being displayed instead of the tax amount.	2023-08-15 08:54:06 +05:30
ruthra kumar	d77b0295fa	Merge pull request #36642 from ruthra-kumar/toggle_for_negative_rates refactor: toggle for negative item rates in Selling Settings	2023-08-15 08:12:10 +05:30
ruthra kumar	a0fc68538f	refactor: toggle for negative rates in Selling Settings	2023-08-15 07:34:33 +05:30
ruthra kumar	deb0d71294	perf: pull latest details only for referenced vouchers	2023-08-15 05:26:26 +05:30
Kevin Shenk	7ab55b1bb2	fix: Document Name link validation in Bank Reconciliation Tool (#36495 ) fix: format_row broke Document Name link validation #35540 broke Voucher Matching, leading to an invalid link exception on submission. This is because the format_row() function overwrites the row data instead of just providing a formatter on the DataTable column, and therefore passes through the formatted (linked) column data instead of the Document Name only. This patch moves the appropriate frappe.form.formatters.Link function to a dedicated format hook on the DataTable columns definition, both fixing the error and retaining the functionality of #35540.	2023-08-14 19:03:01 +05:30
abdosaeed95	670d9e5556	fix: validate loyalty_amount against rounded_total instead of grand_total (#36466 )	2023-08-14 18:54:01 +05:30
HarryPaulo	843e77e72d	fix: standard formula to calculate the "difference" (#36612 )	2023-08-14 18:51:30 +05:30
Deepesh Garg	985ff9781b	fix: Tax withholding post LDC limit consumed (#36611 ) * fix: Tax withholding post LDC limit consumed * fix: LDC condition check	2023-08-14 18:19:15 +05:30
Gursheen Kaur Anand	12a6f3b997	feat: add invoice totals in tax withholding report (#36567 ) * fix: add invoice totals in tax withholding report * fix: naming series col in tax withholding report * fix: tds computation summary cols	2023-08-14 18:15:47 +05:30
mergify[bot]	1ff80fcbee	fix: Button Alignment center in hero slider (backport #36607 ) (#36638 ) fix: Button Alignment center in hero slider (#36607) fix: speling in CSS (Button alignment center is not working on hero slider)#36561 (cherry picked from commit b131f70ed6a8e3b763d59106084440e08a73b815) Co-authored-by: ViralKansodiya <141210323+viralkansodiya@users.noreply.github.com>	2023-08-14 16:25:38 +05:30
Ankush Menat	8b57979e9c	fix: clear demo data with unknown columns (#36637 )	2023-08-14 08:46:48 +00:00
ViralKansodiya	75652799cd	feat: Tick on checkbox to include draft timesheets (#36577 ) feat: Tick on Check box to include Draft Timesheets	2023-08-14 14:14:49 +05:30
Ankush Menat	e023e33a15	fix(demo): drop parent item group (#36636 ) This is translated according to user language, so "All Item Groups" might not exist on site. The code already finds root item group without doing anything. towards https://github.com/frappe/erpnext/issues/36635	2023-08-14 13:46:16 +05:30
Ritvik Sardana	d4cc9daca1	chore: code clean up	2023-08-14 11:52:49 +05:30
Ritvik Sardana	68df3f9729	fix: get_items call improved	2023-08-14 11:44:47 +05:30
Deepesh Garg	fbb5058531	fix: AR/AP report based on payment terms (#36574 ) * fix: AR/AP report based on payment terms * fix: AR/AP report based on payment terms	2023-08-14 08:32:07 +05:30
Deepesh Garg	39ec11200e	fix(demo): Item creation with India Compliance app (#36627 )	2023-08-13 18:33:09 +05:30
ruthra kumar	b30c1e1abf	refactor(test): return invoice will have -ve outstanding	2023-08-13 15:52:45 +05:30
ruthra kumar	00878707ae	refactor: remove return_against for cr/dr note filter	2023-08-13 15:52:42 +05:30
ruthra kumar	db76e8a277	refactor: cr notes will post for itself	2023-08-13 15:30:17 +05:30
RitvikSardana	ae2c600223	fix: POS compatible for mobile view (#36534 ) * fix: POS compatable for mobile view * fix: variables for margin and font size, and dark mode compatibility while selecting any item from cart --------- Co-authored-by: Ritvik Sardana <ritviksardana@Ritviks-MacBook-Air.local>	2023-08-13 13:27:43 +05:30
Naufal Afif	ce25f9e8c9	fix: wrong currency on financial-statement based reports (#36524 ) * add missing field options on financial_statement Total field * format financial statement code	2023-08-13 13:26:56 +05:30
ruthra kumar	3c7702c53c	Merge pull request #36309 from ruthra-kumar/fix_incorrect_validation_on_partial_pay_for_so fix: allocation validation blocks partial payment for SO and PO	2023-08-13 08:42:42 +05:30
s-aga-r	539cfd08f0	fix: fetch `Stock UOM` from Item if not set (#36606 )	2023-08-12 22:42:01 +05:30
Ankush Menat	2d3fa8040c	fix(UX): make demo button dismissable for session	2023-08-12 11:35:02 +05:30
Ankush Menat	6b464edf84	fix: dont render demo clear button if onboarding tour present	2023-08-12 11:35:02 +05:30
Deepesh Garg	f8e7bc08af	Merge pull request #36564 from deepeshgarg007/monthly_sales_update fix: Make default sales update frequency as monthly instead of each transaction	2023-08-11 22:39:04 +05:30
Deepesh Garg	7f062a71f1	Merge pull request #36582 from deepeshgarg007/final_total fix: Group Account total not showing in Financial Statements	2023-08-11 21:56:44 +05:30
ruthra kumar	713880aef0	Merge pull request #36590 from ruthra-kumar/disallow_multiple_so_if_blocked_in_settings fix: disallow mulitple SO with same Purchase Order No if not enabled in Settings	2023-08-11 19:46:24 +05:30
Anand Baburajan	627986efa1	fix: wrap none type rate under flt (#36602 )	2023-08-11 18:01:27 +05:30
ruthra kumar	64614cd915	refactor(test): don't set po_no by default	2023-08-11 17:43:50 +05:30
Ankush Menat	581d98c5ae	Merge pull request #35777 from deepeshgarg007/demo_data_on_install feat: Demo setup	2023-08-11 14:38:38 +05:30
Anand Baburajan	98e82e0d99	chore: set default filter dates if missing (#36597 )	2023-08-11 08:51:48 +00:00
Nihantra C. Patel	dd91a77fdd	fix: POS Invoice Email Receipt Mail	2023-08-11 13:19:09 +05:30
Nihantra C. Patel	7e34468504	fix: POS Invoice Email Receipt Mail	2023-08-11 12:27:18 +05:30
ruthra kumar	5bed119de9	Merge pull request #36593 from ruthra-kumar/update_permission_for_semi_auto_reconciliation_tool chore: update permissions for Process Payment Reconciliation	2023-08-11 11:42:47 +05:30
ruthra kumar	cd28d15292	chore: update permissions for Process Payment Reconciliation	2023-08-11 10:56:57 +05:30
ruthra kumar	dbd3fdbb41	fix: disallow mulitple SO with same PO No	2023-08-11 09:59:07 +05:30
Anand Baburajan	d138948c70	feat: daily asset depreciation method [dev] (#36588 ) feat: daily asset depreciation method	2023-08-10 17:46:01 +00:00
Deepesh Garg	90bc0d6bd0	Merge branch 'demo_data_on_install' of https://github.com/deepeshgarg007/erpnext into demo_data_on_install	2023-08-10 21:48:03 +05:30
Deepesh Garg	567f4c37fc	fix: Add order data	2023-08-10 21:46:34 +05:30
Deepesh Garg	000de4eddf	chore: Update customer/supplier names	2023-08-10 21:45:55 +05:30
Ankush Menat	c8e6e067ae	chore: telemetry for demo data erasure	2023-08-10 18:27:42 +05:30
Ritvik Sardana	f6c055cca9	fix: now time set in closing POS	2023-08-10 18:15:23 +05:30
Ankush Menat	8bdf280cfb	fix: confirm before clearing demo data	2023-08-10 17:55:15 +05:30
Ankush Menat	e4b863af05	refactor: gracefully fail while clearing demo data	2023-08-10 17:52:53 +05:30
Ankush Menat	940b1d9e67	feat(ux): account workspace number cards	2023-08-10 17:46:35 +05:30
Ritvik Sardana	526f1d18fb	fix: added test for runtime effect	2023-08-10 17:35:12 +05:30
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
Gughan Ravikumar	89d109e8d2	fix: Naming Series preview when no previous transaction present	2023-07-27 23:12:11 +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
ruthra kumar	1ea1bfebc4	refactor: convert class method to standalone function	2023-07-26 22:33:58 +05:30
ruthra kumar	c0b3b069b5	refactor: split make_exchage_gain_loss_journal into smaller function	2023-07-26 22:33:58 +05:30
ruthra kumar	c87332d5da	refactor: cr/dr note will be on single exchange rate	2023-07-26 22:33:58 +05:30
ruthra kumar	6628632fbb	chore: type info	2023-07-26 22:33:58 +05:30
ruthra kumar	37895a361c	chore(test): fix broken test case	2023-07-26 22:33:58 +05:30
ruthra kumar	70dd9d0671	chore(test): fix broken unit test	2023-07-26 22:33:58 +05:30
ruthra kumar	f3363e813a	test: journals against sales invoice	2023-07-26 22:33:58 +05:30
ruthra kumar	f4a65cccc4	refactor: handle diff amount in various names	2023-07-26 22:33:58 +05:30
ruthra kumar	5695d6a5a6	refactor: unit tests for journals	2023-07-26 22:33:58 +05:30
ruthra kumar	0567243772	refactor: dr/cr logic for journals as payments	2023-07-26 22:33:58 +05:30
ruthra kumar	73cc1ba654	refactor: assert payment ledger outstanding in both currencies	2023-07-26 22:33:58 +05:30
ruthra kumar	6e18bb6456	refactor: cancel gain/loss JE on Journal as payment cancellation	2023-07-26 22:33:58 +05:30
ruthra kumar	f119a1e115	refactor: linkage between journal as payment and gain/loss journal	2023-07-26 22:33:58 +05:30
ruthra kumar	cd42b26839	chore: code cleanup	2023-07-26 22:33:58 +05:30
ruthra kumar	1bcb728c85	refactor: remove call for setting deductions in payment entry	2023-07-26 22:33:58 +05:30
ruthra kumar	72bc5b3a11	refactor(test): difference amount no updated for exchange gain/loss	2023-07-26 22:33:58 +05:30
ruthra kumar	5b06bd1af4	refactor(test): exc gain/loss journal for advance in purchase invoice	2023-07-26 22:33:58 +05:30
ruthra kumar	78bc712756	refactor: only post on base currency for exchange gain/loss	2023-07-26 22:33:58 +05:30
ruthra kumar	ee2d1fa36e	refactor(test): payment will have same exch rate - no gain/loss while making payment entry using reference to sales/purchase invoice, it herits the parent docs exchange rate. so, there will be no exchange gain/loss	2023-07-26 22:33:58 +05:30
ruthra kumar	389cadf157	refactor(test): assert Exc journal when reconciling Journa to invoic	2023-07-26 22:33:58 +05:30
ruthra kumar	ee3ce82ea8	chore: remove debugging statements and fixing failing unit tests	2023-07-26 22:33:58 +05:30
ruthra kumar	7b516f8463	refactor: exc booking logic for Journal Entry	2023-07-26 22:33:58 +05:30
ruthra kumar	00a2e42a47	refactor(test): exc gain/loss booked through journal	2023-07-26 22:33:58 +05:30
ruthra kumar	4ff53e1062	refactor: assert exchange gain/loss amount in reference table	2023-07-26 22:33:58 +05:30
ruthra kumar	92ae9c2201	refactor: remove unused variable, pe should pull in parent exc rate 1. 'reference_doc' variable is never set. Hence, removing. 2. set_exchange_rate() relies on ref_doc, which was never set due to point [1]. Replacing it with 'doc'. 3. Sales/Purchase Invoice has 'conversion_rate' field for tracking exchange rate. Added a get statement for them as well.	2023-07-26 22:33:58 +05:30
ruthra kumar	c1184585ed	refactor: helper method	2023-07-26 22:33:58 +05:30
ruthra kumar	34b5e849a2	chore: fix logic for purchase invoice and some typos	2023-07-26 22:33:58 +05:30
ruthra kumar	13febcac81	refactor: add new reference type in journal entry account	2023-07-26 22:33:58 +05:30
ruthra kumar	0587338435	chore: patch to update property setter for Journal Entry Accounts	2023-07-26 22:33:58 +05:30
ruthra kumar	7e94a1c51b	refactor: replace with new method in purchase invoice	2023-07-26 22:33:58 +05:30
ruthra kumar	5e1cd1f227	test: different scenarios for exchange booking	2023-07-26 22:33:58 +05:30
ruthra kumar	81cd7873d3	refactor: book exchange gain/loss through journal	2023-07-26 22:33:58 +05:30
Anand Baburajan	5e7b05e566	chore: adding totals in asset reports (#36334 )	2023-07-26 21:57:18 +05:30
Gursheen Anand	c47a37c3ab	fix: fetch ple with party type employee in AP	2023-07-26 16:42:06 +05:30
ruthra kumar	e79f80331d	Merge pull request #36322 from frappe/mergify/bp/develop/pr-36298 fix: show invoices name instead of object address (backport #36298)	2023-07-26 16:11:56 +05:30
Anand Baburajan	f28f8dc596	fix: show depr schedule table in asset doc (#36332 )	2023-07-26 15:59:37 +05:30
Deepesh Garg	f368894d22	Merge pull request #36238 from RitvikSardana/develop-ritvik-pos-dark fix: POS closing with item name	2023-07-26 15:33:44 +05:30
gouravengineer	a5b626420d	fix: show invoices name instead of object address comma_and function in expecting a list but it gets a tuple so it is returning a object instead of a string (cherry picked from commit cf93714a7cce465d241bf4e713ee7492c5c01bfa)	2023-07-26 15:30:03 +05:30
Nabin Hait	666d961875	fix: GL Entries should not be splitted based on cost center allocation in PCV	2023-07-26 13:03:29 +05:30
Rohit Waghchaure	1c2da92233	fix: timeout error while cancelling the Purchase Receipt	2023-07-26 13:03:23 +05:30
Deepesh Garg	89aa6f0269	Merge pull request #36318 from barredterra/remove-autoname chore(Item Group): remove redundant autoname	2023-07-26 09:44:37 +05:30
barredterra	3558c3d24e	fix: german translations	2023-07-25 21:42:01 +02:00
Corentin Flr	d69af741c8	fix(taxes_and_totals.js): Fix initialize_taxes incorrect refactor Following changes from PR #36147, `cur_frm.cscript.validate_taxes_and_charges` is not a method anymore and should be replaced with the `erpnext.accounts.taxes.validate_taxes_and_charges` function.	2023-07-25 21:12:14 +02:00
rohitwaghchaure	17d4ab36c0	Merge pull request #36304 from frappe/mergify/bp/develop/pr-36300 fix: added missing option Partially Received in the status field (backport #36300)	2023-07-25 22:49:51 +05:30
Anand Baburajan	11a9d4124f	fix: apply discount on item after applying price list (#36317 )	2023-07-25 21:55:17 +05:30
barredterra	1691eee26e	chore(Item Group): remove redundant autoname	2023-07-25 18:05:41 +02:00
mergify[bot]	eead2bba9f	fix: group by in fixed asset register (copy #36310 ) (#36311 ) fix: group by in fixed asset register (cherry picked from commit 1151e47f46a9d4a250be83e751d9e0db6881274e) Co-authored-by: anandbaburajan <anandbaburajan@gmail.com>	2023-07-25 20:58:41 +05:30
barredterra	fd2c272bed	fix(Item Group): allow root deletion It was not possible to delete an empty, unused Item Group without any children, if it was one of possibly multiple roots of the Item Group tree. This fix allows deleting a root Item Group.	2023-07-25 17:01:57 +02:00
Rohit Waghchaure	55a9537220	fix: added missing option Partially Received in the status dropdown field (cherry picked from commit 4fa93b05c62b7f340a94e9e84d9d2e132ea35b99)	2023-07-25 12:39:07 +00:00
ruthra kumar	cb2bfabb6f	fix: validation blocks partial payment for SO and PO	2023-07-25 17:57:49 +05:30
Gursheen Anand	341709aa0a	fix: additional query cols for sales register	2023-07-25 15:57:17 +05:30
Deepesh Garg	2c1943c7e6	Merge pull request #36246 from blaggacao/bump-tweepy build(deps): update tweepy 3.10.0 -> 4.14.0	2023-07-25 15:06:48 +05:30
Deepesh Garg	8c410c617c	chore: Add default value	2023-07-25 14:47:46 +05:30
Deepesh Garg	e1d6bf364e	Merge branch 'develop' of https://github.com/frappe/erpnext into customer-details-in-tax-withholding-category-report	2023-07-25 14:45:36 +05:30
Gursheen Anand	95c6f4d40d	fix: additional query cols for gst itemised registers	2023-07-25 14:32:24 +05:30
Deepesh Garg	61be373800	Merge pull request #36107 from GursheenK/accounting_dimension_in_based_on_filter feat: filtering based on accounting dimensions in profitability analysis	2023-07-25 14:28:46 +05:30
RitvikSardana	62ca89b10f	fix: POS background color optimized in dark mode (#36287 ) fix: POS dark theme compatability Co-authored-by: Ritvik Sardana <ritviksardana@Ritviks-MacBook-Air.local>	2023-07-25 13:01:10 +05:30
Gursheen Anand	e6d66fe5b0	fix: gst itemised registers for india compliance api call	2023-07-25 12:14:37 +05:30
Deepesh Garg	30554301c9	Merge pull request #36235 from resilient-tech/fix-tax-breakup-for-diff-tax-rates fix: Correct Tax Breakup for different tax rates for same hsn code	2023-07-24 20:57:26 +05:30
Deepesh Garg	3f81e15672	Merge pull request #36147 from deepeshgarg007/eslint refactor(ci): add eslint and update linting confs	2023-07-24 20:55:07 +05:30
Smit Vora	1b8490dc98	Merge branch 'develop' into fix-tax-breakup-for-diff-tax-rates	2023-07-24 20:20:19 +05:30
mergify[bot]	1bc87a970a	fix: set new purchase_receipt_amount on asset split (copy #36272 ) (#36280 ) fix: set new purchase_receipt_amount on asset split (cherry picked from commit 7fd9b489eed33a81f29ecb3802d8a07d232c4c9c) Co-authored-by: anandbaburajan <anandbaburajan@gmail.com>	2023-07-24 19:37:07 +05:30
Deepesh Garg	4867a767a2	Merge pull request #36278 from resilient-tech/set-company-flag fix(regional): set `frappe.flags.company` temporarily, where required	2023-07-24 19:34:29 +05:30
Sagar Vora	4205f564a0	fix(regional): set `frappe.flags.company` temporarily, where required	2023-07-24 18:37:58 +05:30
DaizyModi	6f376cf103	fix: remove unused params	2023-07-24 18:02:42 +05:30
Gursheen Anand	db49d53aaf	fix: running balance after sorting	2023-07-24 17:42:13 +05:30
Deepesh Garg	164df33419	Merge pull request #36274 from GursheenK/process-soa-customer-filter fix: customer filter in process soa	2023-07-24 17:32:17 +05:30
Gursheen Anand	5224f13db2	fix: add patch for renaming tds payable report	2023-07-24 17:11:05 +05:30
Gursheen Anand	34d7fb388d	fix: customer filter in process soa	2023-07-24 16:47:06 +05:30
mergify[bot]	1436040d4c	fix: allow both custodian and location while creating asset (copy #36263 ) (#36264 ) fix: allow both custodian and location while creating asset (cherry picked from commit bff00bc8b2c8911f1513a25f066077e2b0c0adf0) Co-authored-by: anandbaburajan <anandbaburajan@gmail.com>	2023-07-24 15:51:24 +05:30
ruthra kumar	4464b2a21b	Merge pull request #36261 from ruthra-kumar/possible_missing_field_error_on_payment_entry refactor: apply terms based validation only on sales/purchase doctypes	2023-07-24 15:22:15 +05:30
rohitwaghchaure	7f4dda1b06	Merge pull request #36259 from rohitwaghchaure/fixed-report-default-email-outgoing-error fix: no default email account causing reposting issue	2023-07-24 15:03:09 +05:30
ruthra kumar	3dd119eeea	refactor: apply terms based validation only on sales/purchase doctyp	2023-07-24 14:50:11 +05:30
ruthra kumar	a785a6054e	Merge pull request #36251 from ruthra-kumar/performance_tune_timsheet_adding_logic fix: unresponsive sales invoice page	2023-07-24 14:01:07 +05:30
Rohit Waghchaure	efb51526a9	fix: no default email account causing reposting issue	2023-07-24 14:00:20 +05:30
Ritvik Sardana	8b4228d616	fix: removed duplicate code	2023-07-24 13:59:24 +05:30
Ritvik Sardana	5389dabe19	Merge branch 'develop' of https://github.com/frappe/erpnext into develop-ritvik-pos-dark	2023-07-24 12:48:58 +05:30
Ritvik Sardana	82b36e2ec8	fix: added test for pos closing without item code	2023-07-24 12:47:29 +05:30
Deepesh Garg	203b8ec872	Merge pull request #36220 from marination/dunning-patch-acc-frozen fix: Patch Dunnings after accounts were frozen	2023-07-24 12:46:32 +05:30
ruthra kumar	740f283ec1	Merge pull request #36241 from ruthra-kumar/fix_allocation_logic_in_get_outstanding_invoices fix: multiple fixes on payment terms based issues in payment entry	2023-07-24 12:35:25 +05:30
Deepesh Garg	4bb6db86f8	fix: Remove auto repeat (subscription) button from Sales and Purchase documents	2023-07-24 12:29:57 +05:30
Gursheen Anand	2f6d0bdcee	fix: col names for party types	2023-07-24 12:20:58 +05:30
Gursheen Anand	38b501e004	fix: make party type filter mandatory	2023-07-24 12:13:47 +05:30
Deepesh Garg	3c92686f0a	fix: Default year start and end dates in reports	2023-07-24 11:58:16 +05:30
David Arnold	b740cdfc00	build(deps): update tweepy 3.10.0 -> 4.14.0	2023-07-23 23:14:58 -05:00
David Arnold	d066b5cd04	fix(startup): coa drill down	2023-07-23 22:44:19 -05:00
Deepesh Garg	cdc9b62688	chore: Remove cur_frm from sales_invoice.js	2023-07-23 22:44:18 +05:30
Deepesh Garg	8d3d9493f0	chore: linting issues	2023-07-23 20:06:41 +05:30
ruthra kumar	d048365da3	refactor: refresh table once after loop ends	2023-07-23 19:56:30 +05:30
Deepesh Garg	0d70ae2a21	chore: Ingnore issues	2023-07-23 19:34:08 +05:30
Deepesh Garg	8ccb8e3c5b	chore: Move buying controller to utils	2023-07-23 18:50:44 +05:30
Deepesh Garg	7205fb9b97	chore: convert sales common to utils	2023-07-23 12:07:21 +05:30
ruthra kumar	ec7558b9e0	refactor: handle references without any template and `payment_term`	2023-07-23 11:55:16 +05:30
ruthra kumar	662ccd467c	fix: allocation logic on 'Get Outstanding Invoices' btn in PE 1. fixed broken `payment_term` filter in Payment References section 2. Throw error if user fails to select 'Payment Term' for an invoice with 'Payment Term based allocation' enabled.	2023-07-23 11:37:27 +05:30
Deepesh Garg	4077254b01	chore: resolve undefined variables issue	2023-07-22 23:07:18 +05:30
Deepesh Garg	0b1e78e127	chore: Add landed cost taxes and charges common in bundles	2023-07-22 21:19:48 +05:30
Deepesh Garg	6b2dbdd394	Merge branch 'develop' into skip_tcs	2023-07-22 18:38:45 +05:30
ruthra kumar	e6abe1b77f	Merge pull request #36206 from ruthra-kumar/test_cases_for_payment_term_overallocation test: overallocation validation in payment entry	2023-07-22 10:41:01 +05:30
ruthra kumar	93246043ec	chore(test): enable multi-currency party for testing	2023-07-22 10:01:59 +05:30
ruthra kumar	8f9ef4ef5b	chore: validation on multi-currency tran on company curtency account	2023-07-22 09:20:55 +05:30
ruthra kumar	5b37919574	chore: use flt for currency	2023-07-22 09:20:55 +05:30
ruthra kumar	6b4a81ee48	chore: test more scenarios	2023-07-22 09:20:44 +05:30
DaizyModi	653117c2a9	test: fix test case for itemised tax breakup	2023-07-21 17:56:33 +05:30
DaizyModi	b84deec601	fix: Correct Tax Breakup for different tax rates for same hsn code	2023-07-21 17:43:27 +05:30
Ritvik Sardana	7069e2a5a0	fix: removed validate_item_code function in sales_invoice	2023-07-21 17:18:35 +05:30
Deepesh Garg	cc36af57bd	Merge pull request #36229 from deepeshgarg007/naming_in_order fix: FY in naming series variable for orders	2023-07-21 16:05:31 +05:30
Deepesh Garg	7a7d32db81	fix: FY in naming series variable for orders	2023-07-21 16:03:17 +05:30
Gursheen Anand	ec80dc6f09	fix: make column names more general	2023-07-21 15:55:31 +05:30
Gursheen Anand	1c5c310f5a	fix: fetch acc dimension fieldname	2023-07-21 13:37:48 +05:30
Gursheen Anand	59a2a04fcc	fix: check gl entry status using is_cancelled	2023-07-21 13:22:01 +05:30
Gursheen Anand	1c033ce635	chore: change column format for report	2023-07-21 11:00:19 +05:30
Gursheen Anand	33f8f7d7b3	fix: exclude cancelled gl entries for opening balance	2023-07-21 10:57:55 +05:30
marination	17ff395f9a	fix: Reverse GL entries only for submitted Dunnings	2023-07-20 20:54:43 +05:30
Deepesh Garg	de189c5f18	Merge pull request #35950 from FHenry/dev_feat_adress_contact_report feat: add Lead to Address And Contact report	2023-07-20 20:26:38 +05:30
marination	aeae8d646a	fix: Patch dunnings made after accounts were frozen - Consider "Accounts Frozen Until" and Period Closing Voucher	2023-07-20 19:55:57 +05:30
Deepesh Garg	76db0b63ba	Merge pull request #36214 from deepeshgarg007/tb_cancelled_entries fix: Trial Balance report considering cancelled entries	2023-07-20 18:48:03 +05:30
Gursheen Anand	5d7dd9b0ec	fix: project route permissions for user	2023-07-20 18:20:53 +05:30
rohitwaghchaure	1084f0d97f	Merge pull request #36209 from mohsinalimat/patch-2 fix: Ambiguous column error while submitting stock entry	2023-07-20 18:03:27 +05:30
rohitwaghchaure	9a9939cfb3	Merge pull request #36208 from rohitwaghchaure/fixed-filter-mandatory-for-batch-wise-balance-report fix: made item or warehouse filter mandatory	2023-07-20 18:02:37 +05:30
Deepesh Garg	fd58bbff6b	fix: Trial Balance report considering cancelled entries	2023-07-20 17:51:54 +05:30
MohsinAli	c21fd45883	fix: Ambiguous column error while submitting stock entry Stock Entry Type=Manufacture request.js:457 Traceback (most recent call last): File "apps/frappe/frappe/app.py", line 94, in application response = frappe.api.handle() File "apps/frappe/frappe/api.py", line 54, in handle return frappe.handler.handle() File "apps/frappe/frappe/handler.py", line 47, in handle data = execute_cmd(cmd) File "apps/frappe/frappe/handler.py", line 85, in execute_cmd return frappe.call(method, *frappe.form_dict) File "apps/frappe/frappe/__init__.py", line 1610, in call return fn(args, *newargs) File "apps/frappe/frappe/desk/form/save.py", line 28, in savedocs doc.save() File "apps/frappe/frappe/model/document.py", line 305, in save return self._save(args, *kwargs) File "apps/frappe/frappe/model/document.py", line 327, in _save return self.insert() File "apps/frappe/frappe/model/document.py", line 259, in insert self.run_before_save_methods() File "apps/frappe/frappe/model/document.py", line 1045, in run_before_save_methods self.run_method("validate") File "apps/frappe/frappe/model/document.py", line 914, in run_method out = Document.hook(fn)(self, args, *kwargs) File "apps/frappe/frappe/model/document.py", line 1264, in composer return composed(self, method, args, *kwargs) File "apps/frappe/frappe/model/document.py", line 1246, in runner add_to_return_value(self, fn(self, args, *kwargs)) File "apps/frappe/frappe/model/document.py", line 911, in fn return method_object(args, **kwargs) File "apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py", line 122, in validate self.validate_qty() File "apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py", line 433, in validate_qty transferred_materials = frappe.db.sql( File "apps/frappe/frappe/database/database.py", line 220, in sql self._cursor.execute(query, values) File "env/lib/python3.10/site-packages/pymysql/cursors.py", line 158, in execute result = self._query(query) File "env/lib/python3.10/site-packages/pymysql/cursors.py", line 325, in _query conn.query(q) File "env/lib/python3.10/site-packages/pymysql/connections.py", line 549, in query self._affected_rows = self._read_query_result(unbuffered=unbuffered) File "env/lib/python3.10/site-packages/pymysql/connections.py", line 779, in _read_query_result result.read() File "env/lib/python3.10/site-packages/pymysql/connections.py", line 1157, in read first_packet = self.connection._read_packet() File "env/lib/python3.10/site-packages/pymysql/connections.py", line 729, in _read_packet packet.raise_for_error() File "env/lib/python3.10/site-packages/pymysql/protocol.py", line 221, in raise_for_error err.raise_mysql_exception(self._data) File "env/lib/python3.10/site-packages/pymysql/err.py", line 143, in raise_mysql_exception raise errorclass(errno, errval) pymysql.err.OperationalError: (1052, "Column 'qty' in field list is ambiguous")	2023-07-20 13:51:17 +05:30
Gursheen Anand	610ead22e8	fix: show only projects with access in customer portal	2023-07-20 13:08:26 +05:30
Rohit Waghchaure	16498627ce	fix: made item or warehouse filter mandatory	2023-07-20 13:00:05 +05:30
Deepesh Garg	3bc79eebe3	Merge pull request #35689 from marination/payments-based-dunning feat: Payments based dunning	2023-07-20 12:06:36 +05:30
ruthra kumar	e7e3853f81	test: overallocation validation in payment entry	2023-07-20 09:08:55 +05:30
HarryPaulo	4b4d828260	fix: inserting of items with pricing rule with qty range	2023-07-19 13:02:55 -03:00
Gursheen Anand	3f5afb9cac	fix: reset dimension defaults when company changedin test	2023-07-19 18:15:59 +05:30
Gursheen Anand	23e56d3ec1	fix: clear dimension defaults after test	2023-07-19 16:07:32 +05:30

... 7 8 9 10 11 ...

36574 Commits