31457 Commits

Author	SHA1	Message	Date
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
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
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	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
Deepesh Garg	fe2ced7bee	fix: Regional print format addition	2022-02-25 16:57:59 +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
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
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
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
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	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