35520 Commits

Author	SHA1	Message	Date
Richard Case	d8e73b63f3	fix: remove non-maintained Tax Detail report and missing workspace links (#34192) ... * fix: remove non-maintained Tax Detail report and missing workspace links * patch: delete report "Tax Detail" --------- Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com> Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>	2023-03-21 16:23:27 +05:30
Raffael Meyer	79911734e9	fix: translations and UX in alternative item mapping (#34433) ... * fix: disable deletion in alternative item mapping * feat: german translations * fix: make string translatable --------- Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com> Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>	2023-03-21 16:20:11 +05:30
Raffael Meyer	0df3a1a3af	fix: remove unused translation (#34519)	2023-03-21 16:18:45 +05:30
Shram Kadia	08fc686513	fix: default pos conversion factor set to 1 (#34437)	2023-03-21 15:51:18 +05:30
Raffael Meyer	59c2e7ec3e	fix: german translations (#34312) ... fix: some german translations	2023-03-21 15:48:27 +05:30
Vishal Dhayagude	6966fa4d88	fix: POS not picking up pos profile company address instead fetch any random company address (#34521)	2023-03-21 15:43:57 +05:30
Deepesh Garg	ee6c107d58	fix(client): Amount calculation for 0 qty debit notes (#34455) ... fix(client): Amount calculaton for 0 qty debit notes Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>	2023-03-21 15:38:39 +05:30
ruthra kumar	2d19cee713	Merge pull request #34501 from ruthra-kumar/incorrect_currency_symbol_for_bank_accounts_in_reconciliation_tool ... refactor(bank reconciliation tool): currency symbol fix and concurrent usage	2023-03-21 15:30:50 +05:30
Rohit Waghchaure	aaa4d1eb55	fix: E-commerce issue with Item Variants	2023-03-21 14:44:12 +05:30
s-aga-r	f858f657a0	feat: add Stock Reservation Entry ref in SO connections	2023-03-21 13:28:31 +05:30
s-aga-r	50de868285	chore: add Stock Reserved Qty field in SO Item	2023-03-21 13:17:58 +05:30
Marica	c5da7f5fb1	Merge branch 'develop' into early-payment-loss	2023-03-21 11:40:30 +05:30
s-aga-r	0700063379	chore: add Reserve Stock check field in Sales Order	2023-03-20 23:55:33 +05:30
s-aga-r	1b7fb6d7e7	chore: make Stock UOM required in SRE	2023-03-20 22:41:22 +05:30
s-aga-r	4848a054a8	chore: make Submitted default status for Stock Reservation Entry	2023-03-20 22:40:06 +05:30
s-aga-r	2946de40d8	fix: make Project and Is Cancelled field read-only in SRE	2023-03-20 21:18:37 +05:30
s-aga-r	0d1332942c	feat: add Status and Delivered Qty fields in Stock Reservation Entry	2023-03-20 19:01:37 +05:30
Ankush Menat	109a9f1390	perf: index against_sales_invoice field on DN items (#34509) ... This is used on Sales invoice dashboard and takes a lot of time to load as db size increases. Results: Before: ~10-20 seconds to load dashboard After: few milliseconds because of index [skip ci]	2023-03-20 14:46:26 +05:30
s-aga-r	da1455198e	chore: field validation for Stock Reservation Entry	2023-03-20 13:42:11 +05:30
s-aga-r	7eb2075265	feat: add settings for Stock Reservation in Stock Settings	2023-03-20 11:45:35 +05:30
s-aga-r	085d9ce004	feat: add DocType Stock Reservation Entry	2023-03-20 11:20:30 +05:30
Sagar Sharma	4c35a37eaa	Merge branch 'develop' into FIX-ISS-22-23-05936	2023-03-20 10:28:10 +05:30
Deepesh Garg	44053db010	chore: Remove unnecessary list comprehension	2023-03-19 19:46:01 +05:30
Deepesh Garg	fc86a8568f	fix: Supplier RFQ email link (#34338)	2023-03-19 18:09:18 +05:30
Raffael Meyer	d791dc11a3	fix: patch depends on Currency Exchange Settings (#34494)	2023-03-19 18:05:12 +05:30
ruthra kumar	1eea585d29	refactor: allow for concurrent use of reconciliation tool ... 1. set default filter dates a period of one month from current date	2023-03-19 14:20:03 +05:30
ruthra kumar	2d14d92b32	fix: incorrect currency symbol in Bank Reconciliation tool	2023-03-19 12:47:29 +05:30
Deepesh Garg	0aadb680eb	chore: Add missing validations	2023-03-19 12:46:42 +05:30
Deepesh Garg	00fe3042b2	chore: Simplify query	2023-03-18 20:05:43 +05:30
Deepesh Garg	7f11373b58	fix: Account sub query	2023-03-17 16:59:23 +05:30
Deepesh Garg	d11a64ddcb	Merge branch 'develop' of https://github.com/frappe/erpnext into opening_entry	2023-03-17 16:50:49 +05:30
Sagar Sharma	a07a5572ea	Merge branch 'develop' into FIX-ISS-22-23-05936	2023-03-17 16:18:54 +05:30
Danny	ca10e2bb9f	fix: bad strings format for command get-untraslated (#34361) ... * fix: bad string foramt * fix: bad string format * fix: pre-commit format --------- Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>	2023-03-17 16:13:32 +05:30
Sagar Sharma	f2c78163bf	Merge branch 'develop' into FIX-34354	2023-03-17 15:58:46 +05:30
Deepesh Garg	d8ece86463	fix: Update account number from parent company (#34474)	2023-03-17 15:55:11 +05:30
Deepesh Garg	7b630217bd	fix: Multiple accounting dimension filtering in AR/AP reports (#34464) ... Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>	2023-03-17 15:51:33 +05:30
Deepesh Garg	be723bb9d4	chore: Update user manual link (#34478)	2023-03-17 15:39:33 +05:30
ruthra kumar	6b0dc62681	Merge pull request #34456 from ruthra-kumar/gp_return_invoice_issue ... fix: Gross Profit reports Invoices with -ve qty for Invoices with Cr Notes	2023-03-17 15:26:41 +05:30
Sagar Sharma	0753aa5ab7	Merge branch 'develop' into FIX-34354	2023-03-17 15:16:41 +05:30
Sagar Sharma	3fb64cacfc	Merge branch 'develop' into FIX-ISS-22-23-05936	2023-03-17 15:03:44 +05:30
ruthra kumar	cc61daeec4	test: Gross Profit report output for Cr notes ... 2 New test cases added. 1. Standalone Cr notes will be reported as normal Invoices 2. Cr notes against an Invoice will not overallocate qty if there are multiple instances of same item	2023-03-17 14:48:57 +05:30
ruthra kumar	d0715a82eb	refactor: Ignore linked Cr Notes in Report output	2023-03-17 14:48:57 +05:30
ruthra kumar	e2f19c6a14	fix: Overallocation of 'qty' from Cr Notes to Parent Invoice ... Cr Notes 'qty' are overallocated to parent invoice, when there are mulitple instances of same item in Invoice.	2023-03-17 14:48:57 +05:30
ruthra kumar	ec075122b6	refactor: difference amt validation for same currency accounts	2023-03-17 14:14:17 +05:30
ruthra kumar	861387f164	test: difference amount should not be calculated for base currency	2023-03-17 14:14:17 +05:30
ruthra kumar	48fae0c1ce	fix: difference amount calculation for company currency accounts	2023-03-17 14:14:17 +05:30
Sagar Sharma	db1f2d6279	Merge branch 'develop' into FIX-ISS-22-23-05936	2023-03-17 13:54:13 +05:30
s-aga-r	b04a101c11	fix: incorrect Opening Value in Stock Balance report	2023-03-17 13:53:49 +05:30
rohitwaghchaure	558db13040	Merge branch 'develop' into fix-22-23-05686	2023-03-17 08:57:37 +05:30
Anand Baburajan	563ee92043	Merge branch 'develop' into FIX-34354	2023-03-16 18:22:13 +05:30
Anand Baburajan	b6b8392413	fix: refactor asset depr schedule and remove unnecessary depr method (#34434) ... * fix: remove depr method from depr schedule and refactor assetdeprsch * chore: use assetdeprsch's depr method, not deprschedule's * fix: use default 0 value for NDB and OAD * chore: fix rounded numbers * chore: correct rounding in test_website_item_price_for_logged_in_user	2023-03-16 18:18:47 +05:30
Sagar Sharma	357d4994e4	Merge branch 'develop' into fix-22-23-05686	2023-03-14 20:59:38 +05:30
Sagar Sharma	ea269c6a1c	Merge branch 'develop' into FIX-34354	2023-03-14 20:59:27 +05:30
Ankush Menat	f1752fcd7a	Merge pull request #34116 from prateekkaramchandani/develop ... fix: use max function to get default company address	2023-03-14 19:38:26 +05:30
Ankush Menat	e0042972c8	test: add test for primary address sorting	2023-03-14 18:50:19 +05:30
Ankush Menat	55489d0056	Merge branch 'develop' into prateekkaramchandani/develop	2023-03-14 18:39:06 +05:30
Sagar Sharma	e0b288fbf0	Merge branch 'develop' into FIX-34354	2023-03-14 18:19:38 +05:30
Sagar Sharma	258242f8d7	Merge branch 'develop' into FIX-ISS-22-23-05720	2023-03-14 18:17:48 +05:30
Ankush Menat	f95ad039e4	test: add timeout to all BOM related tests (#34446) ... * Revert "chore: remove failing test (#34444)" This reverts commit b89ecd482d. * test: add timeout to bom tests	2023-03-14 18:10:17 +05:30
Deepesh Garg	b89ecd482d	chore: remove failing test (#34444)	2023-03-14 15:53:03 +05:30
Johannes Obermeier	70c78d0d67	fix: incorrect EAN validation, EAN can be an EAN8, EAN12 or EAN13 code (#34250) ... Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>	2023-03-14 15:27:05 +05:30
s-aga-r	22ad9a1903	chore: Allow Zero Valuation Rate msg in SE	2023-03-14 14:33:03 +05:30
marination	d6d0163514	fix: Provision to apply early payment discount if payment is recorded late ... - Party could have paid on time but payment is recorded late - Prompt for reference date so that discount is applied while mapping - Prompt only if discount in payment schedule of valid doctypes - test: Reference date and impact on PE - `make_payment_entry` (JS) must be able to access `this`	2023-03-14 14:22:39 +05:30
Sagar Sharma	0dbf4557db	Merge branch 'develop' into FIX-ISS-22-23-05720	2023-03-14 13:19:58 +05:30
Sagar Sharma	185a8910d2	Merge branch 'develop' into fix-22-23-05686	2023-03-14 13:19:46 +05:30
Sagar Sharma	6c88fb7a8d	Merge branch 'develop' into fix-22-23-05686	2023-03-14 11:44:39 +05:30
Sagar Sharma	48a88b7064	Merge branch 'develop' into FIX-ISS-22-23-05720	2023-03-14 11:44:33 +05:30
Anand Baburajan	72e9c05f46	Merge branch 'develop' into patch_assdeprsch_gpa_ndb	2023-03-13 21:31:57 +05:30
Deepesh Garg	c6999fc687	fix: Total row in trail balance report (#34395) ... * fix: Total row in trail balance report * fix: Calculate total after preparing opening and closing	2023-03-13 21:18:30 +05:30
Deepesh Garg	91f7b0bbd6	Merge branch 'develop' of https://github.com/frappe/erpnext into opening_entry	2023-03-13 20:52:48 +05:30
Deepesh Garg	76775a3e49	fix: Update patch	2023-03-13 20:51:35 +05:30
Deepesh Garg	492e994c22	Merge branch 'develop' into patch_assdeprsch_gpa_ndb	2023-03-13 19:37:55 +05:30
Deepesh Garg	fa776d2987	fix: Use customer name instead of name(id) in PSOA (#34412)	2023-03-13 19:37:09 +05:30
Deepesh Garg	d8e54a21fb	test: Update values in Sales Invoice tests (#34419)	2023-03-13 19:34:15 +05:30
Sagar Vora	5c06620f97	fix: set tax category from address before executing get_regional_address_details (#34372)	2023-03-13 19:32:50 +05:30
HENRY Florian	d267111e13	chore: fix french translation (#34381) ... chore: update french translation	2023-03-13 19:03:16 +05:30
Ernesto Ruiz	796ad01b87	fix: Add translate function to Delayed Tasks Summary Report (#34411) ... fix: Add translate function to Delayed Tasks Summary Report	2023-03-13 19:02:34 +05:30
Deepesh Garg	c8cc3fc65f	chore: Move source and campaign to additional info section (#34414)	2023-03-13 18:37:19 +05:30
Deepesh Garg	4416ddc4af	fix: Linked invoice cancellation issue via timesheet (#34337)	2023-03-13 18:36:43 +05:30
Sagar Sharma	4a05f3736f	Merge branch 'develop' into FIX-ISS-22-23-05720	2023-03-13 17:50:09 +05:30
s-aga-r	66f650061d	test: add test cases for Over Order Allowance against Blanket Order	2023-03-13 17:21:07 +05:30
Sagar Sharma	9d49afebde	Merge branch 'develop' into fix-22-23-05686	2023-03-13 17:05:27 +05:30
Marica	e1d28063b0	Merge branch 'develop' into early-payment-loss	2023-03-13 16:23:24 +05:30
Anand Baburajan	b8703b0b9b	Merge branch 'develop' into patch_assdeprsch_gpa_ndb	2023-03-13 15:35:08 +05:30
Ankush Menat	b8a61be080	test: fix hypothesis tests (#34416)	2023-03-13 15:16:30 +05:30
Anand Baburajan	097be8bdea	Merge branch 'develop' into patch_assdeprsch_gpa_ndb	2023-03-13 15:08:08 +05:30
Sagar Sharma	f2e9a67f37	Merge branch 'develop' into FIX-ISS-22-23-05720	2023-03-13 14:32:26 +05:30
s-aga-r	442ee3adba	fix: operation time for multi-level BOM in WO	2023-03-13 14:31:38 +05:30
Ankush Menat	5bf6fb43a9	chore: fix broken TR translations	2023-03-13 14:12:12 +05:30
Deepesh Garg	7101e7acc4	fix: Filtering issue in payment entry (#34332)	2023-03-13 14:05:13 +05:30
marination	caa1a3dccf	fix: Handle rounding more gracefully ... - Round off pending discount loss to avoid miniscule losses rounded to 0.0 that are added in deductions - Use base amounts to calculate base losses instead of using conversion factor which increases rounding error - Round of total base loss instead of individual income and tax losses to reduce rounding error - Use default round off account for pending rounding loss in deductions	2023-03-13 14:01:31 +05:30
ruthra kumar	9f26e3c27a	Merge pull request #34408 from ruthra-kumar/delete_remarks_migration_patch ... chore: delete remarks migration patch	2023-03-13 09:14:21 +05:30
ruthra kumar	da37573b73	chore: delete remarks migration patch ... Versions higher than V14.18.2, 'remarks' will be moved in 'migrate_gl_to_payment_ledger'	2023-03-12 13:41:50 +05:30
ruthra kumar	e371bb6672	Merge pull request #34387 from ruthra-kumar/refactor_gl_migration_patch ... refactor(patch): remove inner join to improve SQL performance	2023-03-11 21:00:19 +05:30
Mehmet Demirel	fa6d37542b	chore: Improve Turkish language translation ... chore: Improve Turkish language translation	2023-03-11 19:18:44 +05:30
Deepesh Garg	aae53bb910	fix: Error in consolidated financial statement (#34330)	2023-03-11 19:06:56 +05:30
ruthra kumar	9d0a1149d8	chore: remove remarks migrations patch from patches.txt ... 'Remarks' field is moved in migrate_gl_to_payment_ledger patch itself from versions highers than v14.18.2. Removing it from patches.txt	2023-03-11 13:17:52 +05:30
ruthra kumar	a43304b01b	Merge branch 'develop' into fix_flaky_test_in_payment_terms_report	2023-03-11 13:05:38 +05:30
ruthra kumar	7fcd74ed03	fix(test): flaky test case in Payment terms report	2023-03-10 21:23:12 +05:30
ruthra kumar	1744f1d4e4	refactor: add remarks to column as well	2023-03-10 15:57:11 +05:30
Anand Baburajan	6308b509fc	Merge branch 'develop' into patch_assdeprsch_gpa_ndb	2023-03-10 15:25:39 +05:30
Deepesh Garg	0157fa15eb	chore: Use account closing balance in set gl entries	2023-03-10 13:02:01 +05:30
s-aga-r	9c1e566394	fix: filters not getting applied on Web Form	2023-03-09 22:12:35 +05:30
ruthra kumar	f9cfabf78e	refactor(patch): remove inner join to improve SQL performance	2023-03-09 19:42:28 +05:30
Marica	ae0a8a6529	Merge branch 'develop' into early-payment-loss	2023-03-09 18:36:36 +05:30
anandbaburajan	ebb6953274	fix: add missing patch for new fields added in #34214	2023-03-09 17:55:27 +05:30
marination	9abf0ef615	test: Multi currency SI with multi-currency accounting and single currency accounting + Early payment discount	2023-03-09 16:32:36 +05:30
marination	b09c2381ca	fix: Multi-currency SI with base currency PE ... - Return total discount loss in base currency - Allocate payment based on terms: Set allocated amount in references table in base currency if accounting is in that currency - Allocate payment based on terms: While back updating set paid amount (payment schedule) in transaction currency always - minor: discount msgprint in correct currency	2023-03-09 16:25:45 +05:30
Deepesh Garg	9a8f8e8b7d	Revert "fix: Default sales team not getting set" (#34376) ... Revert "fix: Default sales team not getting set (#34284)" This reverts commit 7d0199d743.	2023-03-09 15:36:52 +05:30
Sagar Sharma	87b5734f5b	Merge branch 'develop' into FIX-ITEM-ALTERNATIVE-ERR-MSG	2023-03-09 10:07:24 +05:30
s-aga-r	046834a97a	fix: required_qty get reset to 1 for Alternative Item in WO	2023-03-08 20:40:03 +05:30
s-aga-r	baef5ae1ef	chore: Alternative Item Code error msg	2023-03-08 20:07:30 +05:30
Deepesh Garg	719ac5c8f3	Merge branch 'develop' of https://github.com/frappe/erpnext into opening_entry	2023-03-08 18:35:26 +05:30
Deepesh Garg	f0267feca8	test: Add test case for closing balance	2023-03-08 18:34:07 +05:30
marination	761f68d7bf	fix: Paid amount must be discounted considering accounting currency ... - Accounting is in the same currency if party currency and company currency is the same - If accounting is in the same currency, paid and recvd amount is in the base currency - Then, discount amount must also be in the base currency as it is deducted from paid amount - Received amount must be in base currency if not multi currency - cleanup: Deductions setting broken into smaller functions	2023-03-08 17:20:48 +05:30
Deepesh Garg	3249a79f07	chore: rename Closing Balance to Account Closing Balance	2023-03-08 15:15:33 +05:30
s-aga-r	b53dcb04ed	test: add test cases for BOM Stock Report	2023-03-08 14:00:06 +05:30
s-aga-r	a65b80911b	fix: BOM Stock Report	2023-03-08 12:59:50 +05:30
Sagar Sharma	336e0b9666	Merge branch 'develop' into fix-22-23-05690	2023-03-07 18:02:52 +05:30
Solufyin	71de72bdd0	fix: Set contact filter link in Opportunity (#34325) ... Co-authored-by: Nihantra C. Patel <n.patel.serpentcs@gmail.com>	2023-03-07 17:44:31 +05:30
Devin Slauenwhite	6de826b8c4	fix: exchange rate revaluation errors (#33947) ... * fix: set new balance for non-positive balances * fix: don't add debit: 0, credit: 0 entries to journal entry. * fix: add journal entry difference to unbooked gain/loss of exchange. * chore: linter * chore: remove invlaid TODO. [skip-ci]	2023-03-07 17:16:15 +05:30
Sagar Sharma	4d1f620d75	Merge branch 'develop' into fix-22-23-05690	2023-03-07 16:35:17 +05:30
Marica	2feb27e399	fix(minor): Dirty the form after clicking on Get advances button in Invoices (#34323) ... fix(minor): Dirty form after clicking on Get advances button	2023-03-07 15:45:18 +05:30
Sagar Sharma	4cd16a839b	Merge branch 'develop' into fix-22-23-05690	2023-03-07 14:55:46 +05:30
marination	f02fc8acf0	fix: Don't add to deductions if amount is 0 ... - misc: better docstring	2023-03-07 12:12:45 +05:30
Deepesh Garg	10632d75b0	fix: Do not calculate commission post submit (#34267) ... * fix: Do not calculate commision post submit * chore: Update condition to match server side logic Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com> --------- Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>	2023-03-07 11:44:09 +05:30
Deepesh Garg	7d0199d743	fix: Default sales team not getting set (#34284)	2023-03-07 11:41:26 +05:30
Deepesh Garg	ea8e23384d	fix: Payment Request against sales order with disabled rounded total (#34281) ... * fix: Payment Request against sales order with disabled rounded total * chore: Do not consider advance amount	2023-03-07 11:40:29 +05:30
Sagar Sharma	3952b3373d	Merge branch 'develop' into fix-22-23-05690	2023-03-07 10:50:39 +05:30
s-aga-r	8ad9e99cea	perf: update_completed_qty() in material_request.py	2023-03-07 10:50:11 +05:30
Raffael Meyer	ee12313dbb	Merge branch 'develop' into early-payment-loss	2023-03-06 21:41:54 +01:00
s-aga-r	de18f98c5c	perf: Stock Entry (Material Transfer)	2023-03-06 23:41:04 +05:30
rohitwaghchaure	53efc8ff77	Merge pull request #34305 from rohitwaghchaure/fixed-not-able-to-complete-bom-update-log ... fix: BOM Update log not completed	2023-03-06 23:23:58 +05:30
marination	7f2e7badff	fix: Set deduction amount in company currency on Doctype ... - Even via JS, deductions amount is always in company currency - Since there is nothing dynamic about this field, set it in the doctype spec itself - fixed: Inconsistency between label currency and field currency formatted value	2023-03-06 17:45:26 +05:30
Deepesh Garg	5dabc98ba5	chore: Add index to period closing voucher column	2023-03-06 16:56:33 +05:30
Marica	b5f80815a1	Merge branch 'develop' into early-payment-loss	2023-03-06 15:50:50 +05:30
marination	c217bb2018	test: PE from SI with early payment discount amount & PE assertions in discount % test	2023-03-06 15:02:32 +05:30
marination	2ae5834290	fix: Back update discounted amount in Invoice based on discount type ... - Discount value was always trated as a percentage on back updation	2023-03-06 14:54:46 +05:30
Rohit Waghchaure	2f157fa5d3	fix: BOM Update log not completed	2023-03-06 12:09:50 +05:30
Deepesh Garg	310f71c313	test: Add static posting dates to tests	2023-03-05 18:43:26 +05:30
Deepesh Garg	4a2046dfb6	fix: Aggregation with previous closing balance	2023-03-05 18:18:33 +05:30
barredterra	502a37a864	refactor: use renamed timezone utils ... https://github.com/frappe/frappe/pull/20253	2023-03-04 19:31:40 +01:00
s-aga-r	70de444b7b	fix: Stock Reconciliation actual_qty	2023-03-04 17:06:07 +05:30
s-aga-r	e6a02719f7	fix: update inventory dimensions before returning sle	2023-03-04 16:02:50 +05:30
s-aga-r	0e1b7760a8	fix: Inventory Dimension for Stock Reconciliation	2023-03-04 01:05:55 +05:30
s-aga-r	53701c37b1	feat: consider over_order_allowance while validating sales order qty	2023-03-03 22:03:54 +05:30
Devin Slauenwhite	6190b4cf63	chore: revert unrelated changes.	2023-03-03 09:42:29 -05:00
marination	dc2998f544	fix: Set deductions in base currency ... - Use field precision to get more accurate values	2023-03-03 17:24:43 +05:30
marination	75ec0a0a85	fix: Recalculate difference amount after setting deductions	2023-03-03 14:13:27 +05:30
Marica	619824855a	Merge branch 'develop' into early-payment-loss	2023-03-03 13:53:57 +05:30
marination	768c3a4927	fix: Taxes aren't discounted on early payment discount ... - Deductions in payment entry must be split into income loss and tax loss - Compute total discount in percentage, makes discounting different amounts proportionately easier	2023-03-03 13:21:38 +05:30
s-aga-r	d7da8928ac	feat: add field Over Order Allowance (%) in Selling Settings	2023-03-03 11:19:28 +05:30
s-aga-r	8bcbc45add	feat: consider over_order_allowance while validating order qty	2023-03-03 11:11:33 +05:30
s-aga-r	fc1088d9c4	fix: don't map item row having 0 qty	2023-03-03 10:50:17 +05:30
s-aga-r	f3993783a3	refactor: rewrite blanket_order.py queries in QB	2023-03-02 17:18:46 +05:30
s-aga-r	f5937f46cb	feat: add field Over Order Allowance (%) in Buying Settings	2023-03-02 17:04:09 +05:30
Deepesh Garg	c3d455653e	Merge pull request #34258 from deepeshgarg007/finance_book_read_only ... chore: Make finance book read only	2023-03-02 16:47:47 +05:30
Deepesh Garg	c089c4156c	chore: Minor fixes	2023-03-02 16:46:56 +05:30
s-aga-r	abf9a28d6a	fix: hide + button based on Blanket Order Type	2023-03-02 16:40:37 +05:30
Sagar Sharma	90e1a6bc16	Merge branch 'develop' into github-issue-33344	2023-03-02 14:24:14 +05:30
Sagar Sharma	6e9d001819	Merge branch 'develop' into github-issue-33344	2023-03-02 12:09:21 +05:30
Sagar Sharma	50dc0c18eb	Merge branch 'develop' into fix-return-pr-serial-no	2023-03-02 12:06:59 +05:30
Ankush Menat	330ae419be	fix!: Parse float as per number format in quality inspection (#34259) ... fix: Parse float as per number format in quality inspection	2023-03-02 11:59:18 +05:30
s-aga-r	cb0b6de4b9	fix: Serial No is mandatory even if the qty is 0	2023-03-02 11:27:46 +05:30
s-aga-r	a9f0a11ce6	fix: rejected_serial_no not getting copied from PR to PR(Return)	2023-03-02 11:15:46 +05:30
Deepesh Garg	790f0aac12	Merge branch 'develop' into finance_book_read_only	2023-03-02 10:01:12 +05:30
Deepesh Garg	6a89cb98ce	Merge pull request #33874 from frappe/alternative-items-quotation ... feat: Support for Alternative Items in Quotation	2023-03-01 17:41:24 +05:30
Suraj Shetty	6cd2ba5c66	fix: Resolve conflicts ... (cherry picked from commit f6469d83981386a7bb57b41178055eae5cda30bf)	2023-03-01 10:59:21 +00:00
Suraj Shetty	46a722d51c	fix: Wrap unexpectedly long text in remark ... (cherry picked from commit ba66a6714c495f9d70dad79344342779c8011c6e) # Conflicts: # erpnext/accounts/report/general_ledger/general_ledger.html (cherry picked from commit b13bf1ebc517ccd9c5b6b079208ca3883e7418fd)	2023-03-01 10:59:20 +00:00
Deepesh Garg	28dd1a25cb	chore: Make finance book read only	2023-03-01 15:00:24 +05:30
Deepesh Garg	e5f603c9d9	perf: Apply closing balance in Trial Balance report	2023-03-01 14:48:06 +05:30
Deepesh Garg	95c9aafda9	fix: Update patch to generate closing balance entries	2023-03-01 14:45:22 +05:30
Deepesh Garg	436fc03eda	fix: Closing balance entries for period closing voucher	2023-03-01 14:43:49 +05:30
Rohit Waghchaure	b38fe24090	fix: consumed qty validation for subcontracting receipt	2023-03-01 11:42:59 +05:30
rohitwaghchaure	d88fe27be6	Merge pull request #34195 from HarryPaulo/fix-performance-on-insert-item ... fix: Performance improvement when adding a new item	2023-03-01 10:10:14 +05:30
ruthra kumar	f9c75055bb	Merge pull request #34241 from ruthra-kumar/bug_on_credit_note_creation ... fix: pos return throwing amount greater than grand total	2023-02-28 18:22:30 +05:30
rohitwaghchaure	9bb8e351a2	Merge pull request #34243 from rohitwaghchaure/fixed-date-filters-in-subcontracting-reports ... fix: default date in Subcontracting reports	2023-02-28 18:01:14 +05:30
Rohit Waghchaure	dfddc4efc3	fix: default date in Subcontracting reports	2023-02-28 17:53:51 +05:30
rohitwaghchaure	2942cee31e	Merge pull request #34235 from rohitwaghchaure/feat-adjust-valuation-rate ... feat: adjust purchase receipt valuation rate as per purchase invoice rate	2023-02-28 17:34:53 +05:30
ruthra kumar	35c70f39fa	fix: pos return throwing amount greater than grand total	2023-02-28 16:21:32 +05:30
Rohit Waghchaure	a8445da02a	fix: labels name	2023-02-28 15:47:45 +05:30
s-aga-r	58c027d4cc	chore: Linters	2023-02-28 15:14:34 +05:30
Sagar Sharma	26ced47ddc	Merge branch 'develop' into github-issue-33344	2023-02-28 15:01:40 +05:30
Rohit Waghchaure	8e86553717	test: added test cases	2023-02-28 14:57:04 +05:30
Rohit Waghchaure	eab775ef32	feat: adjust purchase receipt valuation rate as per purchase invoice rate	2023-02-28 14:11:55 +05:30
Vishal	f18ae5856f	chore: minor changes in pos_controller	2023-02-28 11:03:26 +05:30
Vishal	a51bec0269	chore: minor change	2023-02-28 11:03:26 +05:30
Vishal	3ebe7d861d	chore: minor changes added to code	2023-02-28 11:03:26 +05:30
Vishal	1de531e56e	fix: multiple pos conversion issue resolved	2023-02-28 11:03:25 +05:30
Sagar Sharma	ecd15d2a65	Merge branch 'develop' into github-issue-33344	2023-02-27 16:57:29 +05:30
s-aga-r	c09a61f360	fix: set from_warehouse and to_warehouse while mapping SE	2023-02-27 12:26:21 +05:30
Sagar Sharma	bda1340760	Merge branch 'develop' into patch-2	2023-02-27 11:52:31 +05:30
Patrick Eissler	bbb6a62a7d	chore: add german translations (#34167) ... * chore: add german translations * Apply suggestions from code review Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com> --------- Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>	2023-02-27 11:49:22 +05:30
Deepesh Garg	81651beaef	Merge pull request #34174 from Vishnu7025/coa-import-currency ... fix: currency in coa import	2023-02-27 11:48:44 +05:30
Sagar Sharma	5dcb723fc7	Merge branch 'develop' into patch-2	2023-02-27 11:14:14 +05:30
Brian Pond	83f3e317e1	fix: Remove missing DocField in fetch_from	2023-02-27 11:10:51 +05:30
ruthra kumar	d8b9b83b11	Merge pull request #34207 from ruthra-kumar/fix_permisssion_error_on_work_order_creation ... fix: permission error while calling get_work_order_items	2023-02-27 09:55:18 +05:30
Anand Baburajan	feeebb1262	Merge branch 'develop' into manual_asset_schedule_develop	2023-02-26 17:40:26 +05:30
anandbaburajan	dd74839eba	fix: manual depr schedule	2023-02-26 17:36:36 +05:30
Deepesh Garg	a663df376c	fix: Add patch to update closing balances	2023-02-26 16:06:04 +05:30
Deepesh Garg	6607c8bd82	fix: Order by issue in aggregation query	2023-02-26 16:05:26 +05:30
Deepesh Garg	f92c63fb10	feat: Add validations against period closing voucher	2023-02-26 15:53:33 +05:30
Deepesh Garg	7fa7d6b5e4	chore: Rewrite query using query builder	2023-02-26 15:52:30 +05:30
Deepesh Garg	e18336ebe7	feat: Add views in standard filter	2023-02-26 15:47:29 +05:30
rohitwaghchaure	6d6e3cb015	Merge pull request #34206 from rohitwaghchaure/fixed-trivial-error-for-stock-reposting ... fix: not able to repost gl entries	2023-02-24 21:10:27 +05:30
ruthra kumar	a11d3327df	fix(test): use standalone method to fetch work orders from SO	2023-02-24 21:07:49 +05:30
ruthra kumar	b6bad728cd	fix: permission error while calling get_work_order_items	2023-02-24 21:07:46 +05:30
Rohit Waghchaure	7d10dd9ea8	fix: not able to repost gl entries	2023-02-24 17:50:00 +05:30
Deepesh Garg	e26c6dc76b	Revert "fix: Concurrency issues in Sales and Purchase returns" (#34202) ... Revert "fix: Concurrency issues in Sales and Purchase returns (#34019)" This reverts commit a67284e96d.	2023-02-24 15:28:14 +05:30
rohitwaghchaure	04f00fd141	Merge pull request #34199 from rohitwaghchaure/fixed-converison-factor-issue ... fix: conversion factor not set	2023-02-24 14:56:36 +05:30
Rohit Waghchaure	8e46aebc50	fix: conversion factor not set	2023-02-24 14:49:05 +05:30
HarryPaulo	49af5ba434	fix: Performance improvement when adding a new item	2023-02-23 18:11:09 -03:00
rohitwaghchaure	670304fe8e	Merge pull request #34189 from rohitwaghchaure/prevent-to-make-item-price-for-template ... fix: user shouldn't able to make item price for item template	2023-02-23 20:47:48 +05:30
Rohit Waghchaure	6417ae0ee8	fix: user shouldn't able to make item price for item template	2023-02-23 20:21:50 +05:30
Deepesh Garg	c3f39c3f32	feat: Cascade closing balances on PCV submit	2023-02-23 16:48:54 +05:30
Deepesh Garg	36c08d0835	fix: Add patches to create accounting dimension in Closing Balance	2023-02-23 16:46:37 +05:30
Marica	47ab26dedf	Merge branch 'develop' into alternative-items-quotation	2023-02-23 13:20:28 +05:30
ruthra kumar	a9920715ab	Merge pull request #34022 from ruthra-kumar/gross_profit_memory_and_performance_issue ... perf: Gross Profit report will fetch SLE's on demand and memoize	2023-02-23 11:55:08 +05:30
ruthra kumar	88d888d9d0	refactor: use docstatus from Delivery Note Item	2023-02-23 11:15:56 +05:30
rohitwaghchaure	3692f960d0	Merge pull request #34172 from rohitwaghchaure/zero-rate-adjust-issue-using-lcv ... fix: zero division error while making LCV	2023-02-23 10:54:01 +05:30
ruthra kumar	60d3b86cdb	Merge pull request #34176 from ruthra-kumar/fix_ui_freeze_on_sales_invoice ... fix: ui freeze on item selection in sales invoice	2023-02-23 10:35:50 +05:30
rohitwaghchaure	e3de216e06	Merge pull request #34173 from rohitwaghchaure/incorrect-color-showing-in-report ... fix: incorrect color in the BOM Stock Report	2023-02-23 09:54:45 +05:30
ruthra kumar	6412583e98	fix: ui freeze on item selection in sales invoice	2023-02-23 09:36:21 +05:30
vishnu	e3c000d0be	chore: change column label	2023-02-22 10:53:11 +00:00
vishnu	19c0b7a523	fix: currency in coa import	2023-02-22 10:24:45 +00:00
Rohit Waghchaure	a8f03ebf7f	fix: incorrect color in the BOM Stock Report	2023-02-22 14:24:18 +05:30
Rohit Waghchaure	80e94a08cf	fix: zero division error while making LCV	2023-02-22 13:29:06 +05:30
Deepesh Garg	b44a19bd1a	feat: Introduce opening entry for reporting	2023-02-21 23:20:28 +05:30
Sankara Subramanian V	a06d24037b	refactor(region): Splitting of KSA(Saudi Arabia) Regional logic from ERPNext (#33895) ... * feat: remove KSA regional code	2023-02-21 22:52:20 +05:30
ruthra kumar	dde5bbc9a7	Merge pull request #34102 from ruthra-kumar/pos_validate_for_duplicate_pos_invoices ... fix: check for duplicate pos invoices in closing entry	2023-02-21 18:45:39 +05:30
ruthra kumar	47add0b751	fix: check for duplicate in pos closing and pos merge log entry	2023-02-21 17:50:57 +05:30
Deepesh Garg	9739d8b52a	feat: Introduce opening entry for reporting	2023-02-21 15:23:29 +05:30
ruthra kumar	4a7b1de2d8	refactor: clear records in batches in 'Transaction Deletion Record' (#34109) ... refactor: clear records in batches	2023-02-21 14:27:00 +05:30
Deepesh Garg	c88444a6c4	fix: Filters in item-wise sales history report (#34145)	2023-02-21 14:26:33 +05:30
anandbaburajan	76861eb332	fix: fiscal year error for existing assets in fixed asset register	2023-02-21 13:04:01 +05:30
Deepesh Garg	35cdd996a9	fix: Use normal rounding for Tax Withholding Category (#34114)	2023-02-21 12:57:49 +05:30
Sagar Sharma	77b88961f6	Merge branch 'develop' into dn-create-button	2023-02-21 10:19:09 +05:30
marination	6b789e2f04	fix: Map only non alternative items from Quotation in Sales Invoice ... - Since there's no item selection, only Quotation selection :/	2023-02-20 21:17:43 +05:30
marination	19456127cf	fix: Handle Get Items From in Sales Order ... - Map all non alternatives from Quotation to SO if no selected items - Show disclaimer mentioning that Qtns with alternatives must be mapped to SO from the Qtn form	2023-02-20 20:52:14 +05:30
Ankush Menat	3f2a2c96f6	fix: Add company perm check unconditionally (#34142) ... fix: Add employee perm check unconditionally	2023-02-20 16:07:27 +05:30
rohitwaghchaure	5e9620b98b	Merge pull request #34139 from rohitwaghchaure/fixed-stock-ledger-report-filter-issue ... fix: inventory dimension filter not overriding with existing filter for stock ledger report	2023-02-20 13:04:23 +05:30
rohitwaghchaure	3871cf7110	Merge pull request #33722 from rohitwaghchaure/purchase-invoice-performance-issue ... fix: purchase invoice performance issue	2023-02-20 12:47:07 +05:30
Rohit Waghchaure	0e388ba872	fix: inventory dimension filter not overriding with existing filter for stock ledger report	2023-02-20 12:28:43 +05:30
Marica	3c96791d52	fix: Use block variable ... Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>	2023-02-20 12:04:14 +05:30
s-aga-r	44ee9f0f19	chore: Linters	2023-02-20 11:43:32 +05:30
s-aga-r	1b010add26	fix(ux): ReferenceError: me is not defined Delivery Note	2023-02-20 11:17:49 +05:30
Sagar Sharma	c8fda8a8b5	Merge branch 'develop' into github-issue-33344	2023-02-19 22:17:20 +05:30
Alirio Castro	183e42af1a	fix: differency entry journal debit/credit missing (#34104) ... * fix: difference entry journal is wrong * fix: difference entry journal is wrong	2023-02-19 19:40:13 +05:30
Johannes Obermeier	2a90fad710	feat(stock): Support more barcodes in an item by validate the barcode with the barcodenumber module (#33863) ... feat(stock): Support more barcodes in an article by validate the barcode with the barcodenumber module	2023-02-19 19:36:05 +05:30
Sagar Sharma	2959285c82	Merge branch 'develop' into fix-reserve-qty	2023-02-19 12:45:39 +05:30
Sagar Sharma	f342e6e765	Merge branch 'develop' into github-issue-33344	2023-02-19 12:17:33 +05:30
ruthra kumar	c722f2819c	fix: ignore repost payment ledger on basic documents cancellation (#34054) ... fix: ignore repost payment ledger on cancel/delete of Inv/Pay/JE's Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>	2023-02-19 12:09:10 +05:30
Sagar Sharma	2c3973156f	Merge branch 'develop' into github-issue-33344	2023-02-19 12:07:27 +05:30
Richard Case	5b7d23de15	feat: bank reconciliation and plaid changes (#33986) ... fix: plaid link refresh: update account ids fix: plaid transactions for credit cards & add accounts on link refresh if they don't exist fix: bank reconciliation amount matching fix: bank reconciliation dialog usability feat: rewrite bank transaction reconciliation to allow multiple transactions to reconcile against vouchers before clearance fix: matching transaction amounts and race condition bug fix: ensure there is a reference number in plaid transactions and other tweaks feat: add references to Payroll Entry Bank Journal Entry feat: only clear Voucher once all Bank GLEs are allocated to Bank Transactions fix: strange type error feat: add payment method field to bank and plaid transactions and prepopulate relevant bank reconciliation new voucher fields feat: bank reconciliation - allow bank transactions to reconcile against themselves for when there are banking amendments fix: bank transaction self-reconcile bug and tidy fix: bank reconciliation datatable index update	2023-02-19 11:50:17 +05:30
Shadrak Gurupnor	5e48e61c66	fix: forced delete linked desktop_icons (#34107) ... * fix: forced delete linked desktop_icons * fix: black	2023-02-19 11:42:35 +05:30
ruthra kumar	9c6466f15b	fix: consider rounded total amount while making payment request (#34110)	2023-02-19 11:41:41 +05:30
Devin Slauenwhite	c76352340d	fix(ux): customer/supplier docfield layout (#34125)	2023-02-19 11:37:32 +05:30
Sagar Sharma	07c6ad6fa7	Merge branch 'develop' into github-issue-33344	2023-02-18 22:24:06 +05:30
s-aga-r	35489fbbf9	refactor: remove method get_serial_no_batchwise from get_item_details.py	2023-02-18 22:23:53 +05:30
s-aga-r	6b144baa69	refactor: rewrite get_item_details.py queries in QB	2023-02-18 22:23:51 +05:30
rohitwaghchaure	dff9655d46	Merge pull request #34115 from rohitwaghchaure/fixed-convert-to-item-warehouse-reposting ... feat: provision to convert transaction based reposting to item wareho…	2023-02-18 21:31:20 +05:30
Rohit Waghchaure	f1383b5ef9	feat: provision to convert transaction based reposting to item warehouse based reposting	2023-02-18 19:31:48 +05:30
Sagar Sharma	91983fb4c6	Merge branch 'develop' into purchase-order-portal	2023-02-17 23:17:00 +05:30
Prateek	b93c18bd4a	fix: use max function to get default company address	2023-02-17 20:25:13 +05:30
rohitwaghchaure	47264481ad	Merge branch 'develop' into purchase-invoice-performance-issue	2023-02-17 16:41:30 +05:30
anandbaburajan	e50bd52162	fix: asset repair status after deletion and asset status after manual depr entry	2023-02-17 15:32:24 +05:30
Sagar Sharma	ee21850ab8	Merge branch 'develop' into purchase-order-portal	2023-02-17 11:08:30 +05:30
ruthra kumar	067f8c1d70	Merge pull request #34071 from ruthra-kumar/rearrange_patch_order ... patch: reorder migration patches	2023-02-17 11:04:36 +05:30
ruthra kumar	68202639f5	chore: reorder migration patches. ... 'migrate_gl_to_payment_ledger', 'migrate_remarks_from_gl_to_payment_ledger' should always run last.	2023-02-17 10:03:55 +05:30
rohitwaghchaure	4399a93843	Merge pull request #34091 from rohitwaghchaure/fixed-incorrect-consumed-qty-in-scr ... fix: incorrect consumed qty in subcontracting receipt	2023-02-16 15:10:14 +05:30
Sagar Sharma	758f47bba6	Merge branch 'develop' into purchase-order-portal	2023-02-16 14:28:05 +05:30
Rohit Waghchaure	156e45970a	fix: incorrect consumed qty in subcontracting receipt	2023-02-16 14:17:27 +05:30
HENRY Florian	4d79ffe3c6	fix: rename duplicate field name with same type into a DocType to avoid import Error (#34053) ... * fix: Delivery Note field label set * fix: Item field label de-duplicate name * fix: Payment Entry field label de-duplicate name * fix: Pruicing Rule field label de-duplicate name * fix: Project field label de-duplicate name * fix: Timesheet field label de-duplicate name * Update erpnext/accounts/doctype/pricing_rule/pricing_rule.json Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com> * Update erpnext/stock/doctype/item/item.json Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com> --------- Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>	2023-02-16 13:46:19 +05:30
Sagar Sharma	fb5796f18f	Merge branch 'develop' into purchase-order-portal	2023-02-16 11:22:19 +05:30
Tej Pochiraju	3f44ef8790	Allow bulk import of party specific item (#34083) ... Co-authored-by: Tej Pochiraju <tej@iotready.co>	2023-02-16 10:11:25 +05:30
Sagar Sharma	471e77b931	Merge branch 'develop' into purchase-order-portal	2023-02-15 22:46:07 +05:30
Sagar Sharma	c7a540b7e2	Merge branch 'develop' into github-issue-33930	2023-02-15 22:37:52 +05:30
s-aga-r	6c6195bae6	fix: create Delivery Trip from Delivery Note list	2023-02-15 22:37:26 +05:30
Sagar Sharma	421e34a181	Merge branch 'develop' into purchase-order-portal	2023-02-15 21:49:09 +05:30
Sagar Sharma	46afbb594a	Merge branch 'develop' into fix-reserve-qty	2023-02-15 21:37:30 +05:30
s-aga-r	ffa9c6e4d9	chore: copy item_code to Batch while creating new batch from SCR	2023-02-15 20:16:42 +05:30
s-aga-r	20bdc63b03	fix: show Purchase Order Portal Pay button based on configuration	2023-02-15 20:14:39 +05:30
marination	74fab53e28	test: Alternative items in Quotation ... - Taxes and totals, mapping, back updation	2023-02-15 15:04:00 +05:30
s-aga-r	d7ef5ad955	chore: add field show_pay_button in Buying Settings	2023-02-15 14:43:10 +05:30
Marica	22010b745c	Merge branch 'develop' into alternative-items-quotation	2023-02-15 13:05:33 +05:30
Anand Baburajan	ef56060166	Merge branch 'develop' into more_asset_bug_fixes	2023-02-15 11:55:55 +05:30
rohitwaghchaure	2e43123048	Merge pull request #34065 from barredterra/print-rfq-letterhead ... fix: change parameter name for letter head	2023-02-15 09:31:06 +05:30
rohitwaghchaure	9235918d65	Merge pull request #34061 from rohitwaghchaure/feat-allow-to-make-in-transit-entry ... feat: allow to make in transit transfer entry from material request	2023-02-15 09:08:22 +05:30
barredterra	d5b7f2e49e	test: download RFQ PDF	2023-02-14 19:53:39 +01:00
barredterra	8e40c04494	refactor: download RFQ PDF	2023-02-14 19:53:03 +01:00
barredterra	f7fd30fecf	fix: change parameter name for letter head ... To match changes from https://github.com/frappe/frappe/pull/19627	2023-02-14 19:34:36 +01:00
Devin Slauenwhite	4c5147f270	Merge: upstream/develop into pps190/fix-reserve-qty	2023-02-14 10:22:54 -05:00
Rohit Waghchaure	5b6128848f	feat: allow to make in transit transfer entry from material request	2023-02-14 19:03:07 +05:30
Anand Baburajan	b0cfb0b9ef	Merge branch 'develop' into more_asset_bug_fixes	2023-02-14 18:09:55 +05:30
anandbaburajan	a58f2e6c03	fix: asset_depreciation_and_balances report doesn't reflect manual depr entries	2023-02-14 17:59:16 +05:30
Sagar Sharma	447310702e	Merge branch 'develop' into fix-so-on-hold	2023-02-14 16:01:43 +05:30
ruthra kumar	960085853a	Merge pull request #34048 from ruthra-kumar/typeerror_on_sales_order_analysis ... fix: typeerror on Sales Order analysis report	2023-02-14 15:27:36 +05:30
Sagar Sharma	5faa62c49a	Merge branch 'develop' into fix-so-on-hold	2023-02-14 11:06:10 +05:30
rohitwaghchaure	3014bac293	Merge pull request #34046 from FHenry/dev_fix_BOM_import ... fix: BOM import failed as use same label field for Raw Materials Item table and Scrap Item table	2023-02-14 10:29:26 +05:30
ruthra kumar	00a4191966	fix: typeerror on Sales Order analysis report	2023-02-14 09:56:35 +05:30
Raffael Meyer	770369e5c1	feat: translate fixtures during runtime, not installation (#33996) ... feat: install untranslated fixtures from files Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>	2023-02-14 09:29:27 +05:30
Florian HENRY	86be259341	fix: BOM import failed as importer use same label field for Raw MaterialsItem table and Scrap Item table	2023-02-13 23:34:20 +01:00
Deepesh Garg	ce748cec3a	fix: Amount validation in Payment Request against Purchase Order (#34042)	2023-02-13 20:56:24 +05:30
HENRY Florian	231fe4156f	fix: should never get cutomer price on purchase document (#34002) ... * fix: never get cutomer price on purchase document chores: syntax chore: typo in stock_entry get_uom_details (#33998) fix: typo in stock_entry get_uom_details chores: syntax * feat: add test for get_item_detail price list oriented * feat: add test for get_item_detail price price oriented * feat: add test for get_item_detail price price oriented * chore: clean test code	2023-02-13 20:56:05 +05:30
anandbaburajan	c533213225	fix: opening_accumulated_depreciation and precision in charts	2023-02-13 17:22:31 +05:30
Deepesh Garg	ff4ae69408	Merge branch 'develop' into gross_profit_memory_and_performance_issue	2023-02-13 15:38:26 +05:30
Deepesh Garg	a67284e96d	fix: Concurrency issues in Sales and Purchase returns (#34019)	2023-02-13 15:31:19 +05:30
ruthra kumar	4f2553e7b6	Merge pull request #34021 from ruthra-kumar/handle_rare_cases_of_null_in_outstanding_calculation ... fix: rare instances of IntegrityError while cancelling journals against cr note	2023-02-13 14:14:27 +05:30
ruthra kumar	192a3395a5	refactor: filter only immediate upcoming payment term for each SO (#33923) ... * fix: ignore closed or 'on hold' orders * refactor: filter immediate upcoming term --------- Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>	2023-02-13 12:36:40 +05:30
ruthra kumar	e5a2b15fba	fix: unwanted difference amount calculation on cr note and invoice with same currency (#34020) ... * fix: incorrect difference amount while reconiling cr/dr notes * fix(test): catch incorrect difference amount calculation Fixed issues where difference amount was calculated for Cr Notes and Invoices of the same currency. --------- Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>	2023-02-13 12:08:42 +05:30
Deepesh Garg	148703bfc2	feat: Setting to allow Sales Order creation against expired quotation (#33952) ... * feat: Setting to allow Sales Order creation against expired quotation * chore: linting issues	2023-02-13 10:27:55 +05:30
Deepesh Garg	ce3f9622cb	Merge branch 'develop' into handle_rare_cases_of_null_in_outstanding_calculation	2023-02-13 09:42:41 +05:30
Deepesh Garg	48bb2c942b	fix: Ignore Payment Ledger Entry on dunning cancel (#34025) ... * fix: Ignore Payment Ledger Entry on dunning cancel * chore: fix translation issue	2023-02-13 09:42:01 +05:30
Deepesh Garg	77f6789706	Revert "Update tr.csv" (#34026) ... Revert "chore: Update Turkish translations (#33985)" This reverts commit 6ea0a69d3a.	2023-02-13 08:27:00 +05:30
ruthra kumar	3e5691072a	perf: fetch SLE's on demand and memoize	2023-02-12 14:49:17 +05:30
ruthra kumar	b9a7ff7c3d	fix: IntegrityError while cancelling journals against cr note	2023-02-12 14:06:40 +05:30
Sagar Sharma	b0e8dfc1d0	Merge branch 'develop' into fix-so-on-hold	2023-02-12 13:37:21 +05:30
s-aga-r	d76759e066	fix: update reserved_qty when Sales Order marked as Hold	2023-02-12 13:36:26 +05:30
Richard Case	a0eb5e5535	fix: add payment hook to point of sale JS (#33988)	2023-02-11 20:40:15 +05:30
Raffael Meyer	e4953df4a3	fix: set per_billed based on hours when amounts are zero (#33984) ... * fix: set per_billed based on hours when amounts are zero * test: calculate_percentage_billed	2023-02-11 12:36:37 +05:30
Sabu Siyad	0df28c7174	fix(ecommerce): throw invalid doctype error in shop by category (#33901) ... Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>	2023-02-11 12:28:42 +05:30
Raffael Meyer	201573ab9a	refactor: install fixtures (#33964) ... * refactor: install fixtures * style: disable semgrep for install_defaults signature	2023-02-11 12:15:42 +05:30
Deepesh Garg	0efdc6c13a	fix: Ignore mandatory fields while creating tax templates for new companies (#34005)	2023-02-11 12:03:48 +05:30
Raffael Meyer	ab7293bcd3	fix: list view for Terms and Conditions (#33925) ... Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>	2023-02-11 11:09:26 +05:30
Mehmet Demirel	6ea0a69d3a	chore: Update Turkish translations (#33985) ... We are the ERPNext Turkey Team. We request confirmation of the translation we sent.	2023-02-11 09:27:18 +05:30
Deepesh Garg	e478a5d0ce	feat: Add filters in Loan Interest Report (#33907)	2023-02-11 09:17:24 +05:30
Deepesh Garg	47c91324b1	fix: Amount for debit and credit notes with 0 qty line items (#33902)	2023-02-11 09:04:00 +05:30
Akshay	185c543b73	chore: typo in stock_entry get_uom_details (#33998) ... fix: typo in stock_entry get_uom_details	2023-02-10 20:42:35 +05:30
Devin Slauenwhite	5685492995	Merge remote-tracking branch 'frappe/develop' into fix-reserve-qty ... # Conflicts: # erpnext/stock/doctype/delivery_note/test_delivery_note.py	2023-02-09 13:48:18 -05:00
Marica	bd7e6e264e	Merge branch 'develop' into alternative-items-quotation	2023-02-06 16:30:10 +05:30
marination	db2076db69	refactor: Order based alternative items mapping ... - Alternatives must be followed by a non-alternative item row - On submit, store non-alternative rows in hidden checkbox to avoid recomputation - Check for valid/mappable rows by row name - UI: Select from table rows.Add single row for original/alternative item in dialog - UI: Indicator for alternative items in dialog grid - UI: Indicator legend and description of table - DB: Added check field 'Has Alternative Item' not to be confused with 'Has Alternative' in Mfg	2023-02-06 16:25:38 +05:30
Anand Baburajan	4686217d3c	Merge branch 'develop' into cancel_pi_cancelled_asset	2023-02-05 14:14:39 +05:30
Anand Baburajan	396f455258	Merge branch 'develop' into cancel_pi_cancelled_asset	2023-02-05 12:19:21 +05:30
Anand Baburajan	f8270f093d	Merge branch 'develop' into manual_depr_entries_develop	2023-02-05 12:19:17 +05:30
Sagar Sharma	2fedd595a9	Merge branch 'develop' into github-issue-33533	2023-02-05 09:36:17 +05:30
rohitwaghchaure	7d794bc70a	Merge branch 'develop' into fixed-negative-stock-error	2023-02-04 22:35:58 +05:30
rohitwaghchaure	67b5471d09	Merge pull request #33941 from developsessions/fix_wrong_due_date_calculation ... fix: default due_date was wrong calculated on template "_Test Payment Term Template 1" (last day of next month)	2023-02-04 22:34:47 +05:30
Anand Baburajan	82490d9f55	Merge branch 'develop' into cancel_pi_cancelled_asset	2023-02-04 18:37:34 +05:30
Anand Baburajan	07a0e2b7a8	Merge branch 'develop' into manual_depr_entries_develop	2023-02-04 18:37:34 +05:30
developsessions	c8cd351b39	style: apply results of lint run	2023-02-04 09:12:29 +01:00
anandbaburajan	3380dc5dea	chore: use continue, not break	2023-02-04 11:20:26 +05:30
developsessions	9d0096ad9e	fix: failed test, convert date time to string	2023-02-03 21:21:43 +01:00
Anand Baburajan	bb424965ee	Merge branch 'develop' into cancel_pi_cancelled_asset	2023-02-03 23:00:40 +05:30
anandbaburajan	b961321de5	fix: allow PI cancel if linked asset is cancelled	2023-02-03 22:58:22 +05:30
Anand Baburajan	2d54bf7199	Merge branch 'develop' into manual_depr_entries_develop	2023-02-03 22:25:27 +05:30
anandbaburajan	e5da0d7a63	chore: refactor AssetDepreciationSchedule	2023-02-03 22:23:17 +05:30
anandbaburajan	8ea9e4576f	fix: asset value for manual depr entries	2023-02-03 21:43:18 +05:30
developsessions	be1f941996	fix: Add missing 1 required positional argument: 'bill_date'	2023-02-03 14:50:44 +01:00
developsessions	c80aaad437	style: lint wrong from position	2023-02-03 13:55:36 +01:00
s-aga-r	dc0ddf8d7e	fix: stock entry from item dashboard (stock levels)	2023-02-03 18:08:34 +05:30
developsessions	ce8a1086a7	fix: default due_date was wrong calculated on template "_Test Payment Term Template 1" (last day of next month)	2023-02-03 11:30:29 +01:00
s-aga-r	56356ffbb9	chore: add Item Name column in Warehouse wise Item Balance Age and Value report	2023-02-03 12:28:23 +05:30
s-aga-r	d7a665cb84	chore: column width in Warehouse wise Item Balance Age and Value report	2023-02-03 12:27:41 +05:30
Rohit Waghchaure	9ae7578b07	test: test case	2023-02-02 18:54:42 +05:30
Rohit Waghchaure	6d513e2519	fix: negative stock error	2023-02-02 18:40:15 +05:30
marination	03321f5f13	chore: Code simplification ... - Map is not required, avoid filter multiple times, use single loop instead - Better variable name - Reduce LOC	2023-02-02 17:28:03 +05:30
ruthra kumar	2afed7de03	Merge pull request #33777 from ruthra-kumar/performance_tuning_remarks_migration ... fix(patch): reduce memory usage while migrating remarks	2023-02-02 16:47:15 +05:30
ruthra kumar	ae2de3cf65	Merge pull request #33776 from ruthra-kumar/performance_tuning_ple_migration ... patch: reduce memory usage by paging through records	2023-02-02 16:46:51 +05:30
ruthra kumar	cb1d33880c	Merge pull request #33502 from ruthra-kumar/toggle_account_balances_in_coa ... feat: Toggle display of Account Balance in Chart of Accounts	2023-02-02 09:20:53 +05:30
marination	b3fe7c6dad	fix: Consider only ordered alternative/original item for Quotation status ... - The original and its alternatives make a set of items where one is chosen - While setting order status of Quotation, check if the chosen item from the set is fully ordered or not - Filter out unselected items from the set - Create a map containing the set of items and if they were ordered or not for ease of grouping - The simple items will work as it used to	2023-02-01 19:10:32 +05:30
Gokulnath	2884738864	feat: adding warehouse filter for gross profit report (#33397) ... Co-authored-by: ruthra kumar <ruthra@erpnext.com>	2023-02-01 18:44:15 +05:30
rohitwaghchaure	fbf2d7e9de	Merge pull request #33918 from rohitwaghchaure/fixed-incorrect-bin-qty ... fix: incorrect actual qty in Bin	2023-02-01 18:22:56 +05:30
Rohit Waghchaure	f8c852c54c	fix: incorrect actual qty in Bin	2023-02-01 17:49:11 +05:30
Suraj Shetty	ffeda0cee9	Merge pull request #33916 from gavindsouza/permlevel-apis	2023-02-01 16:24:18 +05:30
Dany Robert	2cc7239dd5	fix: currency formatting in item-wise sales history (#33903) ... * fix(item-sales-history): currency formatting * chore: linting issues * fix: convert raw sql to qb	2023-02-01 14:27:38 +05:30
Gavin D'souza	940ad6e3f2	fix: Fetch all fields via get_returned_qty_map_for_row	2023-02-01 13:53:37 +05:30
Gavin D'souza	3518d4be1d	fix(update_billing_percentage): Remove permlevel checks on aggregated ... value	2023-02-01 12:58:08 +05:30
Raffael Meyer	3c7b460fd8	fix: german chart of accounts "SKR03" (#33909) ... * fix: german chart of accounts "SKR03" - Added some missing account types and tax rates - Added some missing accounts * style: convert indentation to tabs * fix: space before percentage sign * feat: add some expense accounts * refactor: replace unicode characters with utf-8 for better readability * revert: add back groups for Bank and Cash accounts Removed in 7d0d9c690068481a9730e0132c7aff34c1f56100	2023-02-01 12:16:58 +05:30
Deepesh Garg	103a91ed40	Merge pull request #33808 from dj12djdjs/fix-lead-rename ... fix: make title field readonly	2023-02-01 12:02:33 +05:30
ruthra kumar	9bb64107c5	perf: reduce memory usage while migrating remarks ... Page through records using primary key	2023-02-01 10:44:44 +05:30
barredterra	7156184933	feat: add incoterm named place to RFQ	2023-01-31 23:23:54 +01:00
marination	ece6358e60	fix: Iterate over list instead of map's output and formatting	2023-01-31 17:13:05 +05:30
rohitwaghchaure	c5834c1db4	Merge pull request #33896 from rohitwaghchaure/inventory-dimension-mandatory ... feat: mandatory and mandatory depends on in inventory dimension	2023-01-31 15:18:14 +05:30
rohitwaghchaure	ddb4396117	Merge pull request #33715 from s-aga-r/fix-pick-list ... fix: consider existing pick-list	2023-01-31 15:10:19 +05:30
s-aga-r	6ffdeb1af8	fix: consider stock_qty if picked_qty is zero	2023-01-31 14:39:57 +05:30
Rohit Waghchaure	22d0e1373b	test: added test case	2023-01-31 14:36:26 +05:30
Rohit Waghchaure	423f2b5627	feat: mandatory and mandatory depends on in inventory dimension	2023-01-31 14:19:14 +05:30
Sagar Sharma	6e015fd6be	Merge branch 'develop' into fix-mr-rate-and-amount	2023-01-31 12:39:38 +05:30
Sagar Sharma	57c8871de0	Merge branch 'develop' into fix-pick-list	2023-01-31 12:38:58 +05:30
s-aga-r	0b76a26c8a	refactor: test_consider_existing_pick_list()	2023-01-31 12:38:30 +05:30
s-aga-r	bb7fe795fe	test: add test cases	2023-01-31 12:38:30 +05:30
s-aga-r	207eeefc85	fix(test): test_pick_list_for_items_with_multiple_UOM()	2023-01-31 12:38:30 +05:30
s-aga-r	5138ef0160	fix: pymysql.err.ProgrammingError	2023-01-31 12:38:30 +05:30
s-aga-r	7b3d496ce0	fix: get_picked_items_details	2023-01-31 12:38:30 +05:30
s-aga-r	be41052dc8	chore: add status field in Pick List	2023-01-31 12:38:30 +05:30
s-aga-r	b642718f08	fix: consider existing pick list	2023-01-31 12:38:27 +05:30
Deepesh Garg	b3dc22de29	fix: Fetch commission rate from sales partner (#33851)	2023-01-31 09:33:33 +05:30
barredterra	11d165c274	fix(Fixed Asset Register): error when selecting more than one fiscal year	2023-01-30 19:33:58 +01:00
Anand Baburajan	5d8a2d3d3b	Merge branch 'develop' into fix_disposal_was_made_on_original_schedule_date_develop	2023-01-30 21:36:51 +05:30
anandbaburajan	f487660a7c	fix: disposal_was_made_on_original_schedule_date	2023-01-30 21:33:43 +05:30
ruthra kumar	5f38859a04	Merge pull request #33736 from rtdany10/gp-report-fix ... fix(gp): fetch buying amount from dn related to so	2023-01-30 19:04:36 +05:30
marination	fa9b327501	chore: Validate 'alternative_to' field values, must be a valid non-alterntaive item from table	2023-01-30 16:27:01 +05:30
Dany Robert	d69c839369	chore: linting issues	2023-01-30 10:45:08 +00:00
Dany Robert	1f6ab86a65	feat(gp): test for inv and dn related via so	2023-01-30 10:35:43 +00:00
marination	94cacb60de	feat: Filter rows to be mapped on server side mapping function ... - Pass dialog selections to `make_sales_order` - Map either original item or its alternative depending on mapping - Only qty check for simple rows (without alternatives and not an alternative itself)	2023-01-30 13:54:30 +05:30
s-aga-r	6b781d78e0	fix: amount in Material Request	2023-01-30 12:51:59 +05:30
Deepesh Garg	a34a1f8fd2	fix: Amount validation in Payment Request against Purchase Order (#33855) ... fix: Amount validation in Payment Request againt Purchase Order	2023-01-29 21:34:28 +05:30
Deepesh Garg	faecf3ee40	fix: Lead to customer creation (#33859)	2023-01-29 21:25:49 +05:30
Deepesh Garg	6674edface	chore: Resize numeric and date columns (#33858)	2023-01-29 21:25:26 +05:30
Deepesh Garg	428b099f63	fix: Ignore linked JE on JE cancellation (#33852)	2023-01-29 17:27:17 +05:30
Deepesh Garg	8abe0ce0ec	fix: Currency symbol for tax withholding net total field (#33850) ... * fix: Currency symbol for tax withholding net total field * chore: Update display depends on property	2023-01-29 17:08:11 +05:30
ruthra kumar	fee0ca8cd9	perf: reduce memory usage by paging through records ... While migrating GL entries to Payment Ledger, page through records using primary key to reduce memory usage.	2023-01-29 15:27:01 +05:30
ruthra kumar	f270880735	fix: double salutation on quotation print (#33834) ... 'lead_name' always has salutation.	2023-01-28 18:17:25 +05:30
rohitwaghchaure	1b967f37af	Merge pull request #33845 from rohitwaghchaure/fixed-item-not-fetching-issue ... fix: item rate not fetching	2023-01-28 15:10:02 +05:30
Rohit Waghchaure	0d7f98b496	fix: item rate not fetching	2023-01-28 13:51:33 +05:30
Sabu Siyad	9e50aa4833	feat(pos): multiple item prices (#33005) ... * fix(pos): multiple item prices feat: show uom with product price feat: multiple item (variant) depending on uom Signed-off-by: Sabu Siyad <hello@ssiyad.com> * feat(pos): consider uom for new item Signed-off-by: Sabu Siyad <hello@ssiyad.com> * feat(pos): uom based stock display Signed-off-by: Sabu Siyad <hello@ssiyad.com> * use `//` instead of `math.floor()` Signed-off-by: Sabu Siyad <hello@ssiyad.com> * feat(pos): uom by barcode Signed-off-by: Sabu Siyad <hello@ssiyad.com> * fix: replace `is not` with `!=` Signed-off-by: Sabu Siyad <hello@ssiyad.com> * fix(pos): barcode_info `next()`: fallback Signed-off-by: Sabu Siyad <hello@ssiyad.com> * chore: format Signed-off-by: Sabu Siyad <hello@ssiyad.com> * Update erpnext/selling/page/point_of_sale/point_of_sale.py Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com> * chore: un-ignore unused local variable Signed-off-by: Sabu Siyad <hello@ssiyad.com> --------- Signed-off-by: Sabu Siyad <hello@ssiyad.com> Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com> Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>	2023-01-28 10:28:31 +05:30
Deepesh Garg	3598bcc9a8	chore: ERPNext setup wizard cleanup (#33675) ... * chore: ERPNext setup wizard cleanup * chore: Remove default website * chore: Remove flaky tests * chore: remove unwanted tests	2023-01-27 14:40:39 +05:30
ruthra kumar	9dd6b3c950	Merge pull request #33835 from ruthra-kumar/skip_validation_on_migration ... fix(patch): validation error on cost center allocation migration	2023-01-27 13:40:57 +05:30
ruthra kumar	de10f2dc00	fix(patch): validation error on cost center allocation migration ... If Distributed cost centers have GL postings on patch run date, patch failes with valiation error.	2023-01-27 12:08:18 +05:30
Devin Slauenwhite	a835c1a418	perf: show update items dialog	2023-01-26 16:53:05 -05:00
ruthra kumar	b31b850db8	fix: disfuctional cost center filter on Journal Entries (#33815) ... * fix: missing cost_center filter for journal entries * test: cost center filter on invoices, journals and payments	2023-01-26 20:26:21 +05:30
Vishal Dhayagude	c5ca8d74c4	fix: GST Category validation broken for pos unregistered customer who dont have address. (#33800) ... * fix: GST Category validation is given for pos customer	2023-01-26 15:45:51 +05:30
marination	cef7dfd0b4	feat: Dialog to select alternative item before creating Sales order ... - Users can leave the row blank in the dialog if original item is to be used - Else users can select an alternative item against an original item - In the document, users must check `Is Alternative Item` if needed and also specify which item it is an altenrative to since there are no documented mappings	2023-01-26 14:36:25 +05:30
anandbaburajan	21f425660d	chore: remove broken translation	2023-01-26 13:15:01 +05:30
Ankush Menat	33b68552f1	chore: remove broken translation ... [skip ci]	2023-01-25 17:35:23 +05:30
Daizy Modi	da323cbb40	fix: use correct filter name in item_query (#33814)	2023-01-25 17:32:21 +05:30
Sagar Vora	1f4fa90072	Revert "fix: use correct filter name in reports"	2023-01-25 16:19:44 +05:30
Daizy Modi	def759d2e8	fix: use correct filter name in reports	2023-01-25 15:57:39 +05:30
marination	f19eadab9a	feat: Consider filtered items table in JS for totals computation ... - Set `_items` as filtered rows if quotation else the entire table. Set at entry point of JS API - Use `_items` instead of `items` to compute taxes and charges. Exclude alternative item rows	2023-01-25 13:10:03 +05:30
Devin Slauenwhite	a504b6eac0	fix: make title field readonly	2023-01-24 18:21:08 -05:00
Rohit Waghchaure	92d857d49c	fix: purchase invoice performance issue	2023-01-24 22:32:07 +05:30
marination	91982d1e4f	feat: Filter out alternative item rows in taxes and totals for Quotation ... - Added a Quotation Item field `is_alternative_item` - Use filtered rows for taxes and totals computation	2023-01-24 18:03:53 +05:30
Sagar Sharma	302f5e27be	Merge branch 'develop' into fix-sco-status	2023-01-24 17:33:29 +05:30
s-aga-r	840f9d8987	chore: add Cancelled status in SCO get_indicator	2023-01-24 17:30:37 +05:30
rohitwaghchaure	a5478c61af	Merge pull request #33790 from rohitwaghchaure/fix-web-supplier-quotation-from-rfq ... fix: web supplier quotation	2023-01-24 15:59:04 +05:30
anandbaburajan	4e6066f929	chore: fix translations	2023-01-23 18:07:32 +05:30
Rohit Waghchaure	7800db7c0d	fix: web supplier quotation	2023-01-23 14:21:10 +05:30
Anand Baburajan	7d5df407c4	Merge branch 'develop' into update_translations_for_naming_series_error	2023-01-23 14:19:39 +05:30
anandbaburajan	bbde1f611f	chore: update translations for naming series error	2023-01-23 14:16:31 +05:30
s-aga-r	9ae3a54ce9	chore: add method get_picked_items_details()	2023-01-23 13:48:26 +05:30
rohitwaghchaure	b3a216c8f8	Merge pull request #33785 from rohitwaghchaure/get-items-from-transit-entry ... feat: get items from Transit Stock Entry	2023-01-23 13:03:53 +05:30
Rohit Waghchaure	62141b0b63	feat: get items from Transit Stock Entry	2023-01-23 12:01:57 +05:30
Deepesh Garg	a3c89dbc10	fix: TDS deduction in payment entry (#33747) ... * fix: TDS deduction in payment entry	2023-01-22 23:31:19 +05:30
Xeanth	ad437fd5ba	fix: use stock qty to calculate POS reserved stock (#33735)	2023-01-22 18:06:01 +05:30
Sagar Sharma	7a8e89e2fe	fix: incorrect rate and amount in MR Item (#33547) ... * fix: incorrect `rate` and `amount` in MR Item	2023-01-22 18:04:13 +05:30
barredterra	547d37b1db	fix: missing constant definition	2023-01-21 17:29:43 +01:00
Deepesh Garg	2f03dcb5b6	fix: Better budget exceeding validation messages (#33713) ... * fix: Better budget exceeding validation messages * chore: remove unwanted changes	2023-01-21 19:33:14 +05:30
s-aga-r	57c3216683	refactor: rewrite get_available_item_locations_for_serial_and_batched_item query in QB	2023-01-21 14:05:51 +05:30
s-aga-r	5b76e8b193	refactor: rewrite get_available_item_locations_for_serialized_item query in QB	2023-01-21 12:45:39 +05:30
s-aga-r	58dd40a2d7	refactor: rewrite get_available_item_locations_for_other_item query in QB	2023-01-21 12:15:45 +05:30
rohitwaghchaure	f6f64083d2	Merge pull request #33760 from rohitwaghchaure/allow-to-change-bom-in-sco ... fix: not able to change default BOM in the Subcontracting Order	2023-01-21 12:04:50 +05:30
s-aga-r	29bf787313	refactor: rewrite get_picked_items_qty query in QB	2023-01-21 11:28:23 +05:30
ruthra kumar	4cbd63edbf	Merge pull request #33710 from openrefactory/patch-2 ... Removed an unnecessary check in code which always evaluates to true	2023-01-21 09:41:04 +05:30
OpenRefactory, Inc	49aed7ff69	fix: removed an unnecessary check which always evaluates to true	2023-01-21 06:15:51 +05:30
Kevin Shenk	e4bceaaf66	feat: Copy project_name, from_time, to_time from timesheet details to sales invoice (#33726) ... feat: Copy project_name, from_time, to_time from timesheet details to sales invoice	2023-01-20 23:39:37 +05:30
rohitwaghchaure	b5d2eedfa6	Merge pull request #33759 from rohitwaghchaure/fix-incorrect-actual-qty-for-packed-item ... fix: incorrect actual qty for the packed item	2023-01-20 23:38:55 +05:30
Rohit Waghchaure	11b2994fe8	fix: not able to change default BOM in the Subcontracting Order	2023-01-20 23:27:49 +05:30
Rohit Waghchaure	02566a02a8	fix: incorrect actual qty for the packed item	2023-01-20 22:38:56 +05:30
rohitwaghchaure	d462d6de06	Merge pull request #33595 from vishdha/fg_based_operating_cost ... feat: Add operating cost based on bom quanity without creating job card	2023-01-20 22:36:42 +05:30
Dany Robert	1e607cd4c7	fix(pricing rule): free item duplication (#33746) ... * fix(pricing rule): free item duplication * chore: linting issues	2023-01-20 20:07:37 +05:30
Deepesh Garg	597ef0a498	fix: Short closed order, receipt and delivery note status on cancellation (#33743) ... * fix: Short closed order, receipt and delivery note status on cancellation * test: Cancelled status check	2023-01-20 19:44:06 +05:30
Raffael Meyer	327b6fdb32	fix: calculate correct amount for qty == 0 (#33739)	2023-01-20 19:35:27 +05:30
Sabu Siyad	a94aa7a79f	fix(ecommerce): breadcrumb: fallback to /all-products (#33718) ... * fix(ecommerce): breadcrumb: fallback to `/all-products` * fix(item_group): use `==` instead of `is` * test(ecommerce): breadcrumb	2023-01-20 18:54:54 +05:30
Ritwik Puri	17045f88a1	fix: use hash based naming for tax withheld vouchers child table (#33643)	2023-01-20 18:53:39 +05:30
Dany Robert	ef90e24931	chore: linting issue	2023-01-19 10:25:05 +00:00
Dany Robert	e8e20da78e	fix(gp): fetch buying amount from dn related to so	2023-01-19 09:39:43 +00:00
Sagar Sharma	333b2ae721	Merge branch 'develop' into item-attr-abbr-lowercase	2023-01-19 12:55:49 +05:30
rohitwaghchaure	ecfebfec57	Merge pull request #33723 from rohitwaghchaure/fixed-issue-of-item-variant ... fix: don't add template item in sales/purchase transaction	2023-01-19 12:42:04 +05:30
Rohit Waghchaure	2c83fff1a1	fix: don't add template item in sales/purchase transaction	2023-01-18 23:29:06 +05:30
mergify[bot]	cc569c955f	fix: the frappe throw message is corrected in the group task validation (#33698) ... fix: the frappe throw message is corrected in the group task validation (#33698)	2023-01-18 21:47:22 +05:30
Sagar Sharma	f89600aee8	Merge branch 'develop' into refactor/qb/pick-list	2023-01-18 17:52:23 +05:30
Rohit Waghchaure	1de4742ffb	fix: local variable 'stock_rbnb' referenced before assignment	2023-01-18 15:29:39 +05:30
Sagar Sharma	eee3bd2554	Merge branch 'develop' into refactor/qb/pick-list	2023-01-18 13:01:59 +05:30
Deepesh Garg	6b31c27ed6	fix: Missing constructor args in Bank Reco Tool (#33705)	2023-01-17 21:03:39 +05:30
Vishal Dhayagude	c4e1f81ccb	Merge branch 'develop' into fg_based_operating_cost	2023-01-17 19:20:37 +05:30
Anand Baburajan	c6cfacc108	Merge branch 'develop' into misc_asset_fixes	2023-01-17 15:09:37 +05:30
Deepesh Garg	db9beb3cdd	fix: Rate from LDC in TDS reports (#33699)	2023-01-17 14:53:24 +05:30
Vishal Dhayagude	f19212b5c8	Merge branch 'develop' into fg_based_operating_cost	2023-01-17 13:02:25 +05:30
Anand Baburajan	d97127bff2	Merge branch 'develop' into misc_asset_fixes	2023-01-17 12:57:22 +05:30
Sagar Sharma	eeed3356ac	Merge branch 'develop' into refactor/qb/pick-list	2023-01-17 12:25:16 +05:30
rohitwaghchaure	e68c4e2aa8	Merge pull request #33695 from rohitwaghchaure/fixed-patch-item_reposting_for_incorrect_sl_and_gl ... fix: patch item_reposting_for_incorrect_sl_and_gl	2023-01-17 12:18:34 +05:30
Rohit Waghchaure	dbde3a3421	fix: patch item_reposting_for_incorrect_sl_and_gl	2023-01-17 11:47:53 +05:30
Anand Baburajan	c4d3a8a600	Merge branch 'develop' into misc_asset_fixes	2023-01-17 11:21:37 +05:30
Sagar Sharma	1cadef97bf	Merge branch 'develop' into refactor/qb/pick-list	2023-01-17 10:08:36 +05:30
Sagar Sharma	fb950417bf	Merge branch 'develop' into dev_fix_bug_from_78b438f6	2023-01-17 10:04:36 +05:30
Deepesh Garg	0639d9e32a	chore: Typo in payment reconciliation (#33686)	2023-01-17 08:06:30 +05:30
Florian HENRY	e19161a8ee	fix: Sales ORder Connections on Material Request	2023-01-16 21:03:18 +01:00
anandbaburajan	86cf5c89ab	chore: add depr_entry_posting_status in create_asset	2023-01-17 00:31:21 +05:30
anandbaburajan	cebb5a42f4	chore: add missing /n in options	2023-01-17 00:26:50 +05:30
Anand Baburajan	011a4c3faa	Merge branch 'develop' into misc_asset_fixes	2023-01-17 00:00:09 +05:30
rohitwaghchaure	66ae807a26	Merge pull request #33684 from rohitwaghchaure/fixed-work-order-summary ... feat: [minor] date type based on filter in Work Order Summary report	2023-01-16 23:57:43 +05:30
rohitwaghchaure	d6915df81d	Merge pull request #33680 from rohitwaghchaure/refactor-picked-qty ... refactor: picked qty in sales order item	2023-01-16 23:31:56 +05:30
Rohit Waghchaure	20c8873208	feat: provision to select date type based on filter	2023-01-16 23:29:13 +05:30
anandbaburajan	a144bb01fe	chore: stying	2023-01-16 23:26:39 +05:30
Anand Baburajan	070bc8badd	Merge branch 'develop' into misc_asset_fixes	2023-01-16 23:23:12 +05:30
anandbaburajan	cf7b43f7f0	fix: handle_post_depr_entries_fail, show error alert and send email	2023-01-16 23:10:02 +05:30
Rohit Waghchaure	1bcff80074	refactor: picked qty in sales order item	2023-01-16 22:50:16 +05:30
Devin Slauenwhite	179a31ed5e	feat: disable currency exchange api. (#33593)	2023-01-16 21:00:10 +05:30
anandbaburajan	61cd0f98fd	fix: asset repair link and improve notes	2023-01-16 18:35:40 +05:30
Vishal Dhayagude	352dcddd6d	Merge branch 'develop' into fg_based_operating_cost	2023-01-16 17:02:31 +05:30
Sagar Sharma	1769b45d4b	Merge branch 'develop' into refactor/qb/pick-list	2023-01-16 16:04:20 +05:30
s-aga-r	0ed6552655	refactor: rewrite pick_list.py queries in QB	2023-01-16 16:01:40 +05:30
Deepesh Garg	adaeba1554	fix(minor): Label updates in Statement of Accounts (#33639) ... fix(minor): Label updates in Satement of Accounts	2023-01-16 14:03:54 +05:30
Deepesh Garg	312625fdc5	fix: Patch to update reference_due_date in Journal Entry (#33616)	2023-01-16 13:43:54 +05:30
ruthra kumar	9627b46ee7	Merge pull request #33661 from ruthra-kumar/performance_tuning_payment_reconciliation ... perf: improve reconciliation performance for JE with 100s of accounts	2023-01-16 09:41:17 +05:30
ruthra kumar	56aa1866da	Merge pull request #33663 from ruthra-kumar/attribute_error_on_repost_ple_tool ... fix: attribute error while submitting Repost PLE	2023-01-16 09:36:22 +05:30
Raffael Meyer	dceef0397a	fix: allow to create sales order from expired quotation (#33582)	2023-01-16 08:53:37 +05:30
ruthra kumar	be382054e5	revert: Reverting changes done on 33495 (#33662) ... 'ordered_qty' will not be fetched from `tabBin`	2023-01-16 08:50:39 +05:30
ruthra kumar	333907b7a5	Revert "fix: Updating SO throws ordered_qty not allowed to change after submission" (#33646)	2023-01-16 08:49:35 +05:30
Poruri Sai Rahul	8119442c94	FIX: Remove usage of "six.string_types" (#33603) ... FIX: Remove usage of six.string_types six is no longer a dependency	2023-01-16 08:47:28 +05:30
s-aga-r	b3759890d7	chore: Sales Order link in Pick List	2023-01-15 21:09:16 +05:30
ruthra kumar	2c50f43cdd	fix: attribute error while submitting Repost PLE	2023-01-15 20:51:54 +05:30
ruthra kumar	828eaf0930	fix: minor filter issue while reconciliation tool from bench console	2023-01-15 18:09:51 +05:30
ruthra kumar	11cf694d9a	perf: improve reconciliation speed on JE's with 1000's of rows ... 1. No need to keep old PLE's on reconciliation. 2. Added Validation to catch debit-credit mismatch on JE's 3. Only update outstanding amount for newly reconciled invoices	2023-01-15 17:51:46 +05:30
Raffael Meyer	67cf7e1728	refactor: use DocStatus (#33594)	2023-01-15 17:34:16 +05:30
Deepesh Garg	906ad10d16	fix: Return against internal purchase invoice (#33635)	2023-01-15 17:32:57 +05:30
Sagar Sharma	bfbc9ea8f7	Merge branch 'develop' into item-attr-abbr-lowercase	2023-01-15 12:55:01 +05:30
s-aga-r	f70d757b82	fix: zero rm-cost in SCR	2023-01-14 22:24:18 +05:30
Vishal Dhayagude	736afdf85a	Merge branch 'develop' into fg_based_operating_cost	2023-01-13 10:03:50 +05:30
Sagar Sharma	c2b3843d80	Merge branch 'develop' into item-attr-abbr-lowercase	2023-01-13 00:49:21 +05:30
Ritwik Puri	e22d56484d	chore: reuse doc object in test_pick_list_grouping_before_print (#33636)	2023-01-13 00:47:26 +05:30
Vishal Dhayagude	d63258ee9b	Merge branch 'develop' into fg_based_operating_cost	2023-01-12 21:50:09 +05:30
unknown	2ca4d3fb71	fix: linting	2023-01-12 20:53:12 +05:30
Anand Baburajan	29088e1777	Merge branch 'develop' into fixed_asset_report_asset_value	2023-01-12 20:30:39 +05:30
Deepesh Garg	afb33f2049	Merge pull request #33271 from sonali8848/filters-on-bank-reconciliation ... feat: Date filters on bank reconciliation tool	2023-01-12 18:25:05 +05:30
Deepesh Garg	232726288a	chore: fix fieldnames and order	2023-01-12 17:44:07 +05:30
Ritwik Puri	cfb0bb1eaa	fix: only group similar items in print format if group_same_items is checked in pick list (#33627) ... * fix: only group similar items if group same items is checked in pick list * test: non grouping of locations if group_same_items is false Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>	2023-01-12 17:25:50 +05:30
ruthra kumar	e0db2670f9	Merge pull request #33622 from ruthra-kumar/fix_change_after_submission_on_error ... fix: Updating SO throws ordered_qty not allowed to change after submission	2023-01-12 16:59:08 +05:30
s-aga-r	b26e96cdf4	chore: linter	2023-01-12 13:41:53 +05:30
ruthra kumar	391f42db04	fix: Updating SO throws ordered_qty not allowed to change after submission	2023-01-12 13:18:03 +05:30
s-aga-r	f028bd6e69	fix: validate accepted and rejected qty in SCR Item	2023-01-12 12:23:40 +05:30
s-aga-r	a0e2a93f3f	chore: update error msgs for Subcontracted PO	2023-01-12 12:09:28 +05:30
s-aga-r	6878f40d1d	chore: add row-index in error msgs	2023-01-12 12:02:00 +05:30
s-aga-r	434aa594d5	fix: ZeroDivisionError: float division by zero in SCR	2023-01-12 11:49:41 +05:30
unknown	974e12c837	fix: rewrite logic for duplicate check in Item Attribute ... Previously, Item Attribute values were not checked for case-insensitive duplicates, and Item tttribute abbreviations were forced to be uppercase. This commit fixes both problems.	2023-01-12 07:44:57 +05:30
Vishal Dhayagude	467a2b5cb4	Merge branch 'develop' into fg_based_operating_cost	2023-01-11 22:30:36 +05:30
Vishal	694fc3e20c	fix: hide with_operation on selection on fg_based and vice versa	2023-01-11 18:52:30 +05:30
Sagar Sharma	887ae1c434	Merge branch 'develop' into fix-diff-value	2023-01-11 14:01:51 +05:30
Smit Vora	be05aea101	fix: better comparision of difference value between stock and account	2023-01-11 05:21:13 +00:00
anandbaburajan	aa1f2a7297	fix: asset value in fixed asset register	2023-01-10 23:05:09 +05:30
Smit Vora	e0f5ecdad6	fix: RFQ emails not sent with pdf attachment (#33604)	2023-01-10 20:40:12 +05:30
vr-greycube	0f0bc9a462	fix: customer selection not mandatory in purchase invoice to fetch item details (#33572)	2023-01-10 20:26:33 +05:30
Deepesh Garg	0ed938a490	fix: Incorrect exchange rate in payment entries (#33481) ... * fix: Incorrect exchange rate in payment entries * test: Update failing tests	2023-01-10 20:12:43 +05:30
rohitwaghchaure	58ad79d3e8	Merge pull request #33597 from rohitwaghchaure/do-not-check-other-warehouse ... fix: don't check other warehouse ledgers to calculate valuation rate	2023-01-10 13:56:10 +05:30
Vishal	a5cbdea8e4	fix: minor change in bom.js added	2023-01-10 13:40:12 +05:30
Rohit Waghchaure	ef2bf3c223	fix: don't check other warehouse ledgers to calculate valuation rate	2023-01-10 10:59:50 +05:30
Ankush Menat	8a56df695d	perf: Drop name part from posting sort index (#33551)	2023-01-10 09:54:15 +05:30
Vishal	c51f9e0a97	fix: bom.json updated	2023-01-10 07:48:26 +05:30
Vishal	f0c0a64984	fix: test case added for FG_BASED OPERTING COST	2023-01-10 07:43:28 +05:30
Vishal	ddc0127e05	fix: minor changes added	2023-01-10 07:43:20 +05:30
Vishal	b559245f2a	feat: Add operating cost based on bom quanity without creating job card	2023-01-10 07:43:05 +05:30
rohitwaghchaure	59628f1934	Merge pull request #33579 from rtdany10/repack-fg-valuation ... fix(stock entry): wrong valuation rate in repack	2023-01-10 00:05:56 +05:30
rohitwaghchaure	a424acbfcb	Merge pull request #33577 from rohitwaghchaure/timeout-error-in-purchase-invoice ... fix: Timeout error while saving the purchase invoice	2023-01-10 00:01:15 +05:30
rohitwaghchaure	d749c4aac2	Revert "feat: Add operating cost based on bom quanity without creating job card"	2023-01-09 23:35:11 +05:30
rohitwaghchaure	20fe1875e7	Merge pull request #33347 from vishdha/fb_based_operating_cost ... feat: Add operating cost based on bom quanity without creating job card	2023-01-09 23:31:41 +05:30
Gughan Ravikumar	4d5067d6d4	fix(accounts): currency fields no longer read as strings by validation function in Payment Entry (#33535) ... explicitly cast paid_amount and received_amount to float in the Payment Entry set_unallocated_amount validation function	2023-01-09 23:26:51 +05:30
ruthra kumar	bbe5e5d9d6	fix: incorrect warehouse and selling amount on bundled products (#33549)	2023-01-09 22:45:43 +05:30
Sagar Sharma	dd3b79b511	Merge pull request #33562 from ruthra-kumar/better_handling_of_duplicate_bundle_items ... fix: better handling of duplicate bundle items	2023-01-09 22:22:57 +05:30
Devin Slauenwhite	6bc8bb26b6	fix: customer/supplier quick entry dialog (#33496) ... * fix: readonly primary contact fields. * refactor: supplier and customer quick entry form into common class.	2023-01-09 22:22:19 +05:30
Rohit Waghchaure	ec171fc7c1	test: test case to check disable last purchase rate	2023-01-09 22:02:35 +05:30
Sagar Sharma	b56c1ed050	Merge branch 'develop' into better_handling_of_duplicate_bundle_items	2023-01-09 21:48:48 +05:30
Deepesh Garg	f056e9e7c5	Merge pull request #33569 from ruthra-kumar/patch_to_update_new_je_type_in_property_setters ... chore: patch property setters for JE with new entry type	2023-01-09 21:01:52 +05:30
Deepesh Garg	57a6c37833	Merge pull request #32933 from AnandBaburajan/asset_depreciation_schedule ... feat: separating depreciation schedule from assets into a new doc	2023-01-09 20:47:21 +05:30
sonali	917b2190aa	fix: remove comments	2023-01-09 20:07:24 +05:30
Ankush Menat	fa4af2acce	refactor: convert heatmap queries to QB (#33581) ... Uses new `UnixTimestamp` function, don't backport.	2023-01-09 20:00:22 +05:30
safvanhuzain	99f5e869e0	fix(stock entry): wrong valuation rate in repack	2023-01-09 13:11:37 +00:00
Rohit Waghchaure	05df8579cd	fix: linters issue	2023-01-09 18:23:22 +05:30
Rohit Waghchaure	d1d4671320	feat: provision to disable get last purchase rate ... fix: set_incoming_rate condition	2023-01-09 18:10:52 +05:30
Rohit Waghchaure	7249657d15	fix: timeout error in the Purchase Invoice	2023-01-09 14:53:54 +05:30
ruthra kumar	789e448f0e	chore: patch property setters for JE with new entry type	2023-01-08 11:45:28 +05:30
Devin Slauenwhite	e35ac4f8c2	fix: move include in manufacturing to manufacturing tab.	2023-01-07 22:47:16 -05:00
ruthra kumar	c717e87c9e	fix: better handling of duplicate bundle items	2023-01-06 16:21:20 +05:30
rohitwaghchaure	525f054c45	Merge pull request #33548 from rohitwaghchaure/fixed-incorrect-wo-status ... fix: incorrect status in the work order	2023-01-06 16:01:24 +05:30
Rohit Waghchaure	b0baba84a0	fix: incorrect status in the work order	2023-01-06 14:16:18 +05:30
ruthra kumar	51b082b43c	Merge pull request #33537 from ruthra-kumar/sales_partner_in_ar_report ... refactor: Sales Partner column in AR and AR Summary Report	2023-01-06 12:07:50 +05:30
Vishal	9fd1c3efb4	fix: test case added for FG_BASED OPERTING COST	2023-01-06 11:18:09 +05:30
Vishal	6b0b49ee3f	fix: minor changes added	2023-01-06 11:18:09 +05:30
Vishal	bc1bdd58a7	feat: Add operating cost based on bom quanity without creating job card	2023-01-06 11:18:09 +05:30
s-aga-r	348dc32514	chore: enable No Copy attribute for route in Item Group	2023-01-05 12:25:50 +05:30
rohitwaghchaure	f6da6ece0a	Merge pull request #33524 from rohitwaghchaure/revamp-process-loss-feature ... refactor: revamp process loss feature & added tab breaks	2023-01-04 18:37:32 +05:30
ruthra kumar	ee94127974	refactor: Sales Partner column in AR and AR Summary Report	2023-01-04 12:41:02 +05:30
Anand Baburajan	3ae47ab32c	Merge branch 'develop' into asset_depreciation_schedule	2023-01-04 01:34:08 +05:30
Rohit Waghchaure	524c0994e0	test: test cases for process loss	2023-01-03 22:47:52 +05:30
Deepesh Garg	c78399c618	fix: Missing opening entry in general ledger (#33519)	2023-01-03 21:35:03 +05:30
Deepesh Garg	1a83a67d41	fix: Get payment entry button not visible in Bank Clearance doc (#33518)	2023-01-03 21:34:49 +05:30
Rohit Waghchaure	ae039777f9	refactor: revamp process loss feature & added tab breaks	2023-01-03 19:05:41 +05:30
Sagar Sharma	9f59330fa9	Merge branch 'develop' into fix/github-issue/33417	2023-01-03 18:51:27 +05:30
Deepesh Garg	a3ab8f973a	fix: Deferred revenue date comparison (#33515)	2023-01-03 17:51:41 +05:30
s-aga-r	751bdc98ed	fix: set supplier details while mapping SE(Send to Subcontractor)	2023-01-03 17:17:23 +05:30
Deepesh Garg	9a3d947e89	fix: Exchange gain and loss booking on multi-currency invoice reconciliation (#32900) ... * fix: Exchange gain and loss booking on multi-curreny invoice reconciliation * test: Update test cases * chore: Ignore SQL linting rule * chore: Joural Entry for exchange gainand loss booking * chore: Journal entry for exchange gain loss booking * test: Update test case * chore: Default exchange gain and loss account	2023-01-03 16:55:15 +05:30
Anand Baburajan	d9c91fa072	Merge branch 'develop' into asset_depreciation_schedule	2023-01-03 15:10:07 +05:30
anandbaburajan	312e51e8b2	chore: more refactoring and adding test for duplicate asset_depr_schedule	2023-01-03 15:09:04 +05:30
anandbaburajan	adb5249257	chore: fix patch	2023-01-03 13:03:12 +05:30
anandbaburajan	7b6b5ae581	chore: refactoring patch	2023-01-03 09:21:08 +05:30
anandbaburajan	e501c2db51	chore: just testing patch	2023-01-02 21:11:53 +05:30
anandbaburajan	357c17214d	chore: fix patch	2023-01-02 20:32:29 +05:30
rohitwaghchaure	6a4e25c1f9	Merge pull request #33504 from rohitwaghchaure/fixed-incorrect-picked-qty-in-so ... fix: [concurrency issue] incorrect picked qty in sales order	2023-01-02 20:12:05 +05:30
Rohit Waghchaure	aba83849a6	fix: [concurrency issue] incorrect picked qty in sales order	2023-01-02 18:46:22 +05:30
Anand Baburajan	72c2e77a5d	Merge branch 'develop' into asset_depreciation_schedule	2023-01-02 17:07:58 +05:30
anandbaburajan	7c5168eeac	chore: allow manually submitting and cancelling asset depr schedule	2023-01-02 17:07:28 +05:30
ruthra kumar	914b23038c	refactor: Exchange rate revaluation to handle accounts with zero account balance (#33165) ... * refactor: new type for JE - Exchange Gain or Loss * refactor: skip few validations for Exchanage Gain Or Loss type Jour * refactor: ERR create 2 journals for handling zero and non-zero compa 1. Additional check box accounts table to identify accounts with zero balance 2. Accounts with zero balance only in either of the 2 currencies will be handled on separate Journal * refactor: skips few validation for allowing 0 debit/credit * fix: General Ledger presentaion currency * test: fix test case in general ledger * test: fix failing test case in AR report	2023-01-02 14:33:14 +05:30
ruthra kumar	23fbe86d51	refactor: Show Balance in COA based on Accounts Settings	2023-01-02 13:32:01 +05:30
ruthra kumar	1b78fae6fc	refactor: show balance checkbox in Accounts Settings	2023-01-02 13:31:56 +05:30
s-aga-r	b425c2d7ec	Merge branch 'develop' into fix/github-issue/28766	2023-01-02 11:25:13 +05:30
Sagar Sharma	e18b0ebe92	Merge branch 'develop' into fix-get-bin-details	2023-01-02 10:49:29 +05:30
Sagar Sharma	49025db33c	Merge branch 'develop' into fix/github-issue/28766	2023-01-02 10:27:42 +05:30
Marc de Lima Lucio	3c393bfdc5	fix: javascript: execution blocked by undefined route options (#33405) ... Some implementations of DocField.get_route_options_for_new_doc() returned no value instead of an empty object in some cases, which caused a JavaScript error.	2023-01-02 09:18:25 +05:30
MOHAMMED NIYAS	d054f37602	feat: calculate hours (#33464) ... * feat: calculate hours * chore: Linting Issues Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>	2023-01-02 09:17:14 +05:30
Sabu Siyad	010718ffed	fix(ecommerce/cart): explicitly set frappe.boot (#33431) ... related: https://github.com/frappe/frappe/pull/18323 Signed-off-by: Sabu Siyad <hello@ssiyad.com> Signed-off-by: Sabu Siyad <hello@ssiyad.com>	2023-01-02 08:58:01 +05:30
Devin Slauenwhite	98c39c4f5f	fix: update payment entry references (#33274) ... * fix: set_amounts after deductions and losses are set * test: difference_amount changes after update_references_in_payment_entry * chore: linter * fix: use kwargs instad of destructing a dict [skip ci] * fix(test): test payment entry difference_amount after payment reconciliation.	2023-01-02 08:55:12 +05:30
Sagar Sharma	7126d71627	Merge branch 'develop' into fix/github-issue/28766	2023-01-01 22:24:47 +05:30
Devin Slauenwhite	239a5f8bf4	test: get_item_details contains bin details	2022-12-31 15:41:07 -05:00
Devin Slauenwhite	8d62cdfd5f	fix: add missing 'ordered_qty' to get_bin_details	2022-12-31 14:14:25 -05:00
Deepesh Garg	bb4725e9b5	Merge pull request #33488 from deepeshgarg007/multi_currency_bank_reco ... fix: Multi-currency issues in Bank Reconciliation Tool	2022-12-31 13:05:25 +05:30
sonali	12822f7c36	fix: data format	2022-12-30 14:06:19 +05:30
Deepesh Garg	ad53ecf2b4	fix: Multi-currency issues in Bank Recociliation Tool	2022-12-30 13:37:41 +05:30
Gughan Ravikumar	48a9cd5ef3	fix: allow arbitary items in Quotation ans Sales Order (#33430) ... fix: allow arbitary items in Quotation ans Sales Order	2022-12-30 13:16:40 +05:30
rohitwaghchaure	728dc1acf4	Revert "fix: daily scheduler to identify and fix stock transfer entries having incorrect valuation"	2022-12-30 11:08:31 +05:30
Sagar Sharma	d072169340	Merge branch 'develop' into fix/github-issue/28766	2022-12-29 16:38:53 +05:30
s-aga-r	c3911a592a	chore: use frappe.qb instead of frappe.db.get_value	2022-12-29 16:38:08 +05:30
sonali	d65243eb65	feat: consolidated auto bank reconciliation ... Added a button of Auto Reconcile, to reconcile the bank entries as per the matching reference number with the bank transaction and count of transactions reconciled message will be pop up on clicking the auto reconcile button.	2022-12-29 16:12:25 +05:30
s-aga-r	c716dcc01e	fix: consider child nodes while getting bin details	2022-12-29 14:01:42 +05:30
sonali	c764f14f53	fix: pre-commit	2022-12-29 13:58:06 +05:30
sonali	35c29e0226	fix: pre-commit	2022-12-29 13:45:15 +05:30
sonali	f1810803e1	fix: passing from_date and to_date filters in test cases ... passing from_date and to_date filters in test_linked_payments and test_debit_credit_output for unit testing	2022-12-29 13:07:06 +05:30
sonali	e2614b8a21	fix: pre-commit	2022-12-29 12:21:45 +05:30
sonali	3aaa2f5326	fix: filtered as per reference date ... On bank reconciliation, transactions will be filtered as per date selected in 'from_date' and 'to_date' fields , In dialog, all the bank entries will be fetched as per the posting date selected and if filtered by reference date checkbox is tick then then there will be two fields 'from_reference_date' and 'to_reference_date' then all bank entries in dialog box came as per reference date, selected. And by default journal entry checkbox is tick. Also sorted the bank transactions and bank entries as per ascending order date wise.	2022-12-29 12:05:22 +05:30
Deepesh Garg	617518389a	fix: Conversion factor error for invoices without item code (petty expenses) (#32714) ... * fix: Set default uom conversion factor to 1 for invoices * chore: set default conversion_factor as 1 * chore: remove print statements	2022-12-29 10:41:36 +05:30
Devin Slauenwhite	123920d0bc	feat: add after_refresh hook to item dashboard (#33372) ... * fix: return promise * fix: use after_refresh hook instead of promise # Because there is already a before_refresh hook. I think it makes sense to do the same for after.	2022-12-29 10:31:26 +05:30
ruthra kumar	e3a0ce5d63	fix: use base_net_amount in case of missing stock qty (#33457)	2022-12-29 09:34:51 +05:30
Dany Robert	cabaed9ed2	fix(pricing rule): consider child tables in condition (#33469)	2022-12-28 18:05:55 +05:30
s-aga-r	6f5824cb21	fix: fg_item_qty in non-subcontracted PO	2022-12-28 14:54:24 +05:30
Sabu Siyad	8e271fd719	feat(exotel): make use of CustomField in API (#33338) ... * feat(exotel): pass kwargs for `make_a_call` https://developer.exotel.com/api/make-a-call-api#call-agent Signed-off-by: Sabu Siyad <hello@ssiyad.com> * feat(exotel): map custom field to doctype Signed-off-by: Sabu Siyad <hello@ssiyad.com> Signed-off-by: Sabu Siyad <hello@ssiyad.com>	2022-12-28 08:11:28 +05:30
Deepesh Garg	0b75aa5390	fix: Default dimensions on fetching items from BOM (#33439)	2022-12-27 17:53:43 +05:30
Deepesh Garg	d2686ce75b	fix: Multiple rows for same warehouse and batches in pick list (#33456)	2022-12-27 17:42:03 +05:30
anandbaburajan	21a09e7431	chore: fix patch	2022-12-27 15:01:42 +05:30
anandbaburajan	97f8588202	chore: fix patch name	2022-12-27 15:01:42 +05:30
anandbaburajan	c916fb0513	chore: fix module name in patch	2022-12-27 15:01:42 +05:30
anandbaburajan	57adcc0b03	chore: move patch to pre_model_sync	2022-12-27 15:01:42 +05:30
Anand Baburajan	4ff70db668	Merge branch 'develop' into asset_depreciation_schedule	2022-12-27 14:59:53 +05:30
Deepesh Garg	8263bf9a9a	fix: Random behaviour while picking items using picklist (#33449)	2022-12-27 14:59:35 +05:30
anandbaburajan	482116db9f	chore: improve tests	2022-12-27 10:03:32 +05:30
Anand Baburajan	6f4e6fafa9	Merge branch 'develop' into asset_depreciation_schedule	2022-12-27 07:36:32 +05:30
anandbaburajan	6d791cabd1	chore: more refactoring	2022-12-26 22:13:11 +05:30
Sagar Sharma	88edc412e3	Merge branch 'develop' into fix/purchase-order/shipping_address	2022-12-26 12:00:39 +05:30
s-aga-r	67a7ccf3ce	fix: shipping_address for non-drop shipping item	2022-12-26 11:57:50 +05:30
Deepesh Garg	8a79efab4b	feat: Accounting Dimension updation in Payment Request and Entry (#33411)	2022-12-26 10:17:55 +05:30
Solufyin	7d9f3f23dd	fix: Customer Primary Contact (#33424) ... Co-authored-by: Nihantra C. Patel <n.patel.serpentcs@gmail.com>	2022-12-26 10:15:10 +05:30
Sagar Sharma	32f3b64a89	Merge branch 'develop' into fix/github-issue/32258	2022-12-25 18:12:08 +05:30
s-aga-r	7e1b6b3c2a	fix: shipping_address in PO	2022-12-25 18:11:05 +05:30
anandbaburajan	03662be150	chore: have different functions for draft. active and cancelled depr schedules	2022-12-25 18:05:19 +05:30
ruthra kumar	a0484793c3	refactor: remove unrelated filters from Supplier Ledger Summary ... Territory, Sales Partner and Sales Person doesn't belong in Supplier Ledger	2022-12-24 11:20:39 +05:30
ruthra kumar	89229d9b58	refactor: additional doctype access for 'Accounts User' role	2022-12-24 11:20:16 +05:30
ruthra kumar	bfa511cb65	refactor: hidden columns to help framework handle user permissions ... 'territory', 'supplier_group', 'customer_group' have been added as hidden columns to handle 'user permission' based access control.	2022-12-24 10:30:30 +05:30
rohitwaghchaure	40769998c6	Merge pull request #33422 from rohitwaghchaure/fix-stock-entry-submit-performance ... fix: timeout error while submitting stock entry	2022-12-23 13:57:25 +05:30
Rohit Waghchaure	a05c47e499	fix: timeout error while submitting stock entry ... Co-authored-by: Ankush Menat <ankush@frappe.io>	2022-12-23 13:27:32 +05:30
Anand Baburajan	b17ef34042	Merge branch 'develop' into asset_depreciation_schedule	2022-12-23 11:02:17 +05:30
anandbaburajan	3e91a56c19	chore: only consider draft and active assets in patch, and allow asset depr schedule to be manually createed	2022-12-23 11:01:18 +05:30
ruthra kumar	8f5d8e0474	Merge pull request #33418 from ruthra-kumar/filter_issue_in_ar_ap_report ... fix: payment terms and sales partner filter issue in Accounts Receivable report	2022-12-22 11:38:38 +05:30
ruthra kumar	13c4420f42	fix: payment terms and sales partner filter issue in AR/AP report	2022-12-22 10:55:22 +05:30
ruthra kumar	a26698b88e	Merge pull request #33410 from ruthra-kumar/typeerror_on_gp_due_to_incorrect_warehouse_on_bundle_item ... fix: TypeError on GP Report due to multiple warehouse on bundled items	2022-12-21 18:26:40 +05:30
ruthra kumar	5918bb03f7	test: type error on bundled products with different warehouses	2022-12-21 17:47:57 +05:30
ruthra kumar	e684eb32d0	fix: typerror on multi warehouse in Packed Items ... DN(with bundled item with varying warehouses)-> Sales Invoice.	2022-12-21 15:09:55 +05:30
sonali	81e5f71172	fix: json issue	2022-12-21 14:02:54 +05:30
sonali	6b5276398e	fix: linters	2022-12-21 13:32:16 +05:30
sonali	645869e6ff	feat: added arguments of posting date and reference date	2022-12-21 12:58:30 +05:30
Deepesh Garg	ade83cbab3	fix: Consolidated financial report	2022-12-20 16:45:46 +05:30
Deepesh Garg	1da14b7ec3	Merge pull request #33393 from deepeshgarg007/cc_filter_cashflow_report ... fix: Cost center filter not working in cash flow report	2022-12-20 13:46:18 +05:30
Deepesh Garg	925387550e	Merge pull request #33350 from deepeshgarg007/payment_request_flow ... fix: Payment Request flow fixes from Order to Payment Entry	2022-12-20 13:45:15 +05:30
Deepesh Garg	9dc1509cf5	Merge pull request #33358 from resilient-tech/fix-appointment-booking ... fix: remove unnecessary permissions from Appointment and Appointment Booking Settings	2022-12-20 11:53:01 +05:30
Deepesh Garg	31c95deb88	chore: More fixes	2022-12-20 11:45:51 +05:30
Deepesh Garg	ff48634cbb	Merge branch 'develop' of https://github.com/frappe/erpnext into payment_request_flow	2022-12-20 11:42:15 +05:30
Deepesh Garg	e25b98b620	chore: Update test case	2022-12-20 11:42:05 +05:30
Deepesh Garg	068df9f815	chore: remove print statement	2022-12-20 10:00:53 +05:30
Deepesh Garg	d0dbfec052	fix: Cost center filter not working in cash flow report	2022-12-20 09:59:27 +05:30
rohitwaghchaure	1ed2230e4c	Merge pull request #33382 from rohitwaghchaure/fixed-pick-list-issue ... fix: unsupported operand type(s) for +=: 'int' and 'NoneType'	2022-12-20 09:47:29 +05:30
rohitwaghchaure	eaa04abe29	Merge pull request #33387 from rohitwaghchaure/audit-to-fix-incorrect-valuation-entry ... fix: daily scheduler to identify and fix stock transfer entries having incorrect valuation	2022-12-20 09:46:57 +05:30
Rohit Waghchaure	f31612376a	test: added test case to validate audit for incorrect entries	2022-12-20 00:14:41 +05:30
Rohit Waghchaure	b1721b79ce	fix: daily scheduler to identify and fix stock transfer entries having incorrect valuation	2022-12-19 23:33:44 +05:30
rohitwaghchaure	7851adb49a	Merge branch 'develop' into fixed-pick-list-issue	2022-12-19 23:32:06 +05:30
Ankush Menat	88ce11f03d	fix: incorrect type hints (#33381) ... [skip ci]	2022-12-19 16:44:19 +05:30
Rohit Waghchaure	2b4eae5f84	fix: unsupported operand type(s) for +=: 'int' and 'NoneType'	2022-12-19 16:24:55 +05:30
ruthra kumar	65db9cea25	Merge pull request #33380 from ruthra-kumar/err_for_invoices_should_reflect_in_ar_ap_report ... fix: ERR journals should reported in AR/AP	2022-12-18 16:56:19 +05:30
ruthra kumar	2ed86760d7	test: err for party should be in AR/AP report	2022-12-18 12:40:07 +05:30
ruthra kumar	b09eade3e4	fix: ERR journals reported in AR/AP ... Exchange Rate Revaluation on Receivable/Payable will included in AR/AP report	2022-12-18 06:38:23 +05:30
Gokulnath	4ecce242a8	feat: adding warehouse filter for sales order ananlysis report ... feat: adding warehouse filter for sales order ananlysis report	2022-12-17 20:06:01 +05:30
Deepesh Garg	67c5cec505	Merge pull request #33339 from barredterra/print-rfq ... feat: more control when printing RFQ	2022-12-17 19:24:57 +05:30
Deepesh Garg	6238fd9d9e	Merge pull request #33341 from deepeshgarg007/tds_tcs_cost_center ... fix: Cost Center for tax withholding invoices	2022-12-17 19:24:34 +05:30
sonali	05b6fce03d	feat:filters on bank reconciliation ... Added date filters on bank transactions, payment entries and journal entries and sorted list as per date in ascending order.	2022-12-17 17:15:28 +05:30
Deepesh Garg	2a4eec245a	Merge pull request #33371 from deepeshgarg007/coa_import_srbnb ... fix: Unable to import COA through importer	2022-12-17 16:42:37 +05:30
Deepesh Garg	3b66920342	fix: Unable to import COA through importer	2022-12-16 19:22:29 +05:30
Deepesh Garg	0e86cde64b	Merge branch 'develop' into print-rfq	2022-12-16 16:24:02 +05:30
Sagar Vora	9989ccbb02	Merge branch 'develop' into fix-appointment-booking	2022-12-16 10:36:48 +00:00
Daizy Modi	4802d719ed	fix: removed unused data and minor changes	2022-12-16 15:55:58 +05:30
Deepesh Garg	6bb22c703a	Merge pull request #33275 from pps190/fix-pe-exchange-rate-precision ... fix: use highest precision for exchange rate.	2022-12-16 15:43:36 +05:30
Deepesh Garg	50421b3d7d	Merge pull request #33315 from kunhimohamed/develop ... fix: at create_customer_or_supplier on session creation	2022-12-16 15:04:10 +05:30
Deepesh Garg	b76129c1dd	Merge pull request #33286 from artykbasar/develop ... Subscription Cost center value is fixed to Default value(Bug fix)	2022-12-16 14:44:51 +05:30
Deepesh Garg	5c50a46822	Merge pull request #33362 from deepeshgarg007/exclude_gst_credential_doctype ... feat: Ignore company related doctype for other apps via hooks	2022-12-16 11:07:47 +05:30
Daizy Modi	5d0b5c8d2a	fix: pass necessary params instead of args	2022-12-16 10:10:29 +05:30
Deepesh Garg	1a40c04b72	feat: Ignore company related doctype for other apps via hooks	2022-12-15 18:51:58 +05:30
sonali	408c89df03	Feat:Filter on Payment Entries and Journal Entries ... Applying filters on Payement entries and Journal Entries as per reference date and posting date	2022-12-15 18:09:57 +05:30
rohitwaghchaure	da1d8da355	Merge pull request #33355 from rohitwaghchaure/fixed-do-not-show-disabled-items ... fix: disabled items showing in the report Itemwise Recommended Reorder Level	2022-12-15 18:08:05 +05:30
Daizy Modi	56f3ac15d8	fix: removed unncessary changes	2022-12-15 18:02:14 +05:30
Daizy Modi	4bfe2ea572	fix: agent assignment and permissions for appointment	2022-12-15 17:19:28 +05:30
rohitwaghchaure	5cbbb5d59e	Merge pull request #33354 from rohitwaghchaure/fixed-trivial-discount-amount ... fix: unsupported operand type(s) for +: 'int' and 'NoneType'	2022-12-15 17:13:46 +05:30
Rohit Waghchaure	ae31ff1c48	fix: disabled items showing in the report 'Itemwise Recommended Reorder Level ... '	2022-12-15 17:05:53 +05:30
Daizy Modi	ac51c27500	fix: fetch required details from appointment booking settings	2022-12-15 16:53:51 +05:30
Daizy Modi	9a00b3bdbd	fix: format html of verify email for book appointment	2022-12-15 16:51:00 +05:30
Daizy Modi	25f0b26a17	fix: remove unused page book-appointment	2022-12-15 16:49:23 +05:30
Daizy Modi	ae8dd2b2bc	fix: remove guest role from doctype	2022-12-15 16:47:27 +05:30
Rohit Waghchaure	0f28074e5a	fix: unsupported operand type(s) for +: 'int' and 'NoneType'	2022-12-15 16:36:47 +05:30
ruthra kumar	d126c8030f	Merge pull request #33335 from ruthra-kumar/cost_center_issue_on_reconciliation_tool ... fix: paid invoices shows up as outstanding when 'cost_center' filter is applied	2022-12-15 15:02:18 +05:30
Anand Baburajan	246d3b4075	Merge branch 'develop' into asset_depreciation_schedule	2022-12-15 14:51:16 +05:30
anandbaburajan	a358f77774	chore: move patch to post_model_sync and cancel asset depr schedule properly	2022-12-15 14:50:53 +05:30
ruthra kumar	a998a8a2da	test: cost center should not affect outstanding calculation	2022-12-15 14:28:33 +05:30
Deepesh Garg	dc178984ae	fix: Payment Request flow fixes from Order to Payment Entry	2022-12-15 14:15:20 +05:30
anandbaburajan	7f5e761c04	chore: add patch	2022-12-15 13:13:04 +05:30
Deepesh Garg	3a8a467edb	Merge pull request #33329 from Gokulnath17/Gokulnath_dev ... fix: in gross profit report	2022-12-15 12:01:39 +05:30
Deepesh Garg	076527bb88	Merge pull request #33305 from barredterra/incoterm-named-place ... feat: incoterm named place	2022-12-15 11:59:54 +05:30
Gokulnath	f73976946e	Merge branch 'develop' into Gokulnath_dev	2022-12-15 10:22:49 +05:30
Deepesh Garg	b7e9942681	Merge pull request #33309 from barredterra/refactor-validate_payment_against_negative_invoice ... refactor: translatable strings and guard clause	2022-12-15 09:21:16 +05:30
rohitwaghchaure	9bf2682218	Merge pull request #33323 from barredterra/translate-overbilling-overdelivery ... fix: translatability of warning on overbilling/-receipt/-delivery	2022-12-14 23:24:11 +05:30
Deepesh Garg	26277cfcf3	chore: resolve errors in test	2022-12-14 21:22:48 +05:30
Deepesh Garg	973ef33eb5	fix: Cost Center for tax withholding invoices	2022-12-14 20:41:00 +05:30
barredterra	8717148d9b	feat: improve visibility of default values	2022-12-14 14:14:29 +01:00
barredterra	ce9626fead	feat: more control when printing RFQ	2022-12-14 14:03:36 +01:00
Gokulnath	d404a03947	Merge branch 'develop' into Gokulnath_dev	2022-12-14 17:38:16 +05:30
ruthra kumar	8eb93004f7	fix: cost_center filter fix for 'Get Outstanding Invoice' in PE	2022-12-14 16:16:22 +05:30
rohitwaghchaure	21c86bd649	Merge pull request #33332 from rohitwaghchaure/fixed--missing-required-argument ... fix: get_serial_nos_for_fg() missing 1 required positional argument: …	2022-12-14 16:06:58 +05:30
ruthra kumar	6d9d730759	fix: cost_center filter gives incorrect output ... filtering on cost center gives invoices that are reconciled as having outstanding	2022-12-14 16:05:15 +05:30
Rohit Waghchaure	410a58b3de	fix: get_serial_nos_for_fg() missing 1 required positional argument: 'args'	2022-12-14 15:33:36 +05:30
anandbaburajan	c99cd74a15	chore: handle some error cases and add empty patch file	2022-12-14 13:20:37 +05:30
Gokulnath17	41fc3be339	fixes in gross profit report	2022-12-14 10:46:11 +05:30
barredterra	36997d9788	fix: translation for warning on Overbilling/-receipt/-delivery	2022-12-13 18:59:20 +01:00
Anand Baburajan	8534390627	Merge branch 'develop' into asset_depreciation_schedule	2022-12-13 20:49:06 +05:30
anandbaburajan	22ef342ac7	chore: fixing all tests	2022-12-13 20:48:34 +05:30
anandbaburajan	df134c7c5b	chore: fixing some tests	2022-12-13 16:26:33 +05:30
Nabin Hait	5ea6080a6e	Merge pull request #33300 from ssiyad/fix/pos/var_typo ... fix(pos): variable typo: `s_pos` -> `is_pos`	2022-12-13 15:21:10 +05:30
Nabin Hait	c5d21b2461	Merge pull request #33314 from s-aga-r/fix/github-issue/33145 ... fix: `Enough Parts to Build` in `BOM Stock Report`	2022-12-13 15:19:40 +05:30
ruthra kumar	3db446e35a	Merge pull request #33313 from nabinhait/tax_detail_report_perm_issue ... fix: Permission issue in Tax Detail report	2022-12-13 14:27:08 +05:30
kunhi	15e3b7f218	fix: at create_customer_or_supplier on session creation	2022-12-13 12:41:56 +04:00
Sagar Sharma	f9be137cf5	Merge branch 'develop' into fix/github-issue/33145	2022-12-13 14:00:51 +05:30
s-aga-r	723c64ba73	fix: Enough Parts to Build in BOM Stock Report	2022-12-13 14:00:30 +05:30
Nabin Hait	aa787e4030	fix: Permission issue in Tax Detail report	2022-12-13 13:16:24 +05:30
ruthra kumar	2175784142	Merge pull request #33303 from ruthra-kumar/incorrect_balance_on_consolidate_balance_sheet ... fix: incorrect balance on parent company on consolidate Balance sheet due to key mismatch	2022-12-13 09:04:13 +05:30
barredterra	f20370c5ef	refactor: translatable strings and guard clause	2022-12-13 02:36:12 +01:00
barredterra	e057e1dfe7	feat: incoterm named place	2022-12-12 18:49:47 +01:00
s-aga-r	78b438f6cf	fix: Material Request reference in internal Sales Order	2022-12-12 22:41:44 +05:30
ruthra kumar	7b3316dc31	fix: incorrect balance on parent company due to key mismatch	2022-12-12 20:15:59 +05:30
rohitwaghchaure	5c0f8ee44f	Merge pull request #33281 from tundebabzy/29976 ... fix: maintain same rate throughout sales cycle doesn't work with quotation	2022-12-12 19:30:50 +05:30
Sabu Siyad	7d64bf78cf	fix(pos): variable typo: s_pos -> is_pos ... Signed-off-by: Sabu Siyad <hello@ssiyad.com>	2022-12-12 19:09:00 +05:30
anandbaburajan	28d4942d6c	chore: fix validation and add make_schedules_editable	2022-12-12 18:19:34 +05:30
anandbaburajan	1ea2ba0dea	chore: handle some cases where asset_depr_schedule doesn't exist	2022-12-12 17:31:57 +05:30
anandbaburajan	b997d1eb87	chore: add some validation, shorten some function names	2022-12-12 17:25:38 +05:30
Anand Baburajan	f8cd424559	Merge branch 'develop' into asset_depreciation_schedule	2022-12-12 16:36:59 +05:30
anandbaburajan	ec6505d747	chore: fix some bugs, refactor some functions, add proper notes	2022-12-12 16:35:30 +05:30
Ankush Menat	915e0347b0	chore!: remove activity log feeds (#33294) ... - This contains little to no information and practically no one uses this. - Also causes a lot of problem by adding way too many feeds in activity log to the point where activity page doesn't even load.	2022-12-12 15:14:30 +05:30
Ankush Menat	593626f502	perf: add indexes on payment entry reference (#33288) ... Adds index on: 1. reference doctype 2. reference name *Why not composite index?* There are three type of queries on this doctype - filtering ref_doctype - doctype index helps here - filtering ref_name - name index helps here - filtering both - name index helps here too. Since it has sufficiently high cardinality. Composite index wont help in case where ref_doctype isn't specfied. [skip ci]	2022-12-12 12:58:11 +05:30
artykbasar	d512919f5c	Subscription Cost center value is fixed to Default value(Bug fix) ... self.cost_center field value keeps changing to erpnext.get_default_cost_center(self.get("company")) after validation of this doctype. This overrides the user input. simple fix, it will first check if the field is empty, if empty then puts the company's default cost center value if not then user input will be saved.	2022-12-11 08:51:34 +00:00
Tunde Akinyanmi	71aa8c5e1c	test: refactor test case	2022-12-09 14:33:54 +01:00
Tunde Akinyanmi	d193a14b8f	test: ensure test case sets Selling Settings	2022-12-09 14:09:54 +01:00
anandbaburajan	90e1b9cb3d	chore: fix asset depr schedule notes	2022-12-09 16:18:40 +05:30
Tunde Akinyanmi	97ddfcfc7c	fix: Maintain Same Rate Throughout Sales Cycle doesn't work ... Issue #29976 was partly fixed by #32923 but the problem still persists. The reason is because an incorrect fieldname was passed to the `validate_rate_with_reference_doc` method. This commit fixes it	2022-12-09 10:29:28 +01:00
anandbaburajan	16365bfca3	chore: more refactoring	2022-12-09 14:04:00 +05:30
Devin Slauenwhite	2010b1b6e8	fix: use highest precision for exchange rate.	2022-12-08 16:26:07 -05:00
anandbaburajan	77dc8e7966	fix: bug in posting depr entries	2022-12-09 00:58:19 +05:30
anandbaburajan	187e1a324a	chore: refactor get_depreciable_assets	2022-12-09 00:46:56 +05:30
anandbaburajan	1fd73af744	chore: refactor some reports	2022-12-09 00:28:34 +05:30
Deepesh Garg	6db52930d8	Merge branch 'develop' of https://github.com/frappe/erpnext into buying_selling_pricing_rule	2022-12-08 18:05:05 +05:30
Deepesh Garg	6192af5cf0	chore: Update tests	2022-12-08 18:04:40 +05:30
sonali	8e7c8a6482	Update bank_reconciliation_tool.json ... Adding fields in bank reconciliation tool	2022-12-08 17:23:08 +05:30
Deepesh Garg	b179514273	Merge pull request #33269 from ssiyad/fix/ecommerce/breadcrumb_base ... fix(ecommerce): remove query parameters from referrer	2022-12-08 17:11:34 +05:30
Sabu Siyad	b6bd408f19	fix(ecommerce): remove query parameters from referer ... inclusion of query parameters results in logic failure example: - logic check if referrer is `all-products` - `http://shop.example/all-products` -> `all-products`, valid outcome - `http://shop.example/all-products?start=1` -> `all-products?start=1`, invalid outcome Signed-off-by: Sabu Siyad <hello@ssiyad.com>	2022-12-08 16:47:50 +05:30
Ankush Menat	0b86b1baca	refactor: make payments app a soft dependency (#33245) ... refactor: make payment app a soft dependency	2022-12-08 16:40:13 +05:30
sonali	447272aa4d	Filters on Bank Reconciliation ... Applying date filter on transactions and all the bank entries and also gives the filter the bank entries as per reference date. Sorted all transactions and entries as per date in ascending order. Also added posting date columns in all bank entries and default checkbox tick of journal entry, hide the sales invoice and purchase invoice checkbox.	2022-12-08 16:11:53 +05:30
Deepesh Garg	07c815f35f	Merge pull request #33253 from niyazrazak/patch-9 ... feat: get lead with WhatsApp number	2022-12-08 15:19:13 +05:30
Deepesh Garg	81397ba3ee	Merge pull request #33227 from barredterra/add-translation-variable-order ... fix: add translation variable index	2022-12-08 15:17:07 +05:30
Deepesh Garg	f0487451f7	Merge pull request #33248 from QwQuan/develop ... fix: bugs in zh.csv	2022-12-08 15:16:16 +05:30
sonali	e5a1189bec	Update bank_reconciliation_tool.py ... Applying date filter on transactions and all the bank entries and also gives the filter the bank entries as per reference date. Sorted all transactions and entries as per date in ascending order. Also added posting date columns in all bank entries and default checkbox tick of journal entry, hide the sales invoice and purchase invoice checkbox.	2022-12-08 13:29:28 +05:30
ruthra kumar	1d37c0143f	Merge pull request #33254 from ruthra-kumar/index_error_on_customer_master ... fix: index error on customer master	2022-12-08 12:52:20 +05:30
Rohit Waghchaure	f598da7c81	fix: total value in Warehouse Wise Stock Balance	2022-12-08 00:55:45 +05:30
s-aga-r	632c08f7e0	fix: order status in Production Planning Report	2022-12-07 22:47:06 +05:30
ruthra kumar	cf1e3dc8ea	fix: index error on customer master	2022-12-07 20:48:40 +05:30
MOHAMMED NIYAS	922375c3ba	feat: get lead with WhatsApp number	2022-12-07 17:50:35 +05:30
wuzhouquan	a6fe79f29d	fix: bugs in zh.csv	2022-12-07 15:04:56 +08:00
anandbaburajan	18fc2b5695	chore: fix bug in unlink_asset_reference	2022-12-06 23:34:56 +05:30
anandbaburajan	2cd42dbb10	chore: refactor get_finance_book_value_map	2022-12-06 23:16:02 +05:30
anandbaburajan	e7d404a30a	chore: remove finance_book and finance_book_id from depreciation_schedule and refactor some functions	2022-12-06 21:33:20 +05:30
anandbaburajan	8365d6bdb7	fix: refactor reverse_depreciation_entry_made_after_disposal and fix fb bug	2022-12-06 17:58:38 +05:30
rohitwaghchaure	7cbb6c4de9	Merge pull request #33236 from rohitwaghchaure/feat-warehouse-wise-stock-balance ... feat: warehouse wise stock balance	2022-12-06 17:58:31 +05:30
Deepesh Garg	b602a0dcb0	Merge pull request #33146 from barredterra/reload-currency-exchange-settings ... fix: reload Currency Exchange Settings in patch	2022-12-06 17:38:13 +05:30
Deepesh Garg	26adbc6282	Merge pull request #33192 from deepeshgarg007/bundle_item_rates ... fix: Bundle item rates	2022-12-06 17:37:22 +05:30
Rohit Waghchaure	861aa9e08a	feat: warehouse wise stock balance	2022-12-06 17:33:33 +05:30
Deepesh Garg	c1a82dc9e5	Merge pull request #33191 from ruthra-kumar/key_error_in_profit_loss_report ... fix: key error while filtering on date range and reporting on foreign currency	2022-12-06 15:42:53 +05:30
Deepesh Garg	b1242bc56c	chore: Update tests	2022-12-06 15:14:48 +05:30
Deepesh Garg	af1f98e188	Merge branch 'develop' of https://github.com/frappe/erpnext into bundle_item_rates	2022-12-06 13:59:51 +05:30
Deepesh Garg	e5566b31d5	chore: Consider bundle qty as well	2022-12-06 13:59:45 +05:30
ruthra kumar	a6794c3606	fix: key error on p/l and balance sheet reports on foreign currency	2022-12-06 13:48:46 +05:30
ruthra kumar	19db7e2989	fix: replace sql code with fields list in get_cached_value	2022-12-06 13:48:46 +05:30
Deepesh Garg	01b84a9751	Merge pull request #33194 from barredterra/validate-employee-dates ... refactor: validate dates in Employee	2022-12-06 12:34:15 +05:30
Deepesh Garg	3aa6f97420	Merge pull request #33216 from barredterra/validate-accounts-dates ... refactor: validate dates in accounts module	2022-12-06 12:33:01 +05:30
Deepesh Garg	63393fa503	Merge pull request #33217 from barredterra/validate-project-dates ... refactor: validate dates in project and task	2022-12-06 12:32:27 +05:30
Deepesh Garg	921f8edde8	Merge pull request #33219 from deepeshgarg007/internal_transfer_editable_rate ... fix: Allow item rate updates for non-stock invoices	2022-12-06 09:12:24 +05:30
Raffael Meyer	5853b80d25	Merge branch 'develop' into reload-currency-exchange-settings	2022-12-06 02:30:55 +01:00
Raffael Meyer	8301d3b13f	Merge branch 'develop' into key_error_in_profit_loss_report	2022-12-06 02:08:47 +01:00
barredterra	a26a29f33b	fix: incorrect dates in test records	2022-12-05 19:49:05 +01:00
Raffael Meyer	a074ffa880	Merge branch 'develop' into validate-employee-dates	2022-12-05 19:38:01 +01:00
Raffael Meyer	e526a0e282	Merge branch 'develop' into validate-accounts-dates	2022-12-05 19:37:54 +01:00
Raffael Meyer	a2abc879c9	Merge branch 'develop' into validate-project-dates	2022-12-05 19:37:46 +01:00
barredterra	748c74ba52	fix: add translation variable order	2022-12-05 18:24:22 +01:00
rohitwaghchaure	d0478ec3b8	Merge pull request #33224 from rohitwaghchaure/fixed-partial-work-order-incorrect-batch-picked ... fix: non empty FG batch picked while completing work order	2022-12-05 20:29:19 +05:30
Rohit Waghchaure	713330cbf6	fix: non empty FG batch picked while completing work order	2022-12-05 18:15:13 +05:30
Deepesh Garg	0581000990	fix: Remove free items	2022-12-05 17:59:02 +05:30
ruthra kumar	7bd0e977bf	Merge pull request #33222 from ruthra-kumar/data_import_errors_for_sales_invoice ... fix: data import mandatory account_head, charge_type	2022-12-05 16:56:43 +05:30
ruthra kumar	3814db02eb	fix: data import mandatory account_head, charge_type	2022-12-05 16:24:05 +05:30
Deepesh Garg	55c0770280	Merge branch 'develop' of https://github.com/frappe/erpnext into buying_selling_pricing_rule	2022-12-05 15:43:29 +05:30
Deepesh Garg	5f821b93a5	chore: Add POS Invoices	2022-12-05 15:43:03 +05:30
Deepesh Garg	ef9d126254	fix: Allow item rate udpates for non-stock invoices	2022-12-05 10:17:19 +05:30
anandbaburajan	83ed93fbb6	chore: refactor chart and manual set_accumulated_depreciation logic	2022-12-04 22:45:48 +05:30
barredterra	31db0e7c79	refactor: validate parent_expected_end_date in Task	2022-12-04 15:28:38 +01:00
barredterra	2c4eb371a6	refactor: validate dates in project and task	2022-12-04 15:15:07 +01:00
anandbaburajan	ca8c827492	chore: refactor schedules in split_asset functions	2022-12-04 19:22:58 +05:30
barredterra	eb66b749b2	refactor: validate dates in accounts module	2022-12-04 14:41:21 +01:00
Raffael Meyer	083a954b5d	Merge branch 'develop' into validate-employee-dates	2022-12-04 14:30:51 +01:00
Deepesh Garg	b741ae143c	fix: Reapply pricing rule on qty change	2022-12-02 17:14:06 +05:30
rohitwaghchaure	66dbf94151	Merge pull request #33199 from s-aga-r/refactor/warehouse-tree ... refactor: remove `balance` from `Warehouse Tree`	2022-12-02 14:24:07 +05:30
rohitwaghchaure	295ce0e8e9	Merge pull request #33193 from rohitwaghchaure/clear-repost-logs ... fix: clear repost logs using Log Settings	2022-12-02 13:55:59 +05:30
Rohit Waghchaure	2cce6f2a34	fix: test case	2022-12-02 12:43:31 +05:30
Sagar Sharma	b3ae6cc4b9	Merge branch 'develop' into refactor/warehouse-tree	2022-12-02 10:58:33 +05:30
Deepesh Garg	2058fac177	Merge pull request #33195 from ruthra-kumar/type_error_on_sales_pipeline_report ... fix: type error on Sales Pipeline Analytics	2022-12-02 10:10:36 +05:30
Rohit Waghchaure	5949a7ecff	fix: default clear repost logs	2022-12-01 23:35:21 +05:30
Deepesh Garg	f54838ab56	fix: Buying and selling check in pricing rule	2022-12-01 21:23:17 +05:30
s-aga-r	3ce8386ca3	refactor: remove balance from Warehouse Tree	2022-12-01 19:44:49 +05:30
Deepesh Garg	2106de0fa5	Merge pull request #33170 from deepeshgarg007/se_alert_develop ... fix(UX): Alert on change of item rate in Stock Entry	2022-12-01 18:16:55 +05:30
Deepesh Garg	9ddd838f2d	Merge pull request #33183 from deepeshgarg007/month_end_due_date ... fix: Due date for month end payment term	2022-12-01 18:16:13 +05:30
ruthra kumar	4856e750f9	fix: type error on Sales Pipeline Analytics	2022-12-01 18:08:32 +05:30
barredterra	03f7bfbbde	refactor: validate dates	2022-12-01 12:42:03 +01:00
Deepesh Garg	826f45ad60	fix: Bundle item rates	2022-12-01 16:11:10 +05:30
anandbaburajan	f20238fa3e	chore: use make_new_active_asset_depr_schedules_and_cancel_current_ones instead of prepare_depreciation_data	2022-12-01 15:15:32 +05:30
ruthra kumar	9b8d6fe411	fix: key error while filtering on date range and different currency	2022-12-01 13:38:41 +05:30
Anand Baburajan	5b1743330d	Merge branch 'develop' into invalid_message_fix	2022-12-01 12:35:04 +05:30
Anand Baburajan	2886d8ab5a	Merge branch 'develop' into month_end_due_date	2022-12-01 12:34:51 +05:30
Deepesh Garg	5b1798363c	Merge pull request #33091 from ssiyad/fix/pos/partial_return_amount ... fix(pos): partial return amount update	2022-12-01 11:41:53 +05:30
Sagar Sharma	d892e27289	Merge branch 'develop' into se_alert_develop	2022-12-01 10:37:52 +05:30
Sagar Sharma	93f29d8f08	Merge branch 'develop' into invalid_message_fix	2022-12-01 09:24:40 +05:30
anandbaburajan	827ad01d4f	chore: style	2022-11-30 23:57:26 +05:30
Anand Baburajan	ba38001116	Merge branch 'develop' into asset_last_day_test_bug	2022-11-30 23:53:21 +05:30
anandbaburajan	25522444b8	fix: use is_last_day_of_the_month in test_scrap_asset	2022-11-30 23:25:40 +05:30
Sagar Sharma	0e8edd1ee9	Merge branch 'develop' into se_alert_develop	2022-11-30 22:03:31 +05:30
Deepesh Garg	bfb81ef56f	fix: Due date for month end payment term	2022-11-30 20:53:41 +05:30
Deepesh Garg	64e5a79a91	fix: Error on making stock entry from material request	2022-11-30 19:35:30 +05:30
Sabu Siyad	c5edbe2e2f	fix(lint): trailing whitespace ... Signed-off-by: Sabu Siyad <hello@ssiyad.com>	2022-11-30 17:12:06 +05:30
Sagar Sharma	43d08b4c74	Merge branch 'develop' into se_alert_develop	2022-11-30 10:15:31 +05:30
s-aga-r	ca0485a503	fix: add company filter in RFQ Items	2022-11-30 10:03:36 +05:30
anandbaburajan	96ede2fcf9	fix: bug in new depr schedule	2022-11-29 21:30:23 +05:30
Deepesh Garg	4bd9289d7d	fix(UX): Alert on change of item rate in Stock Entry	2022-11-29 19:21:48 +05:30
Deepesh Garg	3eb1ed19a1	fix: Tax withholding net total for PI in reports	2022-11-29 13:10:31 +05:30
Sagar Sharma	ce7720b14c	Merge branch 'develop' into repost-item-valuation	2022-11-29 11:03:22 +05:30
rohitwaghchaure	6dd84cb977	Merge pull request #33013 from rtdany10/riv-validation ... fix: validate repost item valuation against accounts freeze date	2022-11-29 10:40:48 +05:30
Deepesh Garg	a7b7d0d99d	Merge pull request #33116 from shariquerik/show-batch-selector-only-once ... fix: only show serial no batch selector only once	2022-11-29 10:20:30 +05:30
Deepesh Garg	8253f4379f	Merge pull request #33098 from ssiyad/fix/pos/warehouse_selection ... fix(pos): warehouse selection	2022-11-29 10:15:31 +05:30
Deepesh Garg	56b96f0a9c	Merge branch 'develop' into fix/pos/partial_return_amount	2022-11-29 10:12:29 +05:30
Deepesh Garg	bdb15c3331	Merge pull request #33112 from ssiyad/fix/pos/customer_group_filter ... fix(pos): filter on customer groups	2022-11-29 09:55:56 +05:30
Deepesh Garg	8287fb5104	Merge pull request #33143 from deepeshgarg007/auto_repeat_dates ... fix: Auto repeat date validations	2022-11-29 09:28:19 +05:30
Deepesh Garg	8112493c3c	Merge pull request #33138 from deepeshgarg007/bank_reco_button_fix ... fix(ux): Action buttons in Bank Reconciliation	2022-11-29 09:23:21 +05:30
rohitwaghchaure	a222b0a6ae	Merge pull request #33144 from rohitwaghchaure/fixed-incorrect-stock-balance-qty ... fix: incorrect balance qty	2022-11-29 08:48:03 +05:30
barredterra	06e094b5fc	fix: reload currency exchange settings	2022-11-28 22:58:31 +01:00
Rohit Waghchaure	b606a9684b	test: test case for serialized batched item	2022-11-29 00:08:07 +05:30
Rohit Waghchaure	b2105a8be7	fix: incorrect balance qty	2022-11-28 23:13:30 +05:30
Deepesh Garg	6a47fb6c9e	chore: Update condition	2022-11-28 22:47:44 +05:30
Sagar Sharma	4750bfaeab	Merge branch 'develop' into repost-item-valuation	2022-11-28 22:06:49 +05:30
Deepesh Garg	a9cf9e5a88	Merge pull request #33107 from barredterra/german-tax-templates ... feat: german tax templates	2022-11-28 21:54:08 +05:30
Sagar Sharma	ec95a9b760	Merge branch 'develop' into repost-item-valuation	2022-11-28 21:33:58 +05:30
Sagar Sharma	8948e42a6d	Merge branch 'develop' into repost-item-valuation	2022-11-28 21:29:35 +05:30
s-aga-r	4e10352b48	chore: make posting_date and posting_time read-only if based_on is set to Transaction	2022-11-28 21:22:22 +05:30
s-aga-r	eeec008547	fix: reset voucher_type and voucher_no if based_on is set to Item and Warehouse	2022-11-28 21:22:20 +05:30
Sagar Sharma	6868b4d7c3	Merge branch 'develop' into fix/repost-item-valuation	2022-11-28 21:00:46 +05:30
s-aga-r	eeda264eb6	fix: reposting error AttributeError: 'datetime.timedelta' object has no attribute 'replace'	2022-11-28 20:59:14 +05:30
Deepesh Garg	fa15221455	fix: Auto repeat date validations	2022-11-28 19:22:35 +05:30
s-aga-r	ba77da0874	fix: validation msg in stock entry	2022-11-28 18:01:30 +05:30
Deepesh Garg	6ebe8ad60d	fix(ux): Action buttons in Bank Reconciliation	2022-11-28 17:37:41 +05:30
rohitwaghchaure	b8b9d1b0a8	Merge pull request #33135 from rohitwaghchaure/feat-provision-to-make-mr-for-sub-assembly-items ... feat: make Material Request for sub-assembly items	2022-11-28 16:53:38 +05:30
Rohit Waghchaure	e02f35c8ff	feat: make Material Request for sub-assembly items	2022-11-28 16:20:46 +05:30
ruthra kumar	9fd70a6827	Merge pull request #33115 from ruthra-kumar/duplicate_schema_block ... fix: remove product schema block from additional info section on item template	2022-11-28 15:28:50 +05:30
Deepesh Garg	f6126069ee	Merge pull request #33129 from deepeshgarg007/accounts_settings_fix ... chore: Supplier invoice no field description	2022-11-28 13:05:12 +05:30
Ankush Menat	63b9795d41	fix: opportunity list doesn't show assigned user (#33110) ... Because `db_update` is performed `_assign` property is not updated and hence lead -> opportunity conversion makes it disappear from list view. Steps to reproduce: 1. Create lead 2. Assign anyone 3. Create opportunity from lead. 4. Form view shows assigned user, list view wont.	2022-11-28 10:58:35 +05:30
Deepesh Garg	4f2ece34df	chore: Supplier invoice no field description	2022-11-27 21:50:26 +05:30
Deepesh Garg	dedd722aef	Merge pull request #33022 from barredterra/incoterms ... feat: Incoterms in buying and selling	2022-11-27 20:52:25 +05:30
rohitwaghchaure	397a0e2a3a	Merge pull request #33118 from rohitwaghchaure/production-plan-ux-issues ... fix: production plan UX	2022-11-27 08:46:39 +05:30
s-aga-r	ef7fd670fc	fix: production_item filter in Job Card Summary Report	2022-11-26 16:57:38 +05:30
s-aga-r	481149814e	fix: company name with , in Job Card Summary Report	2022-11-26 16:55:45 +05:30
s-aga-r	2e4f3e9317	fix: Work Order filter typo in Job Card Summary Report	2022-11-26 16:54:53 +05:30
s-aga-r	87b39f045c	fix: company name with , in Work Order Summary Report	2022-11-26 16:39:32 +05:30
Rohit Waghchaure	8cb7112e72	fix: production plan UX	2022-11-26 15:02:27 +05:30
Sagar Sharma	10a2121361	Merge branch 'develop' into show-batch-selector-only-once	2022-11-26 10:09:10 +05:30
Raffael Meyer	905a50cbb2	Merge branch 'develop' into incoterms	2022-11-25 16:50:55 +01:00
Shariq Ansari	0f87d329d6	fix: only show serial no batch selector only once	2022-11-25 17:03:00 +05:30
anandbaburajan	7d09440579	chore: more refactoring	2022-11-25 16:49:44 +05:30
ruthra kumar	2c18a95115	fix: remove duplicate schema	2022-11-25 16:23:45 +05:30
Sabu Siyad	cc63415887	fix(pos): filter on customer groups ... Signed-off-by: Sabu Siyad <hello@ssiyad.com>	2022-11-25 15:10:01 +05:30
Abhinav Raut	fe87c27acd	fix: disbursable amount on currrent security price	2022-11-25 13:20:01 +05:30
barredterra	7fd2639e68	feat: german tax templates	2022-11-25 00:21:33 +01:00
Sagar Sharma	4e7613d4ce	Merge branch 'develop' into fix/github-issue/20496	2022-11-24 20:43:52 +05:30
s-aga-r	df0fee2312	fix: MR Item description and item_name gets reset on qty change	2022-11-24 20:42:57 +05:30
rohitwaghchaure	b0c8643517	Merge pull request #33103 from rohitwaghchaure/fixed-job-card-for-qty-ux ... fix: job card "Qty to Manufacture" UX	2022-11-24 19:24:05 +05:30
Deepesh Garg	541eb7e43b	Merge pull request #33100 from deepeshgarg007/dispatch_address_display ... fix: Dispatch address display	2022-11-24 18:00:26 +05:30
anandbaburajan	4e63ba3ac6	chore: refactor schedules in journal_entry	2022-11-24 17:39:11 +05:30
Rohit Waghchaure	87d37e90a2	fix: job card for quantity UX	2022-11-24 17:29:50 +05:30
Deepesh Garg	104fdcb9f9	fix: Dispatch address display	2022-11-24 16:41:40 +05:30
Sabu Siyad	80813c66e3	Merge branch 'develop' into fix/pos/warehouse_selection	2022-11-24 16:21:54 +05:30