31970 Commits

Author	SHA1	Message	Date
barredterra	5c4eabf075	fix: usage of frappe.db.exists	2022-03-22 13:07:45 +05:30
Marica	387fa61a83	Merge branch 'develop' into product-filter-lookup	2022-03-22 12:13:46 +05:30
Deepesh Garg	01cd9e7c2e	Merge branch 'develop' into opening_too_field_fixes	2022-03-22 11:53:06 +05:30
Deepesh Garg	4e2f866a2a	Merge branch 'develop' into gst_state_number_unsetting	2022-03-22 11:52:55 +05:30
Deepesh Garg	645ed7d0fd	Merge branch 'develop' into sales_person_dashboard	2022-03-22 11:52:36 +05:30
Deepesh Garg	69a4b8c80b	Merge branch 'develop' into bank_transaction_currency_symbol_fixes	2022-03-22 11:52:20 +05:30
HarryPaulo	3eb5440aa9	fix: linters erros on report sales payments summary (#30345) ... * fix: wrong values for report and get change amout based on payment TYPE. * charcase for select field. * fix: linter check erros * fix: linters errors Co-authored-by: Ankush Menat <ankush@frappe.io>	2022-03-22 11:39:15 +05:30
Deepesh Garg	636e7f67eb	fix: Opening invoice tool field placement	2022-03-21 19:34:57 +05:30
Deepesh Garg	e78a445c24	fix: Currency symbol in bank transactions	2022-03-21 19:06:04 +05:30
marination	f6e64c2cac	fix: Product Filters Lookup ... - bind the right classes to the filter lookup field - make class names more descriptive - make filter lookup field more visible with white bg and border - bind lookup input field js in `views.js` - make filter lookup field functioning for atribute filters too - added placeholder to lookup field	2022-03-21 17:58:39 +05:30
Deepesh Garg	1b2c6a5b78	fix: Code cleanup	2022-03-21 17:06:23 +05:30
HarryPaulo	01fd3adedf	fix: report sales payments summary (#30264)	2022-03-21 16:57:27 +05:30
Deepesh Garg	9376d8d308	Merge pull request #30312 from alyf-de/refactor-sales-analytics ... refactor: sales analytics	2022-03-21 16:44:23 +05:30
Deepesh Garg	363e676a35	fix: Reset GST State number	2022-03-21 16:28:17 +05:30
Ankush Menat	d3be84bfe8	test: correct use of test decorator	2022-03-21 15:40:34 +05:30
Rucha Mahabal	95568210b2	fix(ux): warning for disabled carry forwarding in Policy Assignment (#30331)	2022-03-21 15:30:04 +05:30
Saqib Ansari	aff7408775	fix(pos): allow validating stock on save	2022-03-21 14:08:56 +05:30
Saqib Ansari	4afb47e869	fix(pos): specific case when serialized item not removed	2022-03-21 13:24:11 +05:30
Saqib Ansari	2f82e237ef	fix(pos): customer group filter in customer selector	2022-03-21 12:47:35 +05:30
Deepesh Garg	3a7776ea7f	fix: Contribution amount against invoices in Sales Person Dashboard	2022-03-21 12:04:18 +05:30
Saqib Ansari	d5fd8e0ba6	fix: prevent multiple save on applying coupon code	2022-03-21 11:36:30 +05:30
Deepesh Garg	1daaf6be2a	Merge pull request #30317 from deepeshgarg007/opening_gl_validation ... fix: P&L account validation on cancellation	2022-03-21 10:45:07 +05:30
Saqib Ansari	6dc7d6b085	Merge pull request #30287 from nextchamp-saqib/fix-cash-flow-query ... fix: custom cash flow mapper doesn't show any data	2022-03-21 10:32:42 +05:30
Deepesh Garg	28001ddf42	Merge pull request #30304 from deepeshgarg007/enable_ksa_vat_docs ... fix: Add permission for KSA VAT documents	2022-03-21 10:18:40 +05:30
Deepesh Garg	2ff6790283	fix: P&L account validation on cancellation	2022-03-21 09:43:31 +05:30
Raffael Meyer	0a015b7f70	refactor: remove redundant if-statement (#30311)	2022-03-20 19:29:41 +05:30
Ankush Menat	c2aad115c1	fix: disable deferred naming on SLE/GLE if hash method is used. (#30286) ... * fix: dont rename GLE/SLE that dont have naming series * test: tests for deferred naming of ledgers	2022-03-20 19:26:34 +05:30
HENRY Florian	ca8d757691	fix: clear "Retain Sample" and "Max Sample Quantity" in Item card if Has Batch No is uncheck (#30307)	2022-03-20 15:27:00 +05:30
barredterra	36df21067c	refactor: sales analytics	2022-03-20 03:58:24 +01:00
Ankush Menat	4859574233	perf: Single query to delete bins instead of N	2022-03-19 20:55:27 +05:30
Ankush Menat	684d9d66d1	test: warehouse conversion and treeview test	2022-03-19 20:55:27 +05:30
Ankush Menat	953afda01b	refactor(warehouse): raw query to ORM	2022-03-19 20:55:27 +05:30
Ankush Menat	4b695915f4	refactor: Use QB for serial fetching query	2022-03-19 20:55:27 +05:30
Ankush Menat	a585dff6fd	refactor: batch no filter handling	2022-03-19 20:55:27 +05:30
Ankush Menat	b9eec331e3	test: auto serial fetching	2022-03-19 20:55:27 +05:30
Ankush Menat	4f8bb91eae	fix: sort serial nos before sending	2022-03-19 20:55:27 +05:30
Ankush Menat	0a533d6ccc	fix: skip already selected serials in sr selector	2022-03-19 20:55:27 +05:30
Ankush Menat	5ec27c9055	fix: filter serial nos by selected batch number	2022-03-19 20:55:27 +05:30
Ankush Menat	f4c213379e	fix: set current qty as default qty for stock entry	2022-03-19 20:55:27 +05:30
mergify[bot]	c2cbd407c1	fix: Allow on Submit for Material Request Item Required Date (#30174) (#30308) ... * fix: Allow on Submit for Material Request Item Required Date * chore: whitespace (cherry picked from commit cca9668309711bf3ca517726a94df547c5a16bbb) Co-authored-by: Devarsh Bhatt <58166671+bhattdevarsh@users.noreply.github.com> Co-authored-by: Ankush Menat <ankushmenat@gmail.com>	2022-03-19 20:31:06 +05:30
Deepesh Garg	01638a01cb	Merge pull request #30292 from frappe/mergify/bp/develop/pr-30284 ... fix: Cleanup and fixes in Dimension-wise Accounts Balance Report (backport #30284)	2022-03-18 17:36:59 +05:30
Deepesh Garg	972d06555a	fix: Add permission for KSA Vat documents	2022-03-18 17:32:46 +05:30
Ankush Menat	5a9bf9ffd6	fix: respect db multi_tenancy while fetching precision (#30301) ... [skip ci]	2022-03-18 17:29:09 +05:30
Saqib Ansari	00bfee97c7	refactor: convert raw sql to frappe.qb	2022-03-18 14:31:30 +05:30
Deepesh Garg	8819ba07a9	Merge pull request #30266 from deepeshgarg007/expense_income_account_validation ... fix: Validate income/expense account in sales and purchase invoice	2022-03-17 18:32:34 +05:30
Deepesh Garg	5390d5e65a	Merge branch 'develop' into mergify/bp/develop/pr-30284	2022-03-17 18:02:57 +05:30
Deepesh Garg	4237e5d928	fix: Test case	2022-03-17 18:00:39 +05:30
marination	f3715ab382	fix: Test, Sider and Added button to access log from Tool	2022-03-17 17:43:12 +05:30
Deepesh Garg	a651a0ffc8	Merge pull request #30261 from deepeshgarg007/bank_reco_error ... fix: Error in bank reconciliation statement	2022-03-17 17:29:15 +05:30
Deepesh Garg	5f89cb2cca	fix: Remove comments ... (cherry picked from commit cab69fe1f298b44613be21c06591e868c24ee249)	2022-03-17 11:57:50 +00:00
Deepesh Garg	2dd0e20003	fix: Clean and fixes in Dimension-wise Accounts Balance Report ... (cherry picked from commit 08a06ce5c68023c41f53b584082b5e1c4ddb1f59)	2022-03-17 11:57:50 +00:00
rohitwaghchaure	da16ee159a	Merge pull request #30238 from KrithiRamani/bulk_create_PL_and_DN ... feat: Create single PL/DN from several SO.	2022-03-17 15:39:45 +05:30
Rucha Mahabal	f090e63e54	test: fix holiday list creation causing flaky tests (#30260)	2022-03-17 15:21:56 +05:30
marination	3e3af95712	fix: Sider and Linter	2022-03-17 15:03:20 +05:30
Saqib Ansari	119273e633	fix: custom cash flow mapper doesn't show any data	2022-03-17 14:47:50 +05:30
marination	8aff75f8e8	feat: List View indicators for Log and Error Log link in log	2022-03-17 12:58:09 +05:30
marination	cff91558d4	chore: Polish error handling and code sepration ... - Added Typing - Moved all job business logic to bom update log - Added `run_bom_job` that handles errors and runs either of two methods - UX: Replace button disabled until both inputs are filled - Show log creation message on UI for correctness - APIs return log document as result - Converted raw sql to QB	2022-03-17 12:32:37 +05:30
Ankush Menat	76187d175f	refactor: call repost directly during tests (#30277) ... enqueue(now=frappe.flags.in_test) is always true in test, this change avoids confusion.	2022-03-16 19:50:56 +05:30
marination	4283a13e5a	feat: BOM Update Log ... - Created BOM Update Log that will handle queued job status and failures - Moved validation and BG job to thus new doctype - BOM Update Tool only works as an endpoint	2022-03-16 19:47:25 +05:30
Noah Jacob	2a0ca7c91a	refactor: removed unrequired code and test for standalone delivery note serial return (#30276)	2022-03-16 19:27:47 +05:30
Ankush Menat	b93ce78df1	chore: dont supress errors server side ... not required after https://github.com/frappe/frappe/pull/16284	2022-03-16 17:50:34 +05:30
Krithi Ramani	a12895ec03	corrected spacing	2022-03-16 13:56:54 +05:30
Ankush Menat	b46d6e3c05	test: packed item return scenarios	2022-03-16 13:36:53 +05:30
Ankush Menat	b781e8b7d1	revert: "fix: updated packed_items getting fetched on Sales Return / Credit Note (#28607)" ... This reverts commit 20216fa9f1.	2022-03-16 13:36:53 +05:30
Deepesh Garg	2958f60b46	Merge pull request #30269 from deepeshgarg007/implicit_pricing_rule_enable_v2 ... fix: Do not update ignore pricing rule check implicitly	2022-03-16 12:32:25 +05:30
Krithi Ramani	0211f27e83	as per review comments - changed for loop	2022-03-16 12:28:30 +05:30
Deepesh Garg	1f79b47a17	fix: Do not update ignore prcing rule check implicitly	2022-03-16 11:55:43 +05:30
Saqib Ansari	e9e2679dff	Merge pull request #29984 from dj12djdjs/fix-rename-tool-msg ... fix: rename tool show fail message	2022-03-16 10:57:17 +05:30
Saqib Ansari	597bb2c7e8	feat: safely parse exception	2022-03-16 10:53:39 +05:30
Deepesh Garg	06936cf1c0	fix: Validate income/expense account in sales and purchase invoice	2022-03-16 09:02:04 +05:30
Krithi Ramani	e970616b51	removed semicolon for break statement	2022-03-15 21:52:34 +05:30
Krithi Ramani	9f7fee7a4f	Added new field in SO - % Picked	2022-03-15 21:40:51 +05:30
Samuel Danieli	bbe5739547	feat: add German translations	2022-03-15 17:03:30 +01:00
Krithi Ramani	a68213d82e	added new field - Picked Qty, in Sales Order Item	2022-03-15 20:18:23 +05:30
Saqib Ansari	1797b6013e	Merge pull request #30244 from nextchamp-saqib/fix-gl-representation ... fix: incorrect debit credit amount in presentation currency	2022-03-15 18:39:37 +05:30
Deepesh Garg	fbcb413d96	fix: Error in bank reco statement	2022-03-15 18:20:11 +05:30
Saqib Ansari	12d99ed69a	test: foreign_account_balance_after_exchange_rate_revaluation	2022-03-15 17:56:42 +05:30
Marica	b73948660a	Merge pull request #30258 from marination/sub-category-routing ... fix: Sub-Category Routing in Item Group Page Listing pills	2022-03-15 17:29:39 +05:30
marination	8264d6b0bc	fix: Sub-Categpry Routing in Item Group Page Listing pills ... - Use absolute route even 3-4 sub-category levels down - Remove scroll from category pills due to accessibility issues - Arrange sub-category pills alphabetically	2022-03-15 16:53:46 +05:30
Saqib Ansari	7b0a97d679	fix(pos): loyalty points in case of returned pos invoice (#30242)	2022-03-15 15:54:37 +05:30
mergify[bot]	e8310c6dec	fix: Job Card sub operations status and list view (backport #30243) (#30256) ... * fix: show status in job card list view in Draft mode (cherry picked from commit fa32fc3c832196004154055ac1b2334d6202c261) * fix: job card - sub operations table status misbehaviour on pause / resume Job Card (cherry picked from commit 7b8723445ee695e88590bb833f60a0c4731106fa) Co-authored-by: Anoop Kurungadam <anoop@earthianslive.com>	2022-03-15 15:48:15 +05:30
Krithi Ramani	f33a725a9e	fixed spacings	2022-03-15 15:35:51 +05:30
Rucha Mahabal	3218ccbb96	fix: Leave Policy Assignment creation patch (#30215)	2022-03-15 11:43:27 +05:30
Rucha Mahabal	b03b9ac99f	fix: salary slip amount rounding errors (#30248)	2022-03-15 11:39:15 +05:30
Deepesh Garg	8add8eb058	Merge pull request #30230 from deepeshgarg007/vat_amount_in_ksa ... fix: KSA E-Invoice QR Code showing wrong VAT amount	2022-03-14 21:47:22 +05:30
Deepesh Garg	07715118cf	Merge pull request #30206 from deepeshgarg007/implicit_pricing_rule_enable ... fix: Do not update ignore prcing rule check implicitly	2022-03-14 21:46:24 +05:30
Saqib Ansari	83a5fae591	fix: incorrect debit credit amount in presentation currency	2022-03-14 20:14:46 +05:30
Deepesh Garg	e33d4713cd	Update erpnext/regional/saudi_arabia/utils.py ... Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com>	2022-03-14 18:35:49 +05:30
Ankush Menat	8e559f01c8	test: refactor BOM quality template test	2022-03-14 18:28:08 +05:30
Florian HENRY	9415229e8d	fix: BOM - clear Quality Inspection Template according to Inspection Quality Required ... Squashed commit of the following: commit b73fa210b234d2c8067db2c32f94f362b89afe5a Author: Florian HENRY <florian.henry@open-concept.pro> Date: Mon Mar 14 08:30:24 2022 +0100 add json tes commit 984d015a7d9aceb6ea64be7ed9f1cc0caa356714 Author: Florian HENRY <florian.henry@open-concept.pro> Date: Mon Mar 14 08:30:06 2022 +0100 better test commit 42061146658598da02eda7cb781bd2cf44c8ca34 Author: Florian HENRY <florian.henry@open-concept.pro> Date: Fri Mar 11 16:12:57 2022 +0100 update test commit 6259c0957566600b044fcd4a5e14e69cdff71020 Author: Florian HENRY <florian.henry@open-concept.pro> Date: Fri Mar 11 13:59:13 2022 +0100 update test commit cbc4ad9566f6f7f01dd622651458fea309d80954 Merge: faa44b3fdd 94d0f8d4e7 Author: Florian HENRY <florian.henry@open-concept.pro> Date: Fri Mar 11 12:46:48 2022 +0100 Merge branch 'develop' of https://github.com/frappe/erpnext into dev_fix_30190 commit faa44b3fdd983adfc04bbf04a7ebfef114501bb3 Author: Florian HENRY <florian.henry@open-concept.pro> Date: Fri Mar 11 12:03:35 2022 +0100 fix: clear Quality Inspection Template according to Inspection Quality Required	2022-03-14 18:25:00 +05:30
Wolfram Schmidt	7537dac2a4	fix: translation for accounting ... "Aufwand" rather than "Auslage". This is commonly used in accounting.	2022-03-14 18:22:07 +05:30
Deepesh Garg	1faca0eb5a	Merge branch 'develop' into vat_amount_in_ksa	2022-03-14 17:36:16 +05:30
Krithi Ramani	466df6bdb7	to enable selection of SO irrespective of customer,removed validation for customer	2022-03-14 17:29:02 +05:30
Ankush Menat	07712af357	Merge pull request #30233 from frappe/mergify/copy/develop/pr-30216 ... fix: max_qty validation condition in WO (copy #30216)	2022-03-14 17:22:30 +05:30
Krithi Ramani	61eb9b6c68	feat: Create single PL/DN from several SO. New PR from latest develop to avoid rebase	2022-03-14 17:20:49 +05:30
Deepesh Garg	25a128220a	Merge pull request #30207 from deepeshgarg007/trail_balance_for_party ... fix: Do not consider cancelled entries	2022-03-14 17:19:34 +05:30
Deepesh Garg	be56efad26	fix: Itemised tax rate updation	2022-03-14 17:17:01 +05:30
Ankush Menat	02d64a32c2	fix(ux): negative stock warning	2022-03-14 17:16:39 +05:30
Sagar Sharma	884cd814bc	test: add test for planned_qty ... (cherry picked from commit b22bdc5ff762d41242c742bb3f6fda64eb98fd2e)	2022-03-14 11:31:52 +00:00
Sagar Sharma	3b86d6c73c	fix: max_qty validation condition ... (cherry picked from commit d198c488a4071d13d0891d87f790562febd44b3e)	2022-03-14 11:31:52 +00:00
Deepesh Garg	3cc2e53b08	fix: Linting Issue	2022-03-14 16:27:04 +05:30
marination	a579a211fd	chore: Re-arrange fields for consistency with base currency LHS	2022-03-14 16:15:12 +05:30
Deepesh Garg	b37559c535	fix: KSA E-Invoice QR Code showing wrong VAT amount	2022-03-14 16:13:35 +05:30
marination	dcd88ddc87	fix: Add missing currency option in Supplier Quotation's rounded_total field	2022-03-14 15:57:24 +05:30
Deepesh Garg	2b6e7963f6	Merge branch 'develop' into implicit_pricing_rule_enable	2022-03-14 15:49:21 +05:30
Noah Jacob	60c4593f7b	chore: removed unrequired batch_no parameter while fetching stock_balance	2022-03-14 15:36:56 +05:30
Noah Jacob	00797fa02d	test: checking balance serial nos in stock ledger report	2022-03-14 15:36:56 +05:30
Noah Jacob	e8ba1f4e74	fix: incorrect balance serial no in stock ledger report	2022-03-14 15:36:56 +05:30
Ankush Menat	6ee904d641	test: dont resubmit work order	2022-03-14 15:13:37 +05:30
mergify[bot]	12696ffeb4	fix: Search query of payroll entry reference in Journal Entry (#30225) (#30226) ... (cherry picked from commit 98a67967a38c4e5b7b1977c4257bd0b23c57eded) Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2022-03-14 14:44:02 +05:30
Ankush Menat	d3e90ed8c8	fix(patch): remove dead links to ProdPlan Item	2022-03-14 14:15:43 +05:30
Ankush Menat	1af13ca4bf	fix(ux): remove get item buttons from submitted production plan	2022-03-14 14:15:43 +05:30
Saqib Ansari	c1740ced97	fix: cannot create multicurrency sales order with product bundles (#30166)	2022-03-14 13:43:55 +05:30
Saqib Ansari	f5f6650779	Merge pull request #30217 from nextchamp-saqib/fix-so-to-po ... fix: cannot create purchase order from sales order	2022-03-14 12:35:32 +05:30
Saqib Ansari	935218598a	Merge pull request #30198 from nextchamp-saqib/pos-fixes-#12 ... fix(pos): do not reset mode of payments in case of consolidation	2022-03-14 12:34:40 +05:30
Saqib Ansari	58804b8436	fix: cannot create purchase order from sales order	2022-03-14 12:31:13 +05:30
Saqib Ansari	2e265d9bf6	test: mode of payments in case of consolidation	2022-03-14 11:02:33 +05:30
Ankush Menat	941ea1ec74	fix(ux): skip items without batch series	2022-03-14 10:25:18 +05:30
Ankush Menat	91fd9d917a	test: negative fifo test	2022-03-14 10:25:18 +05:30
Rucha Mahabal	211916bfce	Merge branch 'develop' into leave-opening-balance	2022-03-13 20:30:36 +05:30
Rucha Mahabal	d61c437588	fix: flaky tests	2022-03-13 20:30:18 +05:30
Deepesh Garg	835c029e53	Merge pull request #29979 from deepeshgarg007/bank_reco_multicurrency_fix ... fix: Multi-currency bank reconciliation fixes	2022-03-13 20:27:04 +05:30
Rucha Mahabal	558650bc3a	fix: add more type hints	2022-03-13 20:02:51 +05:30
Deepesh Garg	5ae610bd32	Merge pull request #30039 from deepeshgarg007/gstr_3b_nil_exempt_fixed ... fix: Nil and Exempted values in GSTR-3B Report	2022-03-13 20:00:48 +05:30
Ankush Menat	1a256c62c4	fix: attach sr no si standalone credit note	2022-03-13 19:00:34 +05:30
Ankush Menat	1c37d2711a	test: standalone SI creates and attaches serial nos	2022-03-13 19:00:34 +05:30
Deepesh Garg	6308e1be91	fix: Do not consider cancelled entries	2022-03-13 18:13:12 +05:30
Deepesh Garg	96b5cedcf8	fix: Do not update ignore prcing rule check implicitly	2022-03-13 17:48:37 +05:30
Deepesh Garg	22dfd5a4b1	Merge pull request #30152 from deepeshgarg007/sales_purchase_retrun_optimization ... fix: Sales and Purchase return optimization	2022-03-13 17:13:53 +05:30
Deepesh Garg	60ba0ba219	Merge branch 'develop' into loan_cost_center	2022-03-13 12:50:27 +05:30
Deepesh Garg	e4e38ad60b	Merge branch 'develop' into sales_purchase_retrun_optimization	2022-03-13 12:45:10 +05:30
Saqib Ansari	e8a7a54d5a	fix(pos): do not reset mode of payments in case of consolidation	2022-03-12 19:20:48 +05:30
mergify[bot]	b085e96a12	revert: "Merge pull request #29290 from s-aga-r/fix/delivery-note/billed-amount" (#29782) (#29807) ... * Revert "Merge pull request #29290 from s-aga-r/fix/delivery-note/billed-amount" This reverts commit 038f94955006c88209f9df28e3a785c59a4ddb28, reversing changes made to c7b491843476bca89be02851ccafb7e409876609. * fix: linter (cherry picked from commit 7fa46f77e0bdbc516b3c0cb0fb20594ee7fa398b) # Conflicts: # erpnext/patches.txt Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>	2022-03-11 18:28:50 +05:30
Ankush Menat	94d0f8d4e7	test: actual bom naming test	2022-03-11 17:11:22 +05:30
Rohan Bansal	67d8a7ba86	fix: cancelled document check	2022-03-11 17:11:22 +05:30
Ankush Menat	6b58d53403	refactor: split versioning code for testability	2022-03-11 17:11:22 +05:30
Rohan Bansal	7f2670941c	fix: improve bom autoname logic	2022-03-11 17:11:22 +05:30
Ankush Menat	e2c99e02a9	test: bom for item_code that is >VARCHAR_LEN	2022-03-11 17:11:22 +05:30
Rohan Bansal	d9c91748f4	fix: if an item code is too long, truncate before setting BOM name	2022-03-11 17:11:22 +05:30
Abhinav Raut	8c76a76154	fix: incorrect payable amount for loan closure	2022-03-11 16:46:30 +05:30
Abhinav Raut	4e92926a52	fix: incorrect payable amount for loan closure ... - Add penalty amount to payable amount for loan closure	2022-03-11 16:44:21 +05:30
Rucha Mahabal	8173e6a8ea	fix: simplify insufficient leave balance message	2022-03-11 15:30:01 +05:30
Deepesh Garg	13dce71c21	Merge pull request #30181 from deepeshgarg007/shipping_rule_application ... fix: Shipping rule application fixes	2022-03-11 12:04:12 +05:30
Deepesh Garg	d596e0e4df	fix: Shipping rule application fixes	2022-03-10 20:56:36 +05:30
Ankush Menat	472fe8e319	test: submit PR directly	2022-03-10 18:08:29 +05:30
Ankush Menat	6c54be0dcd	test: flaky MR report test ... all test records are on same day so sorting was random in report rows.	2022-03-10 18:08:29 +05:30
Ankush Menat	7dd10367f4	fix: only update valuation rate if not None	2022-03-10 18:08:29 +05:30
Ankush Menat	362102e802	fix: dont hardcode hour rate precision	2022-03-10 17:23:50 +05:30
Ankush Menat	18e2a33a9b	fix: fetch new fields in bom from routing	2022-03-10 17:23:50 +05:30
Ankush Menat	73901aad6f	fix: handle duplicate bins during item merge renames	2022-03-10 17:01:22 +05:30
Ankush Menat	b4d4ae6aa3	test: refactor item merge test and disable commits	2022-03-10 17:01:22 +05:30
Ankush Menat	4126455975	fix: dont reset UOM in MR on every get_item_detail call (#30164)	2022-03-10 15:43:09 +05:30
Rucha Mahabal	b2c549a464	fix: conflicts	2022-03-10 15:41:14 +05:30
Raffael Meyer	6794148c04	fix(lead): reload contact before updating links (#29966) ... * fix(lead): reload contact before updading links Contact might have changed since it was created. * refactor: reload contact after insert	2022-03-10 14:47:29 +05:30
Rucha Mahabal	79b0354efc	Merge branch 'develop' into leave-opening-balance	2022-03-10 14:45:46 +05:30
Marica	93e9fe8327	Merge pull request #30160 from marination/cart-without-checkout ... fix: 'save_quotations_as_draft' checkbox not honoured	2022-03-10 14:37:58 +05:30
Saqib Ansari	390feeaa73	Merge pull request #30103 from ChillarAnand/party ... fix: Ignore missing customer group while fetching price list	2022-03-10 14:36:19 +05:30
Rucha Mahabal	9fae89ff61	fix: flaky tests (#30154)	2022-03-10 14:22:12 +05:30
Deepesh Garg	a5befb6bf8	fix: Update modified timestamp	2022-03-10 14:18:54 +05:30
Marica	8486f5f321	Merge branch 'develop' into bom-update-tool	2022-03-10 13:56:38 +05:30
Saqib Ansari	e5fb871ef4	fix: Ignore missing customer group while fetching price list	2022-03-10 13:54:43 +05:30
marination	a13e06156b	fix: 'save_quotations_as_draft' checkbox not honoured ... - Make sure `request_for_quotation` considers `save_quotations_as_draft` - Added test for checkout disabled quote	2022-03-10 13:54:00 +05:30
Saqib Ansari	9dc9758522	Merge branch 'develop' of https://github.com/frappe/erpnext into party	2022-03-10 13:51:36 +05:30
Himanshu	5193a63781	fix: do not reset asset_category (#29696)	2022-03-10 13:43:35 +05:30
Deepesh Garg	e9d458b822	fix: Update party type	2022-03-10 12:29:17 +05:30
Deepesh Garg	5d66cc4c4a	fix: Add cost center in loan document	2022-03-10 12:22:37 +05:30
Saqib Ansari	8021572432	Merge branch 'develop' into fix-psoa-template	2022-03-10 12:17:11 +05:30
Ankush Menat	84568ac341	chore: imports	2022-03-10 11:20:23 +05:30
Saqib Ansari	5d5ae16fe5	fix(psoa): no such element: dict object['account']	2022-03-10 11:12:33 +05:30
Saqib Ansari	45c1d83ea1	Merge pull request #30145 from nextchamp-saqib/add-filter-to-psoa ... fix(psoa): add company filter to account	2022-03-10 10:53:52 +05:30
Deepesh Garg	395b15058c	fix: Sales and Purchase retrun optimization	2022-03-10 10:50:03 +05:30
Rucha Mahabal	f066427913	fix: program enrollment button labels (#30148)	2022-03-10 10:06:07 +05:30
marination	f57725f8fa	refactor: Add exception handling in background job within BOM Update Tool	2022-03-09 19:03:07 +05:30
Saqib Ansari	fc42041f8f	fix(psoa): add company filter to account	2022-03-09 18:04:35 +05:30
Chillar Anand	fe4b6771b5	refactor: Remove dead code (#30140)	2022-03-09 17:16:05 +05:30
Chillar Anand	b1c8a4543d	test: Added test for monthly attendance report (#29989) ... Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2022-03-09 17:05:00 +05:30
Rucha Mahabal	921d6b25d7	chore: linter issue	2022-03-09 16:58:15 +05:30
Deepesh Garg	45eed7167c	Merge pull request #29654 from alyf-de/revert-bu-schluessel ... revert: BU Schlüssel (a21f76f)	2022-03-09 16:48:54 +05:30
Marica	2661cb2c14	Merge pull request #30091 from marination/item-group-filters-listing ... feat: Include child item group products in Item Group Page & cleanup	2022-03-09 16:46:01 +05:30
Saqib Ansari	4d8798b0ea	fix: ignore non-unique swift numbers while migrating (#30132)	2022-03-09 16:41:54 +05:30
Saqib Ansari	17e16247b1	Merge pull request #30114 from nextchamp-saqib/fix-#23231 ... perf(asset): fetch only distinct depreciable assets	2022-03-09 16:41:08 +05:30
Rucha Mahabal	9b152e93cf	Merge branch 'develop' into leave-opening-balance	2022-03-09 16:40:26 +05:30
Rucha Mahabal	97b7b5012e	test: separate leave ledger entries for leave applications across allocations	2022-03-09 16:35:25 +05:30
Rucha Mahabal	70239158b9	fix: boundary determination for separate ledger entries	2022-03-09 16:18:23 +05:30
marination	7b37a74023	fix: Linter	2022-03-09 16:04:12 +05:30
Rucha Mahabal	6755d6e6f5	test: leave application validations	2022-03-09 15:48:57 +05:30
Deepesh Garg	9b8258479c	fix: Update timestamp	2022-03-09 15:43:26 +05:30
Deepesh Garg	8a2fe7a2e3	fix: Remove tax invoice no field	2022-03-09 15:42:06 +05:30
Ankush Menat	64905188c4	fix: dont fetch entire barcode table in get_item_details (#30131)	2022-03-09 15:37:14 +05:30
Deepesh Garg	e192956520	Merge pull request #30096 from deepeshgarg007/debit_note_ux ... fix(ux): Improve label for better understanding	2022-03-09 15:34:11 +05:30
Marica	7555e1548b	Merge branch 'develop' into item-group-filters-listing	2022-03-09 15:33:04 +05:30
Deepesh Garg	5526f852e8	Merge branch 'develop' into asset-translates	2022-03-09 14:43:57 +05:30
marination	3507cf5985	test: Test include_descendants in Item Group Product Listing ... - Also made include_descendants field's visibility dependant on show_in_website	2022-03-09 13:50:24 +05:30
Rucha Mahabal	a504ffcc4c	fix: clearer validation/warning messages for insufficient balance in leave application	2022-03-09 13:49:07 +05:30
Saqib Ansari	a02e39e986	Merge branch 'develop' into fix-#23231	2022-03-09 12:31:23 +05:30
Mohammed Yusuf Shaikh	700e65959a	fix: default log date needed to query records (#29951)	2022-03-09 11:42:50 +05:30
Saqib Ansari	8a52f59199	Merge branch 'develop' into fix-#23231	2022-03-09 11:42:46 +05:30
Saqib Ansari	baee5d109e	Merge pull request #30110 from nextchamp-saqib/fix-customer-credit-limit-update ... fix: customer credit limit validation on update	2022-03-09 11:42:14 +05:30
mergify[bot]	aadca02018	fix: add filters in default_discount_account (#30095) (#30125) ... (cherry picked from commit 3d8eaa5392fcc420820ac86eb01a6cf67cec1cc7) Co-authored-by: Mohamed-D-Ouf <65343412+Mohamed-D-Ouf@users.noreply.github.com>	2022-03-09 11:27:15 +05:30
Saqib Ansari	e6666609e3	Merge branch 'develop' into fix-#23231	2022-03-09 11:08:45 +05:30
Rucha Mahabal	c0f1e269e4	feat: split ledger entries for applications created across allocations ... - fix: ledger entry for expiring cf leaves not considering holidays	2022-03-09 10:25:49 +05:30
Deepesh Garg	9be3bc1dbf	Merge pull request #30080 from deepeshgarg007/item_wise_sales_history ... fix: Item-wise sales history report	2022-03-09 10:18:14 +05:30
Deepesh Garg	e829f65fde	Merge pull request #30102 from deepeshgarg007/pick_list_query ... fix: Ambigous column in picklist query	2022-03-09 10:17:26 +05:30
Rucha Mahabal	096092f173	fix: leave allocation records query (#30118)	2022-03-08 23:16:40 +05:30
Chillar Anand	ce27cdb121	test: Fix flaky tests (#30107)	2022-03-08 23:07:23 +05:30
Deepesh Garg	816e12dafc	Merge branch 'develop' into mergify/bp/develop/pr-29714	2022-03-08 21:40:00 +05:30
Saqib Ansari	0840acc653	Merge branch 'develop' into fix-#23231	2022-03-08 17:29:26 +05:30
Saqib Ansari	1061256358	Merge branch 'develop' into fix-customer-credit-limit-update	2022-03-08 16:01:17 +05:30
Saqib Ansari	66f20209f6	perf(asset): fetch only distinct depreciable assets	2022-03-08 15:57:54 +05:30
Saqib Ansari	a0dc79332d	fix: customer credit limit validation on update	2022-03-08 15:21:27 +05:30
Rucha Mahabal	430bf00458	fix: add type hints for employee leave balance report	2022-03-08 13:36:08 +05:30
Saqib Ansari	56eb485eec	Merge pull request #30097 from nextchamp-saqib/fix-pos-round-off ... fix(pos): multiple pos round off cases	2022-03-08 11:24:47 +05:30
mergify[bot]	7a3d30161f	fix: translate error message titles (#30105) ... (cherry picked from commit 456ebc32f00be56cc9972cc76ac412776581060a) Co-authored-by: Türker Tunalı <turker.tunali@gmail.com>	2022-03-08 10:42:30 +05:30
Chillar Anand	282e9f83b9	Merge branch 'develop' into party	2022-03-08 09:53:03 +05:30
Deepesh Garg	83dd3bd7fc	Merge pull request #29940 from deepeshgarg007/item_discounts_quotation ... fix: Item discounts for quotation and other docs	2022-03-08 09:08:51 +05:30
ChillarAnand	9ace7d606c	fix: Ignore missing customer group while fetching price list	2022-03-08 08:44:48 +05:30
Deepesh Garg	d9d4c2ce79	fix: Remove unintentional changes	2022-03-08 07:56:44 +05:30
Deepesh Garg	517fbf1d1f	fix: Ambigous column in picklist query	2022-03-07 22:31:42 +05:30
Saqib Ansari	72fab9ba1e	Merge branch 'develop' into fix-pos-round-off	2022-03-07 20:22:20 +05:30
Dany Robert	748d5c4873	fix: wrong payment days in salary slip for employees joining/leaving during mid payroll dates (#29082) ... Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2022-03-07 19:57:57 +05:30
Saqib Ansari	a13624d78b	Merge branch 'develop' into fix-pos-round-off	2022-03-07 18:24:13 +05:30
Saqib Ansari	17445c7e04	fix(pos): multiple pos round off cases	2022-03-07 18:01:07 +05:30
Deepesh Garg	f3a95d3c27	fix(ux): Improve label for better understanding	2022-03-07 16:10:26 +05:30
Marica	ee43f83ff8	Merge branch 'develop' into item-group-filters-listing	2022-03-07 13:18:38 +05:30
marination	b2755f6fdd	feat: Include child item group products in Item Group Page & cleanup ... - Added 'Include descendants' checkbox, which will pull child item group products too - Build item group filters in query engine file - Include logic in filter engine - Clean up Website section of Item Group page (UX) - Add util to fetch child item groups including self	2022-03-07 13:02:08 +05:30
Saqib Ansari	385830bb51	Merge pull request #30084 from nextchamp-saqib/remove-einv-batch ... fix(e-invoicing): remove batch no from e-invoices	2022-03-07 11:53:09 +05:30
Saqib Ansari	031a0dd703	fix(e-invoicing): remove batch no from e-invoices	2022-03-07 11:40:01 +05:30
Marica	7579981fb5	Merge pull request #29987 from marination/mr-to-order-and-receive-report ... fix: Get MRs that are yet to be received but fully ordered in Report `Requested Items to Order and Receive`	2022-03-07 10:18:28 +05:30
Deepesh Garg	e2c144e9e3	fix: Item-wise sales history report	2022-03-06 19:05:02 +05:30
Deepesh Garg	c6c51d7312	Merge branch 'develop' into gstr_3b_nil_exempt_fixed	2022-03-06 18:09:38 +05:30
Deepesh Garg	629a296fb6	Merge branch 'develop' into bank_reco_multicurrency_fix	2022-03-06 18:09:30 +05:30
Deepesh Garg	428415ed55	Merge pull request #30040 from frappe/mergify/bp/develop/pr-30025 ... fix: Exchange rate not getting set in payment entry (backport #30025)	2022-03-06 18:07:35 +05:30
Ankush Menat	9ef35ef773	fix: dont hardcode precision in routing ... Co-Authored-By: Suraj Shetty <surajshetty3416@gmail.com>	2022-03-02 18:27:22 +05:30
Ankush Menat	f8ac4c082a	fix: remove dead dashboard links	2022-03-02 18:27:22 +05:30
Saqib Ansari	cd2513ceec	Merge pull request #29939 from nextchamp-saqib/ordered-qty-for-packed-items ... feat: update ordered qty for packed items	2022-03-02 17:10:20 +05:30
Ankush Menat	55a966ec41	chore: get stock reco qty from SR instead of SLE (#30059) ... [skip ci]	2022-03-02 14:49:45 +05:30
Rucha Mahabal	b988046082	fix(Timesheet): fetch exchange rate only if currency is set (#30057)	2022-03-02 14:15:22 +05:30
Ankush Menat	90af40ac3c	Merge pull request #30055 from resilient-tech/fix-install-fixtures ... fix: handle `ImportError` when installing country fixtures	2022-03-02 14:11:23 +05:30
Ankush Menat	3638fbf06b	fix: repost items with repeating item-warehouses	2022-03-02 13:11:04 +05:30
Ankush Menat	701878f60b	revert "fix: FIFO valuation in case of multi-item entries" ... This reverts commit b8ee193d1a124668691b3d8181ce4e3bf612afe0. This is huge performance regression for large docs.	2022-03-02 13:11:04 +05:30
Ankush Menat	2f71c5bcca	test: repack FIFO rates	2022-03-02 13:11:04 +05:30
Ankush Menat	ccd2ce56b1	fix: FIFO valuation in case of multi-item entries	2022-03-02 13:11:04 +05:30
Ankush Menat	b3b7cdfb49	test: FIFO transfer for multi-batch transaction	2022-03-02 13:11:04 +05:30
marination	54b3676f35	fix: linter (imports alphabetical)	2022-03-02 13:09:34 +05:30
Sagar Vora	89368ece41	style: use f-string	2022-03-02 12:40:25 +05:30
Sagar Vora	98f26e9cbb	fix: handle ImportError when installing country fixtures	2022-03-02 12:39:00 +05:30
Ankush Menat	5d85b35f41	test: fix flaky bin value test	2022-03-02 12:32:54 +05:30
Ankush Menat	eb8495a401	docs: explain make_sl_entries arguments	2022-03-02 12:27:18 +05:30
Ankush Menat	efc4b943f8	fix: ignore serial no during landed cost voucher	2022-03-02 12:27:18 +05:30
Marica	e0d5c6118f	Merge branch 'develop' into mr-to-order-and-receive-report	2022-03-02 12:14:50 +05:30
Saqib Ansari	89f87cee87	Merge branch 'develop' into ordered-qty-for-packed-items	2022-03-02 12:13:56 +05:30
Deepesh Garg	d95f8934aa	fix: Test cases with discount	2022-03-01 23:09:59 +05:30
Rucha Mahabal	9988ec697f	test: test advance filters in expense claim and cancelled status	2022-03-01 21:40:39 +05:30
Rucha Mahabal	57f92df108	fix: flake8 issues	2022-03-01 20:50:36 +05:30
Rucha Mahabal	650099ee65	Merge branch 'develop' into emp-adv-status	2022-03-01 20:30:58 +05:30
Deepesh Garg	2eb7921bff	fix: Exchange rate not getting set in payment entry ... (cherry picked from commit 86e6bdf2c9ffc0a656c14663b6f790071a7f3afd)	2022-03-01 12:49:09 +00:00
Ankush Menat	65bb727030	fix: dont validate empty category	2022-03-01 17:47:47 +05:30
Deepesh Garg	abe580e8b0	fix: Nil and Exempted values in GSTR-3B Report	2022-03-01 17:37:38 +05:30
marination	ac425722e2	fix: Sider and Linter	2022-03-01 17:30:37 +05:30
marination	e6952cb7f9	refactor: Convert to QB, added test file, removed white space ... - Converted mysql raw query to qb - Test file for Report Requested Items to Order and Receive - Removed white space and edited copyright year	2022-03-01 17:15:04 +05:30
marination	1d1d586d4d	test: Included sub assembly non-merging in test case	2022-03-01 15:42:34 +05:30
Marica	d2f1c4f307	Merge branch 'develop' into prod-plan-sub-items-aggregate	2022-03-01 15:33:02 +05:30
Saqib Ansari	056a0ec421	Merge pull request #30034 from nextchamp-saqib/fix-pos-flaky-test ... fix(test): flaky test_point_of_sale	2022-03-01 15:32:33 +05:30
Saqib Ansari	47fe87a72f	fix(test): flaky test_point_of_sale	2022-03-01 14:56:24 +05:30
Saqib Ansari	6b494eed79	Merge pull request #30032 from nextchamp-saqib/fix-debit-credit-diff ... fix: debit credit difference case with rounding adjustment	2022-03-01 14:12:31 +05:30
Saqib Ansari	ad2c64f3ff	fix: debit credit difference case with rounding adjustment	2022-03-01 13:32:34 +05:30
Ankush Menat	d22a1d440c	fix: track changes on warehouse	2022-03-01 13:08:25 +05:30
Marica	5a8c80b153	Merge branch 'develop' into mr-to-order-and-receive-report	2022-03-01 13:01:35 +05:30
marination	ffbb2c8311	fix: Assert False for test that is anticipating an empty table and remove second arg to assertTrue	2022-03-01 12:57:09 +05:30
Deepesh Garg	0542416c47	Merge pull request #30026 from deepeshgarg007/deferred_revenue_post_accounts_freeze ... fix: Deferred revenue booking	2022-03-01 12:41:41 +05:30
marination	25fa6344a6	test: Adjust test as per teardown ... - make tests use multi level bom in WO, as BOM at setup is used - earlier, an intermediate BOM made in a test would override the BOM at setup	2022-03-01 12:24:45 +05:30
Deepesh Garg	366120ffee	fix: Deferred revenue booking	2022-03-01 11:57:34 +05:30
Ankush Menat	afb69b0b7f	Merge branch 'develop' into item_discounts_quotation	2022-03-01 11:49:25 +05:30
Ankush Menat	bbc4710fa3	fix: apply margin on duplicated doc too	2022-03-01 11:48:28 +05:30
Rushabh Mehta	4e2c284be7	fix(minor): nix the ugly banner	2022-03-01 08:52:42 +05:30
Rohit Waghchaure	bda9d09125	bumped to version 14.0.0-beta.2	2022-02-28 21:57:03 +05:30
Deepesh Garg	785fcca957	Merge branch 'develop' of https://github.com/frappe/erpnext into payment_entry_total_taxes	2022-02-28 18:06:14 +05:30
Deepesh Garg	19fb7ead9f	test: Add test case for payment entry taxes	2022-02-28 18:05:58 +05:30
rohitwaghchaure	bbfff1b795	Merge pull request #30015 from rohitwaghchaure/removed-validation-for-zero-qty ... refactor: removed validation to check zero qty	2022-02-28 17:54:26 +05:30
Marica	789e042f7d	Merge branch 'develop' into prod-plan-sub-items-aggregate	2022-02-28 17:38:29 +05:30
Marica	5fe8c48ba8	Merge branch 'develop' into prod-plan-sub-items-aggregate	2022-02-28 17:38:14 +05:30
Ankush Menat	829c453cb6	test: remove transaction commits from buying module	2022-02-28 17:36:58 +05:30
Rucha Mahabal	3f3b1766c2	test: get leave details for leave application dashboard	2022-02-28 17:30:09 +05:30
Ankush Menat	b0d1e6db54	test(refactor): use FrappeTestCase	2022-02-28 17:23:32 +05:30
marination	292fe370db	test: combine sub assembly items and make Production Plan tests atomic	2022-02-28 16:35:20 +05:30
Rucha Mahabal	a58dfecb23	test: fix test test_leave_balance_near_allocaton_expiry	2022-02-28 15:27:24 +05:30
Marica	b8593188f3	Merge branch 'develop' into prod-plan-sub-items-aggregate	2022-02-28 15:08:21 +05:30
Rohit Waghchaure	39d3f20d9b	fix: removed validation to check zero qty	2022-02-28 14:29:07 +05:30
Rucha Mahabal	aaa1ae94f2	fix: earned leave policy assignment test	2022-02-28 14:26:49 +05:30
Rucha Mahabal	942511cfff	fix: leave application dashboard ... - total leaves allocated considering cancelled leaves - optional plural for leave category labels - show dashboard only once from date is set, else it fetches all allocations till date and generates incorrect balance - change pending leaves to 'Leaves Pending Approval' for better context - update labels in Salary Slip Leave Details table	2022-02-28 14:10:23 +05:30
Ankush Menat	1d1203d5ec	fix: dont fetch draft/cancelled BOMs	2022-02-28 13:14:16 +05:30
Ankush Menat	3cc47d5ba5	fix: correct fieldname for source warehouse	2022-02-28 13:06:56 +05:30
Ankush Menat	0bed592777	fix: open stock entry instead of submitting from item dashboard	2022-02-28 13:06:56 +05:30
Ankush Menat	88a21ca7d2	fix: only show child warehouses for transfer	2022-02-28 13:06:56 +05:30
Subin Tom	1ab5b7a811	fix: linter, sider fixes	2022-02-28 12:47:05 +05:30
Deepesh Garg	1b186682ea	Merge branch 'develop' of https://github.com/frappe/erpnext into grant_commission_check	2022-02-28 12:42:21 +05:30
Deepesh Garg	4e9a9f35a6	test: add correct test case	2022-02-28 12:41:59 +05:30
Rucha Mahabal	88141d6116	test: Employee Leave Balance Summary	2022-02-28 12:12:52 +05:30
Deepesh Garg	83ad8f9caa	Merge pull request #29928 from deepeshgarg007/psoa_account_filter ... fix: Account filter in PSOA	2022-02-28 11:41:50 +05:30
Saqib Ansari	d4767b541b	fix: merge conflict	2022-02-28 11:36:47 +05:30
Saqib Ansari	823979fbcc	fix(pos): coupon code is applied even if ignore pricing rule is check ... (cherry picked from commit 81514516f3) # Conflicts: # erpnext/selling/page/point_of_sale/pos_payment.js	2022-02-28 06:05:49 +00:00
Saqib Ansari	c75283265b	fix(pos): mode of payment disappears after save ... (cherry picked from commit 69c34cd7ae)	2022-02-28 06:05:48 +00:00
Saqib Ansari	cde711151e	Merge branch 'develop' into ordered-qty-for-packed-items	2022-02-28 11:35:42 +05:30
Rucha Mahabal	c7d594984a	chore: remove unused imports, sort imports, fix sider	2022-02-28 10:19:16 +05:30
Rucha Mahabal	d14a5c0f64	Merge branch 'develop' into leave-opening-balance	2022-02-28 10:03:38 +05:30
Rucha Mahabal	c050ce49c2	test: employee leave balance report ... - fix expired leaves calculation when filters span across 2 different allocation periods	2022-02-28 09:58:12 +05:30
Rucha Mahabal	a891c426b5	Merge branch 'develop' into remove-nonprofit	2022-02-28 09:50:45 +05:30
Deepesh Garg	bfa9bfd39f	Merge branch 'develop' into psoa_account_filter	2022-02-28 09:28:26 +05:30
Deepesh Garg	6a4975f9f1	Merge branch 'develop' into missing_pos_invoice_json	2022-02-28 08:40:48 +05:30
mergify[bot]	96e87fe3c9	fix: validate Work Order qty against Production Plan (#29721) (#30003) ... * fix: validate Work Order qty against Production Plan * chore: err msg when max_qty is 0 * test: add test for overproduction * fix: CI (cherry picked from commit 067ede76ea0851a29e270e150f482368e0afa194) Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>	2022-02-26 12:54:13 +05:30
Rushabh Mehta	0c7037f004	Merge pull request #30004 from rmehta/student-attendance-fix ... fix(minor): student attendance tool query fix	2022-02-26 11:34:14 +05:30
Rushabh Mehta	2dabda03af	fix(minor): student_attendance_tool.js fix fetching UX	2022-02-26 11:32:54 +05:30
Sagar Sharma	77ffcd3aed	fix(ux): make "allow zero valuation rate" readonly if "s_warehouse" is set (#29681) ... * chore: make allow zero valuation rate readonly if s_warehouse is set * fix: setting the checkbox to zero whenever the source warehouse is set * fix: remove allow_on_submit and refresh trigger Co-authored-by: Ankush Menat <ankush@frappe.io>	2022-02-26 11:25:02 +05:30
Rushabh Mehta	1e7df5d0c2	fix(minor): student attendance tool query fix	2022-02-26 11:07:44 +05:30
hrzzz	16de29a3cb	fix(translation) - correction for translation	2022-02-25 16:56:23 -03:00
Rucha Mahabal	71d33081aa	fix: org chart connectors not rendered when Employee Naming is set to Full Name (#29997)	2022-02-25 23:01:32 +05:30
Deepesh Garg	4f46394399	fix: Add parent to department	2022-02-25 21:18:22 +05:30
Deepesh Garg	3e573e9838	fix: Condition	2022-02-25 17:18:53 +05:30
Deepesh Garg	36c76c4035	fix: Failing setup wizard test	2022-02-25 17:15:57 +05:30
Subin Tom	f1f3e035a6	Merge branch 'exotel-fixes' of https://github.com/nemesis189/erpnext into exotel-fixes	2022-02-25 16:59:35 +05:30
Deepesh Garg	fe2ced7bee	fix: Regional print format addition	2022-02-25 16:57:59 +05:30
Subin Tom	5b79496f05	fix: call type doctype, fixes	2022-02-25 16:52:25 +05:30
Marica	e8e9bc4daa	Merge pull request #29733 from dj12djdjs/fix-user-unique-cart ... fix(e-commerce): Unique Shopping Cart Per Logged In User	2022-02-25 16:35:14 +05:30
Deepesh Garg	5464ba6430	Merge branch 'develop' into psoa_account_filter	2022-02-25 15:55:06 +05:30
Deepesh Garg	25edc700bd	Merge pull request #29974 from deepeshgarg007/abbr_check ... fix: Make abbreviation limit to 10	2022-02-25 15:52:51 +05:30
Saqib Ansari	81514516f3	fix(pos): coupon code is applied even if ignore pricing rule is check	2022-02-25 15:18:06 +05:30
Saqib Ansari	69c34cd7ae	fix(pos): mode of payment disappears after save	2022-02-25 14:36:29 +05:30
Subin Tom	a91fb88929	fix: sider fixes	2022-02-25 13:45:26 +05:30
Subin Tom	00b0f10100	fix: added type of call select field, additional status for agent rejecting call	2022-02-25 13:38:57 +05:30
marination	d3b0ca30c6	fix: Get MRs that are yet to be received but fully ordered in Report ... - Remove incorrect query clause that only check if ordered qty < 100 - MR should be visible in report until fully received (cycle complete)	2022-02-25 12:10:11 +05:30
Subin Tom	fd20713bd7	fix: added field to show called group, user_id	2022-02-25 12:01:53 +05:30
Devin Slauenwhite	a1ae7fcbc8	fix: show fail message	2022-02-24 16:36:30 -05:00
Rucha Mahabal	04b9091821	fix: web form deletion	2022-02-24 18:10:29 +05:30
Rucha Mahabal	761e528ba3	fix: deprecation warning	2022-02-24 17:57:39 +05:30
Rucha Mahabal	d647de3782	Merge branch 'develop' into remove-nonprofit	2022-02-24 17:03:52 +05:30
Deepesh Garg	cbb5ffb6fe	fix: Multi-currency bank reconciliation fixes	2022-02-24 15:58:12 +05:30
marination	6d72aa377f	feat: Combine Sub-assembly items in Production Plan ... - Combine subassembly rows if same Item, Warehouse, Inhouse/Outhouse Manu.g, BOM No.	2022-02-24 15:20:18 +05:30
Saqib Ansari	2f1709dfef	chore: remove unintentional search index	2022-02-24 15:12:35 +05:30
Saqib Ansari	1e139cf9a1	chore: remove unintentional search index	2022-02-24 15:12:12 +05:30
Deepesh Garg	0373914704	fix: Commission not applied while making Sales Order from Quotation	2022-02-24 14:42:56 +05:30
Deepesh Garg	b1a46c80d5	fix: Total taxes and charges in payment entry for multicurrency payments	2022-02-24 13:11:17 +05:30
Deepesh Garg	239733acd1	fix: Make abbreviation limit to 10	2022-02-23 20:41:49 +05:30
Subin Tom	006606c437	fix: added employee name to call log	2022-02-23 18:45:50 +05:30
Marica	4d8d4acec4	Merge pull request #29913 from marination/item-merge-bundles ... fix: Block merging items if both have product bundles	2022-02-23 16:59:22 +05:30
marination	a33f04ea41	fix: Check if both old and new items have bundles before merging ... - If only one has bundle against it, they can be merged	2022-02-23 16:26:20 +05:30
Ankush Menat	b44cead317	test: fix flaky stateful tests (#29749) ... Co-Authored-By: Marica <maricadsouza221197@gmail.com>	2022-02-23 16:17:41 +05:30
Marica	8b1ef7bcc6	Merge pull request #29964 from marination/fox-flaky-stock-reports-test ... chore: Rollback after each test, due to premature commit via `remove_user_permission`	2022-02-23 15:18:39 +05:30
marination	5ff3705872	test: Make Variant if absent in test_variant_work_order, keep test atomic	2022-02-23 14:54:16 +05:30
Ankush Menat	9c7df2eec5	fix: ignore duplicates explicitly	2022-02-23 14:27:45 +05:30
marination	bf8743713d	chore: Rollback after each test, due to premature commit via remove_user_permission ... - `remove_user_permission` in `test_warehouse_user` calls delete_doc that enqueues dynamic link deletion - Execution of background job eventually commits - While in the test suite it runs sequentially in the same thread and commits whatever was done until then - Which is why the rollback in `tearDownClass` is quite useless here - This premature commit causes many illegal transactions caught by `assertRaises` to be committed in the db - This creates faulty/dirty ledgers and breaks reports, as outiside the test suite this shouldn't/wouldn't happen - Rollback after each test, and for `test_warehouse_user` in particular, manually cancel transaction	2022-02-23 14:03:48 +05:30
Marica	857ac8c045	Merge branch 'develop' into item-merge-bundles	2022-02-23 13:01:56 +05:30
Marica	856d3f63b5	Merge pull request #29953 from marination/heart-icon-and-shop-by-category ... chore: Adjust heart icon to v14 icons in frappe (make consistent with v13) & misc fix	2022-02-23 13:01:30 +05:30
Subin Tom	8d3011832b	fix: call status fix	2022-02-23 12:59:38 +05:30
Deepesh Garg	1bdcb73d5d	Merge pull request #29879 from deepeshgarg007/misc_fixes ... fix: Validate party account with company	2022-02-23 11:22:08 +05:30
Suraj Shetty	ed16bbfb1d	fix: Email translations ... (cherry picked from commit aaa84a21ba)	2022-02-23 05:30:55 +00:00
Suraj Shetty	aaa84a21ba	fix: Email translations	2022-02-23 10:54:44 +05:30
Saqib Ansari	8743e39469	fix: sider ... (cherry picked from commit bc28755978c17d7e85cdc5ffd4a45a629183e2c8)	2022-02-23 03:55:49 +00:00
Saqib Ansari	3dcc3a349e	fix: cannot edit valutaion_rate in asset repair ... (cherry picked from commit 2aba6c38b36e5fce373800eb129a93eb010c691f)	2022-02-23 03:55:49 +00:00
Saqib Ansari	414c3b8dd2	fix: remove redundant method ... (cherry picked from commit 57d5a027fb929803ffd62463da3e5b4611b17ff4)	2022-02-23 03:55:48 +00:00
GangaManoj	5d3b65b944	fix: Pass value instead of array ... (cherry picked from commit e1a9b61103e27099696ae4b186a6575b28c16b06)	2022-02-23 03:55:48 +00:00
GangaManoj	3d6ed4ebde	fix: Fetch valuation rate ... (cherry picked from commit df71907be453a481a43d2c62a5c076602ab8af07)	2022-02-23 03:55:48 +00:00
Marica	0fde2f522e	Merge branch 'develop' into item-merge-bundles	2022-02-23 00:28:51 +05:30
marination	714325071f	fix: Remove accidental as_dict in frappe.db.get_all	2022-02-23 00:15:39 +05:30
marination	b0a1cd6a7b	chore: Change heart icon to icon-heart and change var icon-stroke to accomodate changes in frappe icon ... - `icon-heart` got a stroke colour that needs to be overriden via var `icon-stroke - Use `icon-heart` instead of `icon-heart-active` as the latter has a color fill now	2022-02-23 00:13:44 +05:30
Deepesh Garg	a61790c00f	fix: Remove unintended changes	2022-02-22 20:58:10 +05:30
Deepesh Garg	bd80e04aa7	Merge pull request #29865 from deepeshgarg007/loan_bank_reco ... feat: Bank Reconciliation for loan documents	2022-02-22 20:43:00 +05:30
Deepesh Garg	60a006fdaf	Merge pull request #29942 from nemesis189/taxjar-fixes ... fix: Taxjar minor fixes	2022-02-22 19:37:56 +05:30
Ankush Menat	5d403449bd	test: move report tests to subttest (#29945) ... Basically failfast=False but for sub-tests	2022-02-22 19:24:49 +05:30
Saqib Ansari	3ee1383802	Merge branch 'develop' into ordered-qty-for-packed-items	2022-02-22 18:45:31 +05:30
Subin Tom	1682a26fe6	fix: Taxjar minor fixes	2022-02-22 17:20:48 +05:30
Ankush Menat	745f7bc5f0	docs: add human readable specifications for stock ledger (#29308) ... * docs: add human readable specifications for stock ledger * docs: reposting technical implementation notes	2022-02-22 17:03:11 +05:30
Ankush Menat	7f55226a58	fix: remove customer field value when MR is not customer provided (#29938)	2022-02-22 16:55:43 +05:30
Deepesh Garg	3a547cb0d9	fix: Item discounts for quotation	2022-02-22 16:25:32 +05:30
Saqib Ansari	8e3f1e306d	test: po updates packed item's ordered_qty	2022-02-22 15:34:26 +05:30
Saqib Ansari	8005fee656	feat: update ordered qty for packed items	2022-02-22 15:06:19 +05:30
Saqib Ansari	2a69730a40	Merge pull request #29900 from nextchamp-saqib/asset-fix-#3 ... fix(asset): no. of depr booked cannot be equal to total no. of depr	2022-02-22 14:23:19 +05:30
Marica	235fc127b3	fix: Fetch conversion factor even if it already existed in row, on item change (#29917) ... * fix: Fetch conversion factor even if it already existed in row, on item change * fix: Retain manually changed conversion factor - If item code changes, reset conversion factor on client side - Keep API behavious consistent, if conversion factor is sent, same must come back - API should not ideally reset values in most cases	2022-02-22 12:53:46 +05:30
Rucha Mahabal	d011a3f82c	fix(Salary Slip): TypeError while clearing any amount field in components (#29931)	2022-02-22 11:41:09 +05:30
Deepesh Garg	70b960e650	fix: Account filter in PSOA	2022-02-22 09:16:08 +05:30
Rucha Mahabal	4738367d64	fix: boarding task dates not set when activity begins on is set to 0 (#29921)	2022-02-21 22:54:46 +05:30
Rucha Mahabal	87b59fc96c	fix(LMS): program enrollment does not give any feedback (#29922)	2022-02-21 22:53:29 +05:30
Deepesh Garg	0d8c24f488	Merge branch 'develop' of https://github.com/frappe/erpnext into loan_bank_reco	2022-02-21 22:22:02 +05:30
Sagar Sharma	e4c4dc402e	fix: JobCard TimeLog to_date (#29872)	2022-02-21 19:49:19 +05:30
Deepesh Garg	0c6835eab2	Merge pull request #29740 from deepeshgarg007/gross_profit_non_stock_item ... fix: Multiple fixes in Gross Profit report	2022-02-21 19:28:55 +05:30
Ankush Menat	9661058cc7	fix: only set batchwise valuation flag if new batch	2022-02-21 19:04:10 +05:30
Ankush Menat	af9fa049c7	fix: batchwise valuation can only be used by FIFO/LIFO	2022-02-21 18:02:40 +05:30
Ankush Menat	75fb561698	test: force correct flag in test data	2022-02-21 18:02:40 +05:30
Ankush Menat	f38690f703	fix: check if Moving average item can use batchwise valuation	2022-02-21 18:02:40 +05:30
Ankush Menat	6b0bc35063	test: mixed moving average items	2022-02-21 18:02:40 +05:30
Ankush Menat	609d2fccad	fix: reset stock value if no qty	2022-02-21 18:02:40 +05:30
Ankush Menat	35483242b3	fix: extend round_off_if_near_zero fix to other methods	2022-02-21 18:02:40 +05:30
Ankush Menat	76b395d62e	test: old/new mix batches valuation consumption	2022-02-21 18:02:40 +05:30
Ankush Menat	b1555fd477	chore: batch flag and consumption rate in invariant report	2022-02-21 18:02:40 +05:30
Ankush Menat	b534fee2c7	refactor: use queue difference instead of actual values	2022-02-21 18:02:40 +05:30
Ankush Menat	aba7a7ce4e	fix: handle negative inventory inside a batch	2022-02-21 18:02:40 +05:30
Ankush Menat	d7ca83ef0b	refactor: code duplication for fallback rates	2022-02-21 18:02:40 +05:30
Ankush Menat	c5bd34d238	test: multi-batch stock entry	2022-02-21 18:02:40 +05:30
Ankush Menat	60b8bae85f	test: batch wise valuation for transfer and intermediate	2022-02-21 18:02:40 +05:30
Ankush Menat	5718777a2b	fix: consider batch_no when getting incoming rate	2022-02-21 18:02:40 +05:30
18alantom	683ef8a603	test: more tests for batchwise valuation ... Co-Authored-By: Ankush Menat <ankush@frappe.io>	2022-02-21 18:02:40 +05:30
Ankush Menat	312db429e4	refactor: use qb for patching flag	2022-02-21 18:02:40 +05:30
Ankush Menat	d130233ffc	test: fix expected test failures	2022-02-21 18:02:40 +05:30
Ankush Menat	102fff24c8	refactor: convert query to QB and make creation optional	2022-02-21 18:02:40 +05:30
Ankush Menat	ab926521bd	fix: correct incoming rate for batched items	2022-02-21 18:02:40 +05:30
Ankush Menat	342d09a671	feat: get_valuation_rate batch wise ... This function is used to show valuation rate on frontend and also as fallback in case values aren't available. Add "batch_no" param to get batch specific valuation rates. Co-Authored-By: Alan Tom <2.alan.tom@gmail.com>	2022-02-21 18:02:40 +05:30
Ankush Menat	ce0514c8db	feat: batch wise valuation rates ... start with most used case: negative inventory isn't enabled - simple addition of qty and value when new batch qty is added - fetch outgoing rate from stock movement of specific batch	2022-02-21 18:02:40 +05:30
18alantom	f4af75f60b	feat: batchwise valuation flag ... This is required to avoid breaking behaviour in valuation of old batches	2022-02-21 18:02:40 +05:30
Saqib Ansari	05682af07a	Merge branch 'develop' into asset-fix-#3	2022-02-21 17:55:32 +05:30
Ankush Menat	00e8565868	fix: round off increments in numeric item variant	2022-02-21 17:42:34 +05:30
Deepesh Garg	a4c6cb9f12	fix: Remove print statements	2022-02-21 17:08:25 +05:30
Deepesh Garg	b7c388976d	Merge branch 'develop' of https://github.com/frappe/erpnext into loan_bank_reco	2022-02-21 16:58:52 +05:30
Deepesh Garg	6bf7bd6a9f	Merge branch 'develop' into gross_profit_non_stock_item	2022-02-21 16:56:49 +05:30
marination	530f9f7029	test: Item Merging with Product Bundles	2022-02-21 16:48:04 +05:30
marination	28cc2dbb72	fix: Block merging items if both have product bundles	2022-02-21 16:14:40 +05:30
Deepesh Garg	40a45a3139	Merge pull request #29907 from deepeshgarg007/tds_payable_total_amount ... fix: Total Credit amount in TDS Payable monthly report	2022-02-21 15:33:58 +05:30
Ankush Menat	afc81351b7	test: only test erpnext doctypes ... Co-authored-by: gavin <gavin18d@gmail.com>	2022-02-21 15:32:28 +05:30
Ankush Menat	e3ea431ef3	test: test all form loads	2022-02-21 15:32:28 +05:30
Ankush Menat	3a5dbfab50	fix: make cashflow mapping template child doctype	2022-02-21 15:32:28 +05:30
Saqib Ansari	cecaec2cc6	Merge branch 'develop' into asset-fix-#3	2022-02-21 14:54:56 +05:30
Deepesh Garg	170a657ed8	Merge pull request #29887 from deepeshgarg007/loan_interest_principal ... fix: Ledger entries on LIA for term loans	2022-02-21 14:24:37 +05:30
Marica	e952cce17d	chore: Show 'Produced Qty' field in Sales Order Item (#29903)	2022-02-21 14:22:14 +05:30
Deepesh Garg	a82cf7214e	fix: Total Credit amount in TDS Payable monthly report	2022-02-21 13:58:56 +05:30
Deepesh Garg	e24242ee33	Merge branch 'develop' into loan_interest_principal	2022-02-21 13:39:45 +05:30
Saqib Ansari	780694f6e2	test: number_of_depr_booked = total_number_of_depr	2022-02-21 12:45:52 +05:30
Saqib Ansari	c5808543c8	fix(asset): no. of depreciation booked cannot be equal to total no. of depreciations	2022-02-21 12:41:08 +05:30
Deepesh Garg	e13d774e8e	Merge branch 'develop' into gross_profit_non_stock_item	2022-02-21 12:34:14 +05:30
Deepesh Garg	0b5e618e3a	fix: Update bank reconciliation statement	2022-02-21 11:46:44 +05:30
Deepesh Garg	295cbb0ff2	fix: Update queries in Bank Reconciliation Tool	2022-02-21 11:45:23 +05:30
Deepesh Garg	a0bdcbd0cd	fix: Add patch for account fields	2022-02-21 11:44:00 +05:30
Saqib Ansari	fa38c291bd	fix(pos): removal of coupon code	2022-02-21 11:38:16 +05:30
rohitwaghchaure	6956578339	Merge pull request #29771 from deepeshgarg007/consolidated_financial_statment_error ... fix: Error in consolidated financial statements	2022-02-20 18:21:54 +05:30
Deepesh Garg	83a60a2a17	Merge pull request #29869 from deepeshgarg007/gstr_1_gstin_filter ... fix: GSTIN filter for GSTR-1 report	2022-02-19 19:41:49 +05:30
Deepesh Garg	a28ec89507	Update gstr_1.js	2022-02-19 19:35:57 +05:30
Deepesh Garg	1aa12fb3f1	fix: Ledger entries on LIA for term loans	2022-02-19 19:19:32 +05:30
rohitwaghchaure	b9072eb9b8	Merge pull request #29773 from wojosc/patch-26 ... Translation for DocType	2022-02-19 16:37:25 +05:30
Deepesh Garg	5a2b571aa9	fix: Validate party account with company	2022-02-18 20:05:49 +05:30
Marica	d1a283fd79	Merge branch 'develop' into repack-entry-stock-ageing	2022-02-18 18:54:23 +05:30
marination	d5be536740	test: Negative Stock, over consumption & over production with split rows, balance precision	2022-02-18 18:53:05 +05:30
marination	ed4a6c6cc6	fix: Range Qty precision	2022-02-18 18:52:42 +05:30
marination	d3fbbcfed3	fix: Precision of available qty and negative stock in transfer bucket ... - Maintain only positive values in transfer bucket - Use it to neutralize/add stock to fifo queue	2022-02-18 16:33:28 +05:30
Deepesh Garg	8b3d9088df	Merge branch 'develop' into consolidated_financial_statment_error	2022-02-17 23:32:50 +05:30
Deepesh Garg	e1f8f034c2	Merge branch 'develop' of https://github.com/frappe/erpnext into patch_fixes	2022-02-17 23:20:29 +05:30
Deepesh Garg	3a966d4dbe	fix: Move patch to post sync	2022-02-17 23:18:07 +05:30
Deepesh Garg	1617e0d0e6	fix: Remove reload doc	2022-02-17 22:52:53 +05:30
Deepesh Garg	87b074ac09	fix: GSTIN filter for GSTR-1 report	2022-02-17 22:01:00 +05:30
Ankush Menat	c36bd7e1a6	fix: avoid creating bins without item-wh ... Co-Authored-By: Shadrak Gurupnor <30501401+shadrak98@users.noreply.github.com> Co-Authored-By: Saurabh <saurabh6790@gmail.com>	2022-02-17 19:52:01 +05:30
Deepesh Garg	555b1335f6	feat: Bank Reconciliation for loan documents	2022-02-17 19:15:30 +05:30
Rucha Mahabal	bef46e2b64	chore: remove unused code and fields related to workstation from Timesheet Detail	2022-02-17 17:48:18 +05:30
Rucha Mahabal	47ff968253	test: timesheet not overlapping with continuous timelogs	2022-02-17 17:48:18 +05:30
Rucha Mahabal	3ec9acf8f7	fix: convert overlap raw query to frappe.qb	2022-02-17 17:48:18 +05:30
Rucha Mahabal	e2e998fbd9	fix(Timesheet): convert time logs to datetime while checking for overlap	2022-02-17 17:48:18 +05:30
ChillarAnand	358734dcea	fix: Skip deletion if linked docs exists	2022-02-17 16:31:27 +05:30
Saqib Ansari	9a7f9c3668	Merge pull request #29859 from nextchamp-saqib/fix-pos-coupon-code ... fix: coupon code is applied even if ignore_pricing_rule is enabled	2022-02-17 16:11:19 +05:30
Saqib Ansari	2743999785	fix: coupon code is applied even if ignore_pricing_rule is enabled	2022-02-17 16:03:43 +05:30
ChillarAnand	b3d4465db6	Merge branch 'develop' into remove-nonprofit	2022-02-17 15:30:11 +05:30
ChillarAnand	fb59247182	fix: Delete party type records in patch	2022-02-17 15:15:44 +05:30
Ankush Menat	db93f26f20	fix: production plan status should consider qty + WO status	2022-02-17 14:48:32 +05:30
rohitwaghchaure	0da39950d8	Merge pull request #29836 from rohitwaghchaure/minor-item-name-in-excel-sheet ... feat (minor): added item name in the excel sheet	2022-02-17 14:37:51 +05:30
Saqib Ansari	680f8c4dc2	Merge pull request #29848 from nextchamp-saqib/fix-brt-currency ... fix: currency in bank reconciliation tool	2022-02-17 14:27:07 +05:30
Saqib Ansari	60674e52b8	fix: currency in bank reconciliation tool	2022-02-17 14:19:42 +05:30
ChillarAnand	db1957ffe6	Merge branch 'develop' into remove-nonprofit	2022-02-17 13:00:58 +05:30
ChillarAnand	b5ff9b27bd	refactor: Clean up non-profit setup	2022-02-17 12:37:25 +05:30
Ankush Menat	d9fc3f3d90	test: putaway rule re-application shouldn't do anything	2022-02-17 12:26:51 +05:30
Ankush Menat	b000e93744	fix: avoid updating items table if no change due to putaway	2022-02-17 12:26:51 +05:30
ChillarAnand	72fe559031	refactor: Remove non profit templates	2022-02-17 08:42:32 +05:30
Rohit Waghchaure	02e77029fa	fix: added item name in the excel sheet	2022-02-16 18:15:57 +05:30
marination	06d36c6143	chore: Move patch that updates SO from WO to v13	2022-02-16 17:40:16 +05:30
Wolfram Schmidt	235b0715bf	fix: allow renaming and merging (#29830)	2022-02-16 17:20:07 +05:30
Deepesh Garg	d251bec380	Merge pull request #29137 from ruthra-kumar/payment_terms_report ... feat: Payment Terms Status report	2022-02-16 14:15:24 +05:30
Marica	c3c9a8d445	Merge branch 'develop' into so-mr-wo-back-update	2022-02-16 13:39:58 +05:30
Marica	201a38bfbf	Merge branch 'develop' into item-variants-perf	2022-02-16 13:03:32 +05:30
Kenneth Sequeira	a26183e205	fix: add supported currencies (#29805)	2022-02-16 13:02:36 +05:30
Marica	0ba72b133f	Merge branch 'develop' into repack-entry-stock-ageing	2022-02-16 12:48:51 +05:30
Marica	3fcf0ec81d	Merge branch 'develop' into so-mr-wo-back-update	2022-02-16 12:44:56 +05:30
marination	29c576e144	chore: Remove commented out code	2022-02-16 12:41:39 +05:30
Sagar Vora	08a391fa88	test: set correct DocType (#29819)	2022-02-16 10:56:57 +05:30
Deepesh Garg	2f5bfcc055	Merge branch 'develop' into payment_terms_report	2022-02-16 10:06:12 +05:30
marination	f6233e77c6	chore: Add transfer bucket working to .md file	2022-02-15 20:30:16 +05:30
marination	ea3b7de867	test: Stock Ageing FIFO buckets for Repack entry with same item	2022-02-15 18:41:42 +05:30
marination	799671c748	fix: Transfer Bucket logic for Repack Entry with split batch rows	2022-02-15 18:41:08 +05:30
Marica	e6fa33012f	Merge branch 'develop' into so-mr-wo-back-update	2022-02-15 17:51:54 +05:30
ruthra kumar	48f37c7659	test: added test for alternate currency ... - Sales Order and Invoice will be submitted in USD with exchange rate of 70 with the default company currency - Report will display in defauly company currency	2022-02-15 17:21:08 +05:30
ruthra kumar	49fdc6c52e	test: refactor and fix failing test case	2022-02-15 17:20:29 +05:30
Ankush Menat	f89a64db48	fix: dont attempt to set batch number if item doesn't have batch no (#29812) ... This causes other triggers and unnecessary changes (e.g. price list)	2022-02-15 16:10:35 +05:30
Deepesh Garg	4a33cdab34	Merge pull request #29791 from deepeshgarg007/tds_payable_cancelled_entries ... fix: Fixes in TDS payable monthly report	2022-02-15 15:39:47 +05:30
marination	0ca58d7627	chore: Patch to update SO work_order_qty and Linter fix	2022-02-15 14:28:00 +05:30
marination	f9d52e7346	test: SO > MR > WO flow	2022-02-15 13:38:15 +05:30
marination	18731622c4	fix: Update SO via Work Order made from MR (attached to SO) ... - Add SO Item reference in WO from MR (that was made from SO)	2022-02-15 12:50:56 +05:30
ruthra kumar	a4b8d67323	refactor: create invoices list without if else	2022-02-15 12:20:41 +05:30
ruthra kumar	85ed0fb8d6	fix: default to company currency in report output	2022-02-15 12:20:06 +05:30
Deepesh Garg	fec40aac7a	fix: Linting issues	2022-02-15 12:15:35 +05:30
Deepesh Garg	42cdd6d237	fix: Remove commented out code	2022-02-15 12:05:51 +05:30
Deepesh Garg	10629f78fa	Merge branch 'develop' into reverse_entry_dead_lock	2022-02-15 11:59:50 +05:30
Ankush Menat	1e9766433a	fix: get_item_details overrides parentype (#29799)	2022-02-15 10:57:06 +05:30
Saqib Ansari	67a7802f0d	Merge pull request #29789 from nextchamp-saqib/fix-opening-inv-tool ... fix: disable rounded total in opening invoice creation tool	2022-02-15 10:38:11 +05:30
Marica	728545d147	Merge pull request #29788 from marination/fifo-slot-by-wh ... fix: Generate Warehouse wise FIFO Queue always and later aggregate if required	2022-02-14 23:04:44 +05:30
Marica	599f4b1412	Merge pull request #29705 from marination/pending-qty-in-prod-plan ... fix: Set Pending Qty in Prod Plan after updating Work Order	2022-02-14 23:01:51 +05:30
Deepesh Garg	973f6b1bbd	fix: Gross profit for credit notes	2022-02-14 22:14:17 +05:30
marination	e46a1bc80f	fix: Server Tests and sider	2022-02-14 21:00:51 +05:30
Marica	cd728fc9e7	Merge branch 'develop' into fifo-slot-by-wh	2022-02-14 20:42:57 +05:30
Deepesh Garg	04cbde2e52	fix: Filter out bank payment entries	2022-02-14 20:38:04 +05:30
marination	f221a0d253	test: Cover back to back recos from different warehouses	2022-02-14 20:14:14 +05:30
Deepesh Garg	2ff6b3560e	fix: Fixes in TDS payable monthly report	2022-02-14 19:51:58 +05:30
Sagar Sharma	19a6c21eec	refactor!: amazon mws integration (#29438) ... * remove: amazon mws integration * add patch to remove doctype * remove old patch	2022-02-14 19:43:26 +05:30
Saqib Ansari	a8309c5183	Merge branch 'develop' into fix-opening-inv-tool	2022-02-14 19:14:03 +05:30
Saqib Ansari	18d0a59a9d	fix: disable rounded total in opening invoice creation tool	2022-02-14 18:38:02 +05:30
ruthra kumar	bc244d0740	refactor: currency field and code cleanup	2022-02-14 17:48:16 +05:30
Saqib Ansari	3713ae75ab	fix: incorrect pricing rule filtering on selecting first item	2022-02-14 13:31:37 +05:30
Dany Robert	85adb947bf	fix: show user id in emp group table (#29776)	2022-02-14 09:22:21 +05:30
Deepesh Garg	615dd9decd	fix: Patch fixes	2022-02-13 19:24:10 +05:30
Wolfram Schmidt	dbd29da189	Translation for DocType ... https://testsystem.frappe.cloud/app/milestone	2022-02-13 13:11:31 +01:00
Deepesh Garg	ae613008be	fix: Error in consolidated financial statements	2022-02-12 21:54:22 +05:30
Deepesh Garg	07bcbc6c7e	fix: Remove unused param	2022-02-12 19:05:03 +05:30
Deepesh Garg	65711dbde8	test: Update account type in payroll payable account ... (cherry picked from commit a54e0fe42b38f571396e88b3ebcc46fd3b389301)	2022-02-12 13:17:33 +00:00
Deepesh Garg	988dee04fa	fix: Loan repayment via Salary Slip ... (cherry picked from commit 2572480554db265e2e93a5dfba75749675b46d14)	2022-02-12 13:17:32 +00:00
Deepesh Garg	19e281a54f	Merge pull request #29700 from vorasmit/gstr-1-fixes ... fix(India): Report GSTR-1 minor fixes	2022-02-12 17:16:24 +05:30
Wolfram Schmidt	a0d163ebff	chore: changed Region zu Gebiet (#29651) ... "Region" is more fitting when talking about a geographical area or region. Gebiet is more accurate translation in this case of territory as we are talking about sales territory which would be a "Verkaufsgebiet".	2022-02-12 14:50:48 +05:30
Wolfram Schmidt	7338641791	chore: added DocType Translation #29730 ... frappe.cloud/app/doctype/Email Digest Recipient ..it's just a table [skip ci]	2022-02-12 14:49:31 +05:30
Ankush Menat	eb8b424722	feat: item-wise negative stock setting (#29761)	2022-02-12 13:08:28 +05:30
mergify[bot]	749005eb8b	fix: list mutation within loop (#29766) ... Prevent list mutation within loop leading to incorrect data (cherry picked from commit 894a406ed406f8e6fa3efed9315609ffc33075f6) Co-authored-by: Govind S Menokee <govindsmenokee@gmail.com>	2022-02-12 12:14:19 +05:30
Saqib Ansari	80944e666f	Merge pull request #29754 from resilient-tech/remove-format ... chore: remove deprecated print format	2022-02-12 12:08:23 +05:30
Saqib Ansari	ef971e160a	Merge pull request #29729 from resilient-tech/allow_regional ... fix: allow `regional_overrides` hook to be set in subsequent apps	2022-02-12 12:05:25 +05:30
Rucha Mahabal	961467c389	fix: revert removal of gratuity payment via salary slip (#29589)	2022-02-12 00:29:53 +05:30
Rucha Mahabal	10ee2fbeac	Merge branch 'develop' into leave-policy-assgn-fixes	2022-02-11 21:00:49 +05:30
Rucha Mahabal	cbaadcf113	fix(test): reset test setup	2022-02-11 20:59:19 +05:30
Rucha Mahabal	9b0f9c3442	test: earned leave allocations based on DOJ	2022-02-11 20:08:01 +05:30
marination	f62b3207ff	fix: Generate Wh wise FIFO Queue and later aggregate if required ... - Back to back stock recos cause incorrect qty calculation across warehouses - Hard to differentiate how much of the qty is reset by the reco - Maintain Queue and balances warehouse wise and later aggregate for accurate values	2022-02-11 18:14:28 +05:30
Rucha Mahabal	51e6086829	chore: clean-up leave policy assignment tests	2022-02-11 17:40:20 +05:30
Deepesh Garg	ea20c63182	Revert "fix(India): Tax calculation for overseas suppliers"	2022-02-11 17:38:37 +05:30
rohitwaghchaure	ce79434a9b	Merge pull request #29736 from rohitwaghchaure/performance-issue-while-making-wo ... fix: time out error while making work orders from production plan	2022-02-11 16:12:21 +05:30
Sagar Vora	d93d2a80b1	chore: remove deprecated print format	2022-02-11 15:21:17 +05:30
Deepesh Garg	2172ab2d37	fix: Update columns in new format	2022-02-11 14:48:39 +05:30
Saqib Ansari	8128b33d4f	Merge pull request #29732 from alyf-de/encode-filters ... fix: encode filters for URI	2022-02-11 14:44:46 +05:30
Saqib Ansari	2d8e03e059	Merge pull request #29748 from nextchamp-saqib/fix-gp-report-columns ... fix: cannot jump to sales invoice in gross profit report	2022-02-11 14:38:40 +05:30
Rucha Mahabal	c7be9ef5d2	fix: consider leaves for past months if assignment is based on joining date too	2022-02-11 13:52:46 +05:30
Saqib Ansari	78dd364b0b	fix: cannot jump to sales invoice in gross profit report	2022-02-11 12:32:45 +05:30
Ankush Menat	77be98295c	fix: update bin modified timestamp when updating qty ... These timestamps are used for writing integrations hence whenever bin is updated timestamp should update to reliabily use Bin for integration logic.	2022-02-11 11:54:58 +05:30
Ankush Menat	1553fa9c90	refactor!: drop deprecated and dead code	2022-02-11 11:23:37 +05:30
marination	86ca41b14a	test: Production Plan Pending Qty impact tests ... - Two tests to check impact on pending qty: From SO and independent Prod Plan - Added docstring to each test case for brief summary - Changed helper function args to fallback to 0 instead of 1 if no arg is passed - Removed unnecessary `get_doc()` - Made helper function actions optional depending on args passed	2022-02-10 20:14:28 +05:30
Deepesh Garg	da73685f71	fix: Multiple fixes in Gross Profit report	2022-02-10 13:07:51 +05:30
Rohit Waghchaure	eec2f87088	fix: time out error while making work orders from prodcution plan	2022-02-10 12:30:41 +05:30
Ankush Menat	c371b52d27	fix: restrict filetypes to csv for rename tool	2022-02-10 10:26:00 +05:30
Devin Slauenwhite	49bee568a1	fix: get cart items for logged in user.	2022-02-09 12:03:05 -05:00
barredterra	5811d9e318	fix: encode filters for URI	2022-02-09 17:53:33 +01:00
Devin Slauenwhite	aeee334843	Merge remote-tracking branch 'upstream/develop' into feat-user-unique-cart	2022-02-09 11:08:24 -05:00
Devin Slauenwhite	34ad5b1abf	fix: get cart for logged in user.	2022-02-09 10:53:24 -05:00
Devin Slauenwhite	d636c3fb04	test: many users linked to customer shopping cart	2022-02-09 10:52:38 -05:00
Sagar Vora	2bc157a95c	fix: cleaner implementation for get_invoice_type	2022-02-09 17:48:24 +05:30
Smit Vora	6e679a5ad2	fix(India): Report GSTR-1 minor fixes	2022-02-09 17:48:24 +05:30
Sagar Vora	b68a99675d	fix: allow regional_overrides hook to be set in subsequent apps	2022-02-09 16:56:53 +05:30
Saqib Ansari	b35b637d01	Merge pull request #29701 from nextchamp-saqib/consolidation-round-off-err ... fix(pos): incorrect grand_total in case of inclusive taxes on item	2022-02-09 16:42:30 +05:30
Saqib Ansari	0ebd32dc63	fix: cancelling of consolidated sales invoice that doesn't have closing entry	2022-02-09 16:08:28 +05:30
Saqib Ansari	4bb557dbd8	fix: flaky point of sale test	2022-02-09 16:07:42 +05:30
Saqib Ansari	75256863c6	fix(test): do not enable negative stock	2022-02-09 16:07:33 +05:30
Ankush Menat	2abc1c244e	Merge pull request #29715 from aaronmenezes/fix_reserved_for_production_calc ... fix: Reserved for Production calculation considered closed work orders	2022-02-09 15:59:52 +05:30
Ankush Menat	89959976bd	fix: patch existing bins	2022-02-09 12:21:05 +05:30
Rucha Mahabal	89fa0bb73f	fix: consider based on DOJ config while calculating leaves for passed months	2022-02-09 11:28:14 +05:30
Ankush Menat	a8bf3a3f0d	refactor: move reserve quantity computation to work order	2022-02-09 11:26:03 +05:30
Ankush Menat	d2cc5f2482	test: remove dependency on other tests	2022-02-09 11:19:01 +05:30
Saqib Ansari	8ff7587aaa	Merge branch 'develop' into fix-ignore-pricing-rule	2022-02-09 10:31:22 +05:30
Saqib Ansari	ab36b27a94	fix: ignore pricing rule in all transactions	2022-02-09 10:10:17 +05:30
Deepesh Garg	6fd5281b46	Merge branch 'develop' into reverse_entry_dead_lock	2022-02-08 22:37:18 +05:30
aaronmenezes	6a8b7eeffe	fix: Reserved for Production calculation considered closed work orders	2022-02-08 19:25:49 +05:30
Saqib Ansari	07dc228e32	Merge branch 'develop' into consolidation-round-off-err	2022-02-08 18:06:41 +05:30
marination	eaccef6116	fix: Initialise pending qty as planned qty for independent item rows in Prod Plan ... - Rows that are not fetched from MR or SO, had pending qty 0 throughout - Initialise pending qty on save only. - After submit this field will be updated by work order/stock entry - Bring functions in `validate()` closer to the top	2022-02-08 17:55:38 +05:30
Saqib Ansari	6fa406dd04	fix(test): pass price_list_rate only if pricing rule has to be removed	2022-02-08 17:51:53 +05:30
Ankush Menat	befcca4183	Merge branch 'develop' into lifo_valuation	2022-02-08 17:38:06 +05:30
Saqib Ansari	c2b83a0283	fix(test): case if write off is calculated as negative amount	2022-02-08 17:36:39 +05:30
Rucha Mahabal	7326d57966	fix: Earned Leave allocation based on joining date not working	2022-02-08 17:14:11 +05:30
Saqib Ansari	b51a5d9225	Merge pull request #29709 from nextchamp-saqib/fix-bank-reco-currency ... fix: currency in bank reconciliation chart	2022-02-08 16:32:35 +05:30
Saqib Ansari	afc5c26d1c	fix(test): ignore stock validation	2022-02-08 16:04:08 +05:30
Saqib Ansari	3f962739fb	Merge branch 'develop' of https://github.com/frappe/erpnext into consolidation-round-off-err	2022-02-08 16:02:18 +05:30
Saqib Ansari	0fc5d2278d	fix: currency in bank reconciliation chart	2022-02-08 15:50:41 +05:30
Rucha Mahabal	bdf38a33cc	Merge pull request #29650 from ruchamahabal/fix-earned-leaves-allocation	2022-02-08 15:47:43 +05:30
Saqib Ansari	4f4395545e	Merge branch 'develop' into fix-ignore-pricing-rule	2022-02-08 15:29:28 +05:30
Saqib Ansari	27ced4f082	Merge pull request #29560 from ruthra-kumar/bug_invoice_creation_throws_typeerror ... fix: typeerror on invoice creation from SO/PO	2022-02-08 15:27:05 +05:30
Rucha Mahabal	b71283aa7d	Merge branch 'develop' into fix-earned-leaves-allocation	2022-02-08 14:39:55 +05:30
Rucha Mahabal	bd1555bd23	fix: handle carry forwarded leaves while checking for duplicate allocation	2022-02-08 14:36:31 +05:30
Ankush Menat	bb105a33b2	test: validate on save instead of on creation ... (cherry picked from commit 0efd5577bd9bdc0bb900d4d23d85aa86fd09929a)	2022-02-08 14:01:41 +05:30
Bhavesh Maheshwari	3969840ee8	fix: ignore rate validation for work order ... (cherry picked from commit f29aed7f7130b805810075db1e5e1003e997bef8)	2022-02-08 14:01:41 +05:30
marination	7116d7ae0e	fix: Set Pending Qty in Prod Plan after updating Work Order	2022-02-08 12:40:33 +05:30
marination	4f5a0b8941	chore: Fix flaky test test_exact_match_with_price ... - Clear cart settings in cache to avoid stale values	2022-02-08 12:02:02 +05:30
Saqib Ansari	0f913e0173	Merge branch 'develop' into bug_invoice_creation_throws_typeerror	2022-02-08 11:51:26 +05:30
Saqib Ansari	5e32b809cb	Merge pull request #29599 from nemesis189/coupon-code-issue-pos ... fix: Coupon code item pricing dynamic updation issue in pos screen	2022-02-08 11:50:19 +05:30
Saqib Ansari	8eff2969b0	Merge pull request #29699 from nextchamp-saqib/improve-debit-to-err-msg ... chore: show credit/debit-to account in error message	2022-02-08 11:42:57 +05:30
Saqib Ansari	4c3d751421	Merge branch 'develop' into fix-ignore-pricing-rule	2022-02-08 11:42:33 +05:30
Saqib Ansari	0452d7de20	fix(pos): incorrect grand_total in case of inclusive taxes on item	2022-02-08 11:26:23 +05:30
marination	a64228741d	fix: Trim spaces from attributes (multi-variant creation) & explicit method for building cache ... - Multiple Item Variants creation fails due to extra spaces in attributes from popup. Clean them before passing to server side - Mention explicit method to build variants cache to avoid ambiguity between old method path (pre-refactor)	2022-02-08 11:15:19 +05:30
Saqib Ansari	e93bb8a336	chore: show credit/debit-to account in error message	2022-02-08 10:49:37 +05:30
Ankush Menat	0ca60afc3f	fix: ignore cancelled SLEs (#29679)	2022-02-08 10:24:19 +05:30
Mohammed Yusuf Shaikh	a3e69cf75d	feat: Bulk Transaction Processing (#28580) ... * feat: Bulk Transaction Processing * fix: add flags to ignore validations and exception handling correction * fix: remove duplicate code, added logger functionality and improved notifications * fix: linting and sider issues * test: added tests * fix: linter issues * fix: failing test case * fix: sider issues and test cases * refactor: mapping function calls to create order/invoice * fix: added more test cases to increase coverage * fix: test cases * fix: sider issue * fix: rename doctype, improve formatting and minor refactor * fix: update doctype name in hooks and sider issues * fix: entry log test case * fix: typos, translations and company name in tests * fix: linter issues and translations * fix: linter issue * fix: split into separate function for marking failed transaction * fix: typos, retry failed transaction logic and make log read only * fix: hide retry button when no failed transactions and remove test cases not rrelevant * fix: sider issues and indentation to tabs Co-authored-by: Ankush Menat <ankush@frappe.io>	2022-02-08 01:00:37 +05:30
Deepesh Garg	2280ae5554	Merge pull request #29549 from frappe/mergify/bp/develop/pr-29290 ... fix: billed amount in delivery note items (backport #29290)	2022-02-07 23:49:19 +05:30
Deepesh Garg	529cc72863	Merge pull request #29656 from ankush/credit_debit_pr ... fix: dont ignore items that dont have SVD	2022-02-07 23:46:07 +05:30
Ankush Menat	f82d7eb73f	test: commit item/warehouse creation to db	2022-02-07 22:55:56 +05:30
Ankush Menat	43f8ee1dd1	chore: drop dead field from stock reconciliation	2022-02-07 22:55:56 +05:30
Ankush Menat	699519f7b6	test: product bundle reposting	2022-02-07 22:55:56 +05:30
Ankush Menat	853e658dcc	test: move bundle info to class variables	2022-02-07 22:55:56 +05:30
Ankush Menat	1022db0474	fix: merge stock ledger item warehouse with doc's	2022-02-07 22:55:56 +05:30
Ankush Menat	e6ab8df8f2	refactor: simplify get_items_and_warehouses ... Also remove dead code related to stock reconciliation_json.	2022-02-07 22:55:56 +05:30
Ankush Menat	c56d07dee3	fix: consider packed items too when reposting	2022-02-07 22:55:56 +05:30