8246 Commits

Author	SHA1	Message	Date
Deepesh Garg	70b960e650	fix: Account filter in PSOA	2022-02-22 09:16:08 +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
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
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	3a5dbfab50	fix: make cashflow mapping template child doctype	2022-02-21 15:32:28 +05:30
Deepesh Garg	a82cf7214e	fix: Total Credit amount in TDS Payable monthly report	2022-02-21 13:58:56 +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	5a2b571aa9	fix: Validate party account with company	2022-02-18 20:05:49 +05:30
Deepesh Garg	8b3d9088df	Merge branch 'develop' into consolidated_financial_statment_error	2022-02-17 23:32:50 +05:30
Deepesh Garg	555b1335f6	feat: Bank Reconciliation for loan documents	2022-02-17 19:15:30 +05:30
ChillarAnand	b3d4465db6	Merge branch 'develop' into remove-nonprofit	2022-02-17 15:30:11 +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
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
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
Deepesh Garg	973f6b1bbd	fix: Gross profit for credit notes	2022-02-14 22:14:17 +05:30
Deepesh Garg	04cbde2e52	fix: Filter out bank payment entries	2022-02-14 20:38:04 +05:30
Deepesh Garg	2ff6b3560e	fix: Fixes in TDS payable monthly report	2022-02-14 19:51:58 +05:30
Saqib Ansari	18d0a59a9d	fix: disable rounded total in opening invoice creation tool	2022-02-14 18:38:02 +05:30
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
Ankush Menat	eb8b424722	feat: item-wise negative stock setting (#29761)	2022-02-12 13:08:28 +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	78dd364b0b	fix: cannot jump to sales invoice in gross profit report	2022-02-11 12:32:45 +05:30
Deepesh Garg	da73685f71	fix: Multiple fixes in Gross Profit report	2022-02-10 13:07:51 +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	75256863c6	fix(test): do not enable negative stock	2022-02-09 16:07:33 +05:30
Saqib Ansari	8ff7587aaa	Merge branch 'develop' into fix-ignore-pricing-rule	2022-02-09 10:31:22 +05:30
Deepesh Garg	6fd5281b46	Merge branch 'develop' into reverse_entry_dead_lock	2022-02-08 22:37:18 +05:30
Saqib Ansari	07dc228e32	Merge branch 'develop' into consolidation-round-off-err	2022-02-08 18:06:41 +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
Saqib Ansari	c2b83a0283	fix(test): case if write off is calculated as negative amount	2022-02-08 17:36:39 +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
Saqib Ansari	4f4395545e	Merge branch 'develop' into fix-ignore-pricing-rule	2022-02-08 15:29:28 +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
Saqib Ansari	e93bb8a336	chore: show credit/debit-to account in error message	2022-02-08 10:49:37 +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	cec971b5db	Merge pull request #29349 from alyf-de/disable-item-tax-category ... feat: option to disable Item Tax Template and Tax Category	2022-02-07 11:01:03 +05:30
Umair Sayed	104a55aff1	feat: Tab views in Stocks and Accounts Settings (#29638) ... * tab views in Stocks and Accounts Settings. Clean-up in Selling and Buying Settings. * chore: undo changes to creation timestamp happened because of a bug in fw Co-authored-by: Umair Sayed <umairsayed@Umairs-MacBook-Air-2.local>	2022-02-07 10:42:55 +05:30
Chillar Anand	768e6b2e0e	Merge branch 'develop' into remove-nonprofit	2022-02-07 10:29:25 +05:30
Deepesh Garg	ff57450e77	fix: Replace ORM with query builder	2022-02-06 22:56:12 +05:30
Deepesh Garg	81b967851a	Merge pull request #29601 from deepeshgarg007/provisonal_loss_bs ... fix: Incorrect provisional profit and loss in balance sheet	2022-02-06 19:33:12 +05:30
Deepesh Garg	3e6fade08d	Merge pull request #29641 from deepeshgarg007/jv_cancel_ignore ... fix: Ignore linked invoices on Journal Entry cancel	2022-02-06 18:57:13 +05:30
Ankush Menat	8858c703a8	fix: ignore cancelled svd while updating GLE for PR ... This happens because LCV cancels and reposts entries so unless filtered by non-cancelled entries you can randomly get old values.	2022-02-05 20:58:56 +05:30
Raffael Meyer	b5242df15b	Merge branch 'develop' into disable-item-tax-category	2022-02-04 18:10:39 +01:00
Deepesh Garg	6f7ae62907	fix: Ignore linked invoices on Journal Entry cancel	2022-02-04 20:13:20 +05:30
Ankush Menat	ba847ef218	Merge branch 'develop' into provisonal_loss_bs	2022-02-03 17:18:00 +05:30
ChillarAnand	325dc92d37	Merge branch 'develop' into remove-nonprofit	2022-02-03 16:38:01 +05:30
Deepesh Garg	ed2c6b6637	fix: Incorrect provisional profit and loss in balance sheet	2022-02-02 22:36:45 +05:30
Saqib Ansari	5a7236efcd	Merge branch 'develop' into fix-ignore-pricing-rule	2022-02-02 21:47:51 +05:30
Deepesh Garg	ffec865e00	fix: Make a deep copy of GLE	2022-02-02 17:14:42 +05:30
Deepesh Garg	f1c3bcee1f	fix: Deadlock on making reverse GL Entries	2022-02-02 17:09:34 +05:30
marination	4b62d2d7fe	fix: (Linter) Write queries using QB/ORM and other minor lines for semgrep to skip	2022-02-02 12:58:31 +05:30
Marica	780e29b42e	Merge branch 'develop' into e-commerce-refactor-develop	2022-02-02 10:45:14 +05:30
Nabin Hait	008b331f49	Merge branch 'cc-allocation' into develop	2022-02-01 22:27:23 +05:30
Nabin Hait	81d1ad6059	fix: Allocation percentage fieldtype changed to percent	2022-02-01 22:26:39 +05:30
Saqib Ansari	4055cc76a7	Merge pull request #29556 from nextchamp-saqib/nemesis189-pos-service-items ... feat: Allowing non stock items in POS	2022-02-01 16:36:10 +05:30
Deepesh Garg	528c71382f	feat: Provisional accounting for expenses (#29451) ... * feat: Provisonal accounting for expenses * fix: Method for provisional accounting entry * chore: Add test case * fix: Remove test case * fix: Use company doctype * fix: Add provisional expense account field in Purchase Receipt Item * fix: Test case * fix: Move provisional expense account to parent * fix: Patch	2022-02-01 14:42:55 +05:30
Saqib Ansari	4557b6a150	Merge branch 'develop' into pos-service-items	2022-02-01 12:25:25 +05:30
Sagar Sharma	1fd8539873	fix: check so_detail before dn_detail ... (cherry picked from commit 5de6b8dc4df407fd953efe69640e22bd4ea90b6e)	2022-02-01 05:39:38 +00:00
Marica	19e5dfbb7c	Merge branch 'develop' into e-commerce-refactor-develop	2022-02-01 00:56:11 +05:30
Nabin Hait	5b0ec6437b	fix: sider issues	2022-01-31 18:41:42 +05:30
Nabin Hait	6099af5d00	fix: Fixed test case and sider issues	2022-01-31 17:43:37 +05:30
Ankush Menat	6cd7c47409	Merge branch 'develop' into e-commerce-refactor-develop	2022-01-31 17:14:36 +05:30
Nabin Hait	3dadfc9048	patch: Removed files and code related to old distributed cost center feature	2022-01-31 15:58:40 +05:30
Nabin Hait	c09d5a613e	fix: Delete old fields from cost center related to distributed cost center	2022-01-31 13:26:09 +05:30
Nabin Hait	174104c0d4	feat: Workspace link for Cost Center Allocation	2022-01-31 13:24:18 +05:30
Nabin Hait	004c1ed094	feat: Split Gl Entry based on cost center allocation	2022-01-31 13:24:18 +05:30
Nabin Hait	ac2e19103f	Cost Center Allocation doctype, validations and test cases	2022-01-31 13:24:18 +05:30
Subin Tom	05bbb69d0e	fix: Validation for invalid serial nos at POS invoice level (#29447)	2022-01-31 13:08:19 +05:30
Saqib Ansari	1170bee951	Merge pull request #29480 from nextchamp-saqib/revert-drop-einvoicing ... revert: "refactor!: drop e-invoicing integration from erpnext"	2022-01-31 11:35:48 +05:30
smehata	b818b93568	Update sales_invoice.js (#29491) ... undefined issue	2022-01-30 17:27:20 +05:30
Deepesh Garg	2bf405d44c	fix:Add shipping charges to taxes only if applicable ... (cherry picked from commit e8bc4f12a734ff286a008e6b31dffa9c6c946365)	2022-01-29 07:27:21 +00:00
Saqib Ansari	273fbe792c	Merge branch 'develop' into fix-ignore-pricing-rule	2022-01-29 12:44:19 +05:30
Saqib Ansari	452a809ef4	Merge pull request #28877 from nextchamp-saqib/multiple-pricing-rule-fix ... fix: qty filter not working if apply_multiple_pricing_rules is enabled	2022-01-29 12:43:41 +05:30
Saqib Ansari	8a66a7ad46	Merge branch 'develop' into fix-ignore-pricing-rule	2022-01-29 12:42:00 +05:30
Saqib Ansari	2c100a5313	Merge branch 'develop' into revert-drop-einvoicing	2022-01-28 14:34:29 +05:30
Saqib	0b626816d0	feat(e-invoicing): dispatch address (#28084)	2022-01-27 20:19:37 +05:30
Saqib Ansari	c5782b0e71	revert: "refactor!: drop e-invoicing integration from erpnext (#26940)" ... This reverts commit c335962827.	2022-01-27 20:09:56 +05:30
Ankush Menat	b05287dea0	fix: drop six code (#29479)	2022-01-27 20:08:05 +05:30
ChillarAnand	16ca81d6a6	refactor: Remove non-profit code in ERPNext	2022-01-27 10:08:41 +05:30
Deepesh Garg	b72cdb4bca	fix: Previous document currency getting overriden ... (cherry picked from commit ef782fd35b0717e3f7c50dbb6c5dde7c96ae9ef6)	2022-01-24 15:19:54 +00:00
Deepesh Garg	108d1045e6	Merge pull request #29360 from ruthra-kumar/test_case_deferred_report ... test: unit test for deferred item with zero months	2022-01-24 12:41:37 +05:30
Deepesh Garg	34be90b396	Merge pull request #29407 from ruthra-kumar/dimension_in_opening_invoice ... fix: opening invoice creation tool can fetch multiple accounting dimension	2022-01-24 12:36:20 +05:30
ruthra	f122a47d0d	refactor: fix failing test cases	2022-01-24 10:08:25 +05:30
ruthra	80ea163953	fix: linter issue	2022-01-23 21:49:02 +05:30
ruthra	88463dc494	test: validating custom accouting dimension in opening invoice tool ... - create new dimension 'department' - assign and validate department in opening invoices	2022-01-21 19:33:06 +05:30
ruthra	e2267cdba8	fix: opening invoice creation tool not taking in accouting dimension	2022-01-21 19:21:26 +05:30
Saqib Ansari	c7e75f9551	Merge pull request #29385 from nextchamp-saqib/asset-fix-depr-fix ... fix: first depreciation amount in asset	2022-01-21 14:25:43 +05:30
Saqib Ansari	ae580d116c	fix: failing test cases	2022-01-21 12:19:53 +05:30
Noah Jacob	20216fa9f1	fix: updated packed_items getting fetched on Sales Return / Credit Note (#28607) ... * fix: updated packed_items getting fetched on sales return * fix: updated test cases for product bundle returns * fix: moved calculate_mapped_packed_items_return to stock.utils * fix: updated packed_items getting fetched on Return/Credit Note * refactor: change var name to avoid `self` * fix: check item code before assigning parent item Co-authored-by: Ankush Menat <ankush@frappe.io>	2022-01-21 11:50:13 +05:30
Saqib Ansari	b8c41e3030	test: item price on remove pricing rule	2022-01-20 13:06:56 +05:30
Saqib Ansari	f6dda738dc	fix: ignore pricing rule in all transactions	2022-01-20 12:22:56 +05:30
Saqib Ansari	3da2cac772	chore: undo unnecessary changes	2022-01-20 12:09:04 +05:30
Deepesh Garg	e34da90653	fix: Cleanup empty rows on bank statement import ... (cherry picked from commit 25398d017bca53f14c7ebb6c9f937ef7c1390093)	2022-01-20 05:55:43 +00:00
ruthra	1e0450ed17	test: unit test for deferred items with zero months	2022-01-19 15:51:40 +05:30
ruthra	ed0f9cc063	refactor: a more generalized way to clear old entries for test cases	2022-01-19 15:50:04 +05:30
barredterra	663c594ead	feat: option to disable tax category	2022-01-18 21:16:29 +01:00
barredterra	f60e040d69	feat: option to disable Item Tax Template	2022-01-18 21:15:27 +01:00
Saqib Ansari	0efdbae783	fix: minor onboarding fixes	2022-01-18 18:38:59 +05:30
Subin Tom	ac9a9fb229	fix: removing get_value call by returning is_stock_item in get_stock_availability method	2022-01-17 19:38:05 +05:30
Deepesh Garg	6bea91e9fe	Merge pull request #29182 from ruthra-kumar/project_in_purchase_invoice ... fix: get project from PO into payment entry	2022-01-17 15:04:03 +05:30
Deepesh Garg	09172002e7	fix: Linting issues	2022-01-17 15:01:17 +05:30
Ankush Menat	3db8d908dc	Merge pull request #29278 from shariquerik/update-workspace-json ... fix: Updating public workspace json based on new design	2022-01-17 13:25:16 +05:30
Deepesh Garg	1e34300f69	Merge branch 'develop' into project_in_purchase_invoice	2022-01-15 21:00:14 +05:30
Deepesh Garg	14e0d00a61	Merge pull request #29115 from deepeshgarg007/deferred_revenue_multi_currency_jv ... fix: Deferred revenue booking for multi currency invoices via JV	2022-01-15 18:55:41 +05:30
Deepesh Garg	fd922f1617	fix: Remove unwanted test	2022-01-15 18:27:40 +05:30
Deepesh Garg	b9b4c9aff7	Merge pull request #29270 from nextchamp-saqib/change-fieldtype ... fix: threshold fields shows incorrect currency	2022-01-14 14:50:45 +05:30
Deepesh Garg	08f26de3df	fix: Remove comment	2022-01-13 23:05:27 +05:30
Deepesh Garg	24bb1e8987	fix: Test case	2022-01-13 19:44:26 +05:30
Shariq Ansari	bc187c121a	fix: updated standard workspace json files	2022-01-13 19:24:11 +05:30
Saqib Ansari	0e1b8322c1	fix: threshold fields shows incorrect currency	2022-01-13 12:06:03 +05:30
Marica	b5abf68b0d	Merge branch 'develop' into e-commerce-refactor-develop	2022-01-12 02:52:03 +05:30
Deepesh Garg	d6ee678ec9	Merge pull request #29193 from ruthra-kumar/bug_deferred_report ... fix: deferred report division by zero exception	2022-01-11 17:19:08 +05:30
Saqib Ansari	c45042c00e	feat: early payment discount on sales & purchase orders (#29101)	2022-01-11 15:03:07 +05:30
Saqib Ansari	75c8b2556e	fix(pos): cannot ignore pricing rule for one particular invoice (#29222)	2022-01-11 13:25:42 +05:30
Saqib Ansari	c62083653b	fix(gl-report): group by cost center only if include_dimensions is checked (#28883)	2022-01-11 12:45:40 +05:30
Deepesh Garg	93d784dde3	Merge branch 'develop' of https://github.com/frappe/erpnext into currency-exchange-settings	2022-01-10 21:28:53 +05:30
Deepesh Garg	ca5ea5f55f	fix: test cases	2022-01-10 21:28:29 +05:30
Ankush Menat	f195f803ff	test: account reports	2022-01-10 19:14:22 +05:30
Ankush Menat	2d76c05175	refactor: unnecessary joining of lists	2022-01-10 19:14:22 +05:30
Saqib Ansari	e5b649b588	fix: pos invoices consolidation case with permlevel (#29011)	2022-01-10 18:24:08 +05:30
Deepesh Garg	3fdd47e71f	Merge branch 'develop' of https://github.com/frappe/erpnext into currency-exchange-settings	2022-01-10 17:32:15 +05:30
Deepesh Garg	e2dab6f421	fix: Cleanup and fixes	2022-01-10 17:31:38 +05:30
ruthra	8026f86548	refactor: get project from basic transactions ... - sales order, sales invoice, purchase order and purchase order - if project not found in transaction, get from items	2022-01-10 12:58:58 +05:30
Deepesh Garg	18c4ddadf1	fix: Test case	2022-01-07 20:57:15 +05:30
Deepesh Garg	30a647ff80	fix: Handle frozen books while handling	2022-01-07 19:52:38 +05:30
Deepesh Garg	2aea078699	Merge branch 'develop' of https://github.com/frappe/erpnext into deferred_revenue_multi_currency_jv	2022-01-07 19:06:16 +05:30
Deepesh Garg	2de5122262	fix: Add iteritems back	2022-01-07 18:30:19 +05:30
Deepesh Garg	00055bb159	fix: Conflicts	2022-01-07 18:11:38 +05:30
Deepesh Garg	14689a51f4	Merge branch 'develop' of https://github.com/frappe/erpnext into deferred_revenue_multi_currency_jv	2022-01-07 16:49:57 +05:30
ruthra	fe4d7f86ee	fix: deferred report division by zero exception	2022-01-07 16:30:56 +05:30
Deepesh Garg	bf5930c4bb	fix: Show GL balance in Accounts Receivable and payable summary ... (cherry picked from commit 1d270dca05501b5a15d19e3270188029b48eafde) # Conflicts: # erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py	2022-01-07 09:35:19 +00:00
Deepesh Garg	f6f449ed18	Merge pull request #29176 from deepeshgarg007/outstanding_amount_anomaly ... fix: Inconsistency in calculating outstanding amount	2022-01-07 13:28:52 +05:30
Deepesh Garg	9d3a5c3184	fix: Inconsistency in calculating outstanding amount	2022-01-06 18:58:49 +05:30
Deepesh Garg	80dce1ab73	Merge pull request #29125 from nextchamp-saqib/fix-reverse-jv ... fix: cannot create reverse journal entry	2022-01-06 13:30:50 +05:30
ruthra	ca17c7226c	fix: get project from PO into payment entry	2022-01-06 11:34:47 +05:30
Saqib Ansari	fbd706f232	fix: existing party link validation (#29159)	2022-01-05 17:55:08 +05:30
Subin Tom	3febca1a9a	fix: Modifying Opening invoice creation tool timestamp (#29127)	2022-01-04 19:37:44 +05:30
Saqib Ansari	f4db474be0	fix: minor issues (#29130)	2022-01-04 19:12:19 +05:30
Chillar Anand	0900c3d655	refactor: Removed agriculture module from ERPNext (#29022)	2022-01-04 17:26:11 +05:30
Deepesh Garg	e311667a25	fix: Test case	2022-01-04 16:24:24 +05:30
Saqib Ansari	3aa1817f7b	fix: cannot create reverse journal entry	2022-01-04 14:43:02 +05:30
Deepesh Garg	094158f287	fix: Add test case for multicurrency invoice	2022-01-04 14:04:18 +05:30
Deepesh Garg	98f294a8ae	fix: Deferred revenue booking for multi currency invoices via JV	2022-01-03 19:40:47 +05:30
Saqib Ansari	7e777356ee	Merge pull request #28160 from resilient-tech/fix-invoice-statuses ... refactor: `update_invoice_status` with query builder	2022-01-03 17:59:11 +05:30
Subin Tom	7385497219	fix: using get_batch_qty method to get available_qty	2022-01-03 16:57:00 +05:30
Subin Tom	9e20fa85c1	fix: Removed validate_non_stock_items, filter_service_items methods	2022-01-03 14:46:53 +05:30
Saqib Ansari	568550874d	Merge branch 'develop' into pos-batch-no-stock-validation	2022-01-03 14:46:29 +05:30
Saqib Ansari	d0f5beeb34	fix: filter query in bank reconciliation tool (#29098)	2022-01-03 11:33:03 +05:30
Deepesh Garg	c3d890f3f1	fix: get fiscal year based on date	2022-01-02 19:10:49 +05:30
Deepesh Garg	4b6217a683	fix: Test Case ... (cherry picked from commit 342658ea7028cc0d890200364cc08cf97e55d6d0) # Conflicts: # erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py	2022-01-02 13:36:43 +00:00
Deepesh Garg	db829a0610	Merge pull request #29050 from mohsinalimat/patch-1 ... feat: Add currency in import download statement	2022-01-02 17:15:01 +05:30
Dany Robert	321730a88e	Merge branch 'develop' into ledger-merger	2021-12-31 13:02:12 +05:30
MohsinAli	72369092a3	Merge branch 'develop' into patch-1	2021-12-30 17:13:59 +05:30
Saqib Ansari	689e08aca3	Merge branch 'develop' into pos-service-items	2021-12-29 14:55:20 +05:30
Pruthvi Patel	fc0dd3fcd7	Merge branch 'develop' into fix-invoice-statuses	2021-12-29 13:45:35 +05:45
Deepesh Garg	6405699821	Merge branch 'develop' into mergify/bp/develop/pr-28996	2021-12-28 14:46:12 +05:30
Deepesh Garg	6f933db3cc	fix: Deferred revenue test case	2021-12-28 14:16:19 +05:30
Deepesh Garg	057cfb22d6	fix: Remove debug statement ... (cherry picked from commit becb39da902e7e113c3dacb7eee7921144b8e99d)	2021-12-28 08:11:18 +00:00
Deepesh Garg	d807d78313	fix: Issues in Bank Reconciliation tool ... (cherry picked from commit ff183ee895fb0dd1ca595eb76e2286695063315a)	2021-12-28 08:11:18 +00:00
MohsinAli	a0863d1cb1	feat: Add currency in import download statement ... Add currency in bank statement import	2021-12-28 10:27:19 +05:30
Subin Tom	ec37930404	fix: Allowing non stock items in POS	2021-12-22 19:14:47 +05:30
Pruthvi Patel	617f7565ce	Merge branch 'develop' into fix-invoice-statuses	2021-12-21 22:16:14 +05:45
Saqib	7f786e44a1	Merge branch 'develop' into pos-batch-no-stock-validation	2021-12-21 17:05:43 +05:30
Saqib	c3a9ca09d1	chore: remove extra whitespace	2021-12-21 17:05:36 +05:30
Saqib	9c8f523537	fix: typo	2021-12-21 17:01:10 +05:30
Ganga Manoj	1ed30ee7c7	fix: Reset value_after_depreciation on reversing journal entry during Asset return	2021-12-21 13:59:53 +05:30
Ankush Menat	d7148adee5	test: remove unnecessary creation of companies #28965 ... test: remove unnecessary creation of companies	2021-12-20 22:00:31 +05:30
Deepesh Garg	c5c7777bd5	Merge pull request #28959 from deepeshgarg007/consolidated_balance_return_fix ... fix: Error on viewing consolidated financial statement	2021-12-20 17:13:12 +05:30
Ankush Menat	f5d5281119	chore: drop deprecated qunit tests	2021-12-20 17:03:10 +05:30
Deepesh Garg	5d6199cf35	fix: Error on viewing consolidated financial statement	2021-12-20 16:54:52 +05:30
Pruthvi Patel	4d48ca4228	test: update_invoice_status	2021-12-20 13:23:14 +05:30
Dany Robert	c68b2c3763	Merge branch 'develop' into currency-exchange-settings	2021-12-18 18:32:12 +05:30
Saqib	1abdcf2bea	Merge branch 'develop' into multiple-pricing-rule-fix	2021-12-18 12:13:33 +05:30
Dany Robert	e75295a151	Merge branch 'develop' into ledger-merger	2021-12-18 11:32:20 +05:30
Dany Robert	ab7f38224f	fix: remove db commit	2021-12-17 16:42:24 +00:00
Dany Robert	32e5db7cb8	chore: styling according to linter	2021-12-17 16:38:16 +00:00
Dany Robert	399446460a	feat: tests	2021-12-17 16:18:42 +00:00
Subin Tom	e85da7a03a	fix: Add Invoice Number field to list view in Opening Inv Creation Tool (#28938)	2021-12-17 21:48:10 +05:30
Dany Robert	b3a3367d1d	feat: allow group accounts	2021-12-17 13:06:30 +00:00
Deepesh Garg	6ab753015e	fix: Add tests for multicurrency subscription	2021-12-16 17:38:29 +05:30
Deepesh Garg	0e4842b986	fix: Multicurrency invoices using subscription	2021-12-16 16:51:41 +05:30
Subin Tom	9f235526d4	fix: Validation in POS for item batch no stock quantity	2021-12-15 22:34:44 +05:30
Deepesh Garg	64f68d5e94	Merge branch 'develop' into deferred_report_revenue_and_expense	2021-12-15 14:14:34 +05:30
Subin Tom	5c4d3f89d2	feat: 'Invoice Number' field in Opening Invoice Creation Tool (#28844)	2021-12-15 14:14:16 +05:30
Subin Tom	be103ab8e6	fix: Currency fix for cost field in subscription plan (#28821)	2021-12-15 13:01:48 +05:30
Saqib Ansari	5a7a9a598b	chore: rename redefinition of multiple pricing rule test	2021-12-15 10:32:23 +05:30
ruthra	9ec8841b91	refactor: rename checkbox and translations ... - rename checkbox and make it - added translation text for labels - fixes for linter error	2021-12-14 20:59:14 +05:30
ruthra	a8a598ace7	refactor: remove unused function 'get_postings'	2021-12-14 16:34:51 +05:30
Saqib Ansari	c0d1f4869f	test: add test_multiple_pricing_rules	2021-12-14 14:58:31 +05:30
Saqib Ansari	1e17d6a607	fix: qty filter not working if apply_multiple_pricing_rules is enabled	2021-12-14 14:58:20 +05:30
Saqib	c3e0de28b1	fix: validate if asset account is set against company	2021-12-13 20:13:53 +05:30
Deepesh Garg	a7f15a0eea	Merge branch 'develop' of https://github.com/frappe/erpnext into party_account_currency_check	2021-12-12 21:09:11 +05:30
Deepesh Garg	b966c45fa8	Merge pull request #28748 from deepeshgarg007/accounts_receivable_jv_due_date ... fix: Ageing in AR/AP report for advances	2021-12-12 17:27:21 +05:30
Deepesh Garg	a6fba7f128	Merge pull request #28764 from deepeshgarg007/tds_report_fixes ... fix: TDS Monthly payable report	2021-12-12 17:11:58 +05:30
ruthra	c3453cd73c	feat: Deferred Revenue and Expense report ... - show deferred revenue and expense with actual and expected postings - unit tests added	2021-12-10 19:30:43 +05:30
Dany Robert	75de5be53e	fix: import issue and minor fixes	2021-12-10 10:27:15 +00:00
Dany Robert	614b9270e7	fix: convert whitespace to tabs	2021-12-10 09:45:00 +00:00
Dany Robert	7554f11260	feat: progress bar, account name field	2021-12-10 08:45:47 +00:00
Ankush Menat	d37541d3fb	fix: ensure that reposting is finished before freezing stock/account	2021-12-10 12:31:49 +05:30
Dany Robert	b7cc20eac0	Merge branch 'develop' of https://github.com/rtdany10/erpnext into ledger-merger	2021-12-09 15:26:45 +00:00
Dany Robert	75f8117daf	feat: merge functionality	2021-12-09 15:23:10 +00:00
Dany Robert	57a7633f9b	feat: form updates and progressbar	2021-12-09 15:22:46 +00:00
Dany Robert	ad5d7897a8	feat: ledger merger doctype	2021-12-09 13:31:54 +00:00
Sagar Sharma	6485ac4e59	fix: misleading "Set Default X" fields after saving (#28798) ... * fix: misleading "Set Default X" fields after saving * refactor: remove unncessary code and minor formatting * fix: extend to more doctypes and correct fieldnames Co-authored-by: Ankush Menat <ankush@frappe.io>	2021-12-09 17:04:00 +05:30
Dany Robert	0592096c62	Merge branch 'develop' into currency-exchange-settings	2021-12-07 22:36:36 +05:30
Deepesh Garg	3e1591c145	Merge pull request #28731 from deepeshgarg007/better_deferred_revenue_error_logging ... fix: Better Error logging for deferred revenue/expense booking	2021-12-07 15:42:05 +05:30
Deepesh Garg	d106d59c3f	fix: TDS Monthly payable report	2021-12-06 20:36:48 +05:30
Deepesh Garg	3dabac15ed	fix: Ageing in AR/AP report for advances	2021-12-06 15:05:20 +05:30
Deepesh Garg	3c64e201cc	fix: Log error before throwing exception	2021-12-04 20:05:37 +05:30
Deepesh Garg	0ba4fcee2a	fix: Commit joural entries	2021-12-04 19:25:44 +05:30
Deepesh Garg	67a001d876	fix: Better Error logging fordeferred revenue/expense booking	2021-12-04 19:19:03 +05:30
Deepesh Garg	f12be3001d	fix: Taxes and Charges template not getting copied from Purchase Order/Receipt to Invoice ... (cherry picked from commit 6a75e8d283bb76214af832bb0a29c20eefae328c)	2021-12-03 04:12:42 +00:00
Deepesh Garg	107fb43d6a	fix: Paid showing in AR/AP report ... (cherry picked from commit 5e7ce5370f6af634f7674772529cf4933114f3ef)	2021-12-02 13:44:27 +00:00
Ankush Menat	fdffa037b5	test: dynamic fiscal year creation in tests (#28667)	2021-12-01 17:31:17 +05:30
Dany Robert	3708cf17ad	fix(POS Profile): replace cur_frm with frm (#28390)	2021-12-01 12:14:06 +05:30
Ankush Menat	bb00d38dd7	Merge branch 'develop' into asset-capitalization	2021-11-30 19:32:11 +05:30
mergify[bot]	071118fa4e	fix: Unable to search project by project name in Sales Invoice (bp #28648) ... (cherry picked from commit 08b7c856b2ee94d1f8ac2c019c556eef4d7dd7da) Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>	2021-11-30 13:15:20 +00:00
Deepesh Garg	ad8d296c08	Merge pull request #28636 from deepeshgarg007/zero_values_report ... feat: Show Zero Values filter in consolidated financial statement	2021-11-30 18:15:50 +05:30
Raffael Meyer	e10ab1626c	feat: Grant commission on certain items only (#27467) ... Co-authored-by: Sagar Vora <sagar@resilient.tech>	2021-11-30 17:54:18 +05:30
Deepesh Garg	9610086d0c	feat: Show Zero Values filter in consolidated financial statement	2021-11-30 13:24:23 +05:30
Ankush Menat	f862339024	fix: use get_all instead of get_list for child tables	2021-11-29 13:04:29 +05:30
xdlumertz	cdaf0a04cf	fix(ux): allow translations (#28455) ... * Translation * Translations Co-authored-by: xdlumertz <alexandrelumertz@gmail>	2021-11-27 15:03:35 +00:00
Deepesh Garg	38dfb60243	Merge pull request #27348 from deepeshgarg007/advance_tds_allocation_gl ... fix (refactor): Tax Withholding for Advances using Payment Entry against suppliers	2021-11-26 14:28:50 +05:30
Saqib	9c913c9b2d	fix: over billing validation (#28218)	2021-11-26 12:00:13 +05:30
Deepesh Garg	f07f010962	fix: Add tests	2021-11-25 23:58:16 +05:30
Deepesh Garg	5ba3b28d69	fix(refactor): Advance tds allocation to purchase invoice	2021-11-25 15:42:30 +05:30
Deepesh Garg	0931d17a2a	Merge branch 'develop' into currency-exchange-settings	2021-11-23 12:39:25 +05:30
Ganga Manoj	5ef2330022	fix: Replace 'parent' with 'invoice_or_item' (#28513)	2021-11-23 12:28:41 +05:30
Ganga Manoj	7d0558e202	fix: Add extra column to display Invoice or Item when grouped by Invoice (#28380)	2021-11-22 12:34:46 +05:30
Saqib	cb52e6dd6b	fix: cost center wise ledger posting for pcv (#28477)	2021-11-22 12:24:32 +05:30
Saqib	78851ecb70	feat: create party link from customer/supplier (#28387) ... * feat: create party link from customer/supplier * test: create_party_link method	2021-11-22 12:23:23 +05:30
Saqib	7677d6d4c3	Merge pull request #28402 from GangaManoj/gross-profit-percentage ... fix: Gross Profit report totals	2021-11-22 12:21:22 +05:30
Ahmed Shareef	3a2074ce05	fix: add child button in coa tree (#28413)	2021-11-22 11:46:58 +05:30
Saqib	08ad93d82f	fix: coa balance rendering bug (#28468)	2021-11-20 15:15:46 +05:30
Deepesh Garg	a57d39909e	Merge pull request #28302 from nemesis189/shipping-rule-updation-error ... fix: Shipping Rule picking up old net_rate	2021-11-19 08:21:53 +05:30
Ganga Manoj	5d8a85db10	Merge branch 'develop' into gross-profit-percentage	2021-11-17 19:23:34 +05:30
rohitwaghchaure	b9c8489de6	Merge pull request #28417 from rohitwaghchaure/currency-wise-pricing-rule-not-working ... fix: currency wise pricing rule not working	2021-11-17 14:02:19 +05:30
Rohit Waghchaure	43aeb541c2	fix: currency wise pricing rule not working	2021-11-17 13:30:17 +05:30
Sagar Vora	c00d0a3e24	fix: better validation for Integration Request (#28186)	2021-11-16 20:31:18 +05:30
Subin Tom	a8e2c02e14	fix: fixed tests, separated a method for shipping charges	2021-11-16 19:06:49 +05:30
Marica	6bd0c1dbf1	Merge pull request #28269 from marination/pr-return-ux ... refactor: (ux) Accepted/Rejected/Received Qty UX	2021-11-16 18:00:42 +05:30
Marica	0afcdecb9b	Merge branch 'develop' into e-commerce-refactor-develop	2021-11-16 17:58:53 +05:30
Subin Tom	a1807a2f98	fix: POS idx issue in taxes table while merging (#28389)	2021-11-16 17:46:26 +05:30
marination	f9929ed8a6	Merge branch 'develop' of https://github.com/frappe/erpnext into e-commerce-refactor-develop	2021-11-16 16:06:07 +05:30
Saqib	5f30104e00	Merge branch 'develop' into gross-profit-percentage	2021-11-16 16:00:07 +05:30
Marica	4afcbfdc08	Merge branch 'develop' into pr-return-ux	2021-11-16 15:15:48 +05:30
marination	293f6cbafd	fix: Sider, Linter and Server Side Test ... - Fix Server side PR test - linter: re-arrange imports - sider: avoid single line multi statement - Code cleanup: Improve code readability and avoid horizontal scroll in test_purchase_receipt - Removed unused variables in test_purchase_receipt	2021-11-16 14:36:15 +05:30
Ahmed Shareef	952fc87c99	refactor: fix help section background in dark mode (#28406)	2021-11-16 14:30:13 +05:30
marination	e9c75d6eea	test: Purchase Invoice Received Qty	2021-11-16 11:55:34 +05:30
Rohit Waghchaure	d82910b08a	fix: Pricing Rule not created against the Promotional Scheme	2021-11-16 10:27:59 +05:30
GangaManoj	1affa12b74	fix: Replace 'Totals' with 'Total'	2021-11-16 03:36:47 +05:30
GangaManoj	508a2301ee	fix: Display totals row in bold	2021-11-16 03:22:04 +05:30
GangaManoj	c7ffe3a7b4	fix: Remove unnecessary condition	2021-11-16 02:36:58 +05:30
GangaManoj	582a7ae964	fix: Add totals row when Grouped By Invoice	2021-11-16 02:33:51 +05:30
GangaManoj	3aaf7cb408	fix: Remove default Totals row	2021-11-16 02:33:12 +05:30
marination	afe1c45f7f	fix: Sider + Fields UX ... - remove extra space (sider) - PR: Bring rejected qty in grid view - PI: Rename `Stock Qty` to `Accepted Qty in Stock UOM` - PI: Move `Accepted Qty in Stock UOM` under Stock UOM	2021-11-15 17:17:29 +05:30
Dany Robert	3f8ad54c5c	Merge branch 'develop' into currency-exchange-settings	2021-11-13 13:13:15 +05:30
Dany Robert	e50893e991	fix: eslint brace style issue	2021-11-13 13:12:38 +05:30
Deepesh Garg	829f92f10a	Merge pull request #28363 from deepeshgarg007/default_party_account ... fix: Default party account getting overriden in invoices	2021-11-12 13:04:21 +05:30
Deepesh Garg	88648570d7	fix: Default party account getting overriden in invoices	2021-11-12 12:39:30 +05:30
rohitwaghchaure	0157da57b5	Merge pull request #28308 from rohitwaghchaure/commision-rate-not-fetch-from-sales-person ... fix: commission rate not fetch from sales person	2021-11-11 19:11:31 +05:30
Saqib	ecbe4b16b8	perf(minor): general ledger report (#27987)	2021-11-11 13:55:21 +05:30
Saif Ur Rehman	06aead0470	chore: isort	2021-11-10 13:45:40 +05:00
Saqib	6d05bb5274	fix(pos): get mode of payments query (#28321)	2021-11-10 13:06:55 +05:30
Anuja Pawar	2f004693c3	fix(Bank Reconciliation): get credit amount for bank account of type liability	2021-11-10 12:36:54 +05:30
Rohit Waghchaure	4d4bfa2333	fix: commision rate not fetch from sales person	2021-11-10 00:00:38 +05:30
Deepesh Garg	8a253ed1f3	Merge pull request #28238 from nextchamp-saqib/perf-financial-statements ... perf: improve financial statement loading time	2021-11-09 16:29:58 +05:30
Saqib	4a3cef6436	fix: update 'current_invoice_end' after processing invoice (#28278)	2021-11-09 14:16:38 +05:30
Saif Ur Rehman	cdb1800087	chore: remove unused import	2021-11-09 12:35:01 +05:00
Saif Ur Rehman	13f8edd43f	Merge remote-tracking branch 'upstream/develop' into asset-capitalization ... # Conflicts: # erpnext/accounts/doctype/sales_invoice/sales_invoice.py	2021-11-09 12:17:17 +05:00
Dany Robert	01e7076b65	Merge branch 'develop' into currency-exchange-settings	2021-11-06 09:59:00 +05:30
Ankush Menat	8fe5feb6a4	chore: remove all six compat code	2021-11-05 11:16:29 +05:30
Ankush Menat	897e90ac55	chore: remove past module dependencies	2021-11-05 11:16:29 +05:30
Ankush Menat	6098e92ba9	chore: remove utf-8 compat code	2021-11-05 11:16:29 +05:30
Saif Ur Rehman	dc3c27fd1b	fix(Asset Capitalization): update code for changes in depreciation logic	2021-11-04 13:47:33 +05:00
Saif Ur Rehman	2d9da22721	Merge branch 'develop' of https://github.com/frappe/erpnext into asset-capitalization ... # Conflicts: # erpnext/accounts/doctype/sales_invoice/sales_invoice.py # erpnext/assets/doctype/asset/test_asset.py # erpnext/assets/workspace/assets/assets.json	2021-11-04 12:48:33 +05:00
Dany Robert	4716523c77	fix: sider issues	2021-11-04 05:38:00 +00:00
Dany Robert	4a0f2175ad	fix: pre-commit issues	2021-11-04 05:25:48 +00:00
Dany Robert	e65a76b214	chore: clean up	2021-11-04 05:04:10 +00:00
Dany Robert	08b2735a79	fix: make fields editable only when service provider is custom	2021-11-04 05:01:37 +00:00
Dany Robert	7291d9f236	feat: option for preconfigured selectable service providers	2021-11-03 14:13:22 +00:00
Saqib Ansari	b7a44fe0a3	perf: improve financial statement loading time	2021-11-03 18:17:31 +05:30
hrwx	2bce193b81	Merge branch 'develop' of https://github.com/frappe/erpnext into subscription_active_fixes	2021-11-02 14:05:10 +00:00
Saqib	ec0a72423a	fix: Calculate depreciation_amount accurately (#27585)	2021-11-02 18:45:03 +05:30
hrwx	890a786858	fix: do not generate multiple invoices	2021-11-02 11:58:01 +00:00
Anuja Pawar	d72709dd81	fix(Payment Entry): splitting outstanding rows as per payment terms (#27946)	2021-11-02 16:28:46 +05:30
Deepesh Garg	fb9e72cc8a	Merge pull request #28162 from deepeshgarg007/pan_field_missing_error ... fix: Error for missing PAN no field	2021-10-30 19:29:26 +05:30
Deepesh Garg	541c892f97	fix: Error for missing PAN no field	2021-10-30 18:22:46 +05:30
Anuja Pawar	1a6e98ed48	fix(Payment Reconciliation): clear child tables on company/party change (#28008)	2021-10-29 20:52:47 +05:30
Deepesh Garg	eb720d18c3	Merge pull request #28145 from deepeshgarg007/coa_import_is_group ... fix: COA importer importing all accounts as group	2021-10-29 17:04:20 +05:30
Subin Tom	75a76e634d	fix: POS consolidated invoice rounded total issue (#28006)	2021-10-29 16:45:04 +05:30
Deepesh Garg	8ccd3fee9e	fix: COA importer importing all accounts as group	2021-10-29 16:08:52 +05:30
Deepesh Garg	d0e2b52f51	Merge pull request #28122 from nemesis189/consolidated-finan-report-empty-list-error ... fix: Consolidated Financial Report throws error for empty equity data list	2021-10-29 12:11:16 +05:30
Deepesh Garg	812249e5d1	Merge branch 'develop' of https://github.com/frappe/erpnext into lower_deduction_cetificate_fixes	2021-10-28 19:01:51 +05:30
Ankush Menat	b01635e1da	refactor!: remove hub #28117 ... refactor!: remove hub	2021-10-28 14:07:15 +05:30
Subin Tom	d786855d94	fix: Consolidated Financial Report throws error for empty equity data list	2021-10-28 13:19:19 +05:30
Saqib	f530764105	Merge branch 'develop' into fix-depr-after-sale	2021-10-28 12:43:51 +05:30
Faris Ansari	c8d0d9ece9	Merge pull request #28048 from netchampfaris/print-format-builder-templates ... feat: Taxes template for selling/buying doctypes	2021-10-28 12:33:21 +05:30
Saqib	a261d08dd8	fix: reset temporary flag after use	2021-10-27 18:30:37 +05:30
Saqib	470c07c6e9	Merge branch 'develop' into fix-depr-after-sale	2021-10-27 16:02:38 +05:30
Ganga Manoj	c9f3ea5fea	fix: Remove pointless buttons from Payment Order ... fix: Remove pointless buttons from Payment Order	2021-10-27 15:16:38 +05:30
Saqib	2e61c5eb55	Merge branch 'develop' into fix-depr-after-sale	2021-10-27 15:12:51 +05:30
hendrik	f24ed6723e	fix(general_ledger): Order by in case Group by Account (#28093) ... * Update general_ledger.py Fix order_by_statement if filter group by: Group by Account * chore: whitespace Co-authored-by: Ankush Menat <ankushmenat@gmail.com> Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>	2021-10-27 14:38:20 +05:30
Saqib	879a1fca76	perf(minor): improve sales invoice submission (#27916) ... * perf: skip get_pricing_rules if no pricing rule exists * perf: fetch mode of payments data in single query * perf: get total company stock only for purchase order * perf: skip insertion of stock ledger entry * fix: undo changes to allow negative stock flag * fix: sider Co-authored-by: Ankush Menat <ankushmenat@gmail.com> Co-authored-by: Ankush Menat <ankush@iwebnotes.com>	2021-10-27 11:42:50 +05:30
GangaManoj	06c505ddc2	fix: Linters	2021-10-27 05:23:01 +05:30
GangaManoj	cde0dae987	fix: Add flag for reverse depreciation entries	2021-10-26 21:04:06 +05:30
Deepesh Garg	7ab7753bfa	Merge branch 'develop' of https://github.com/frappe/erpnext into lower_deduction_cetificate_fixes	2021-10-26 20:56:40 +05:30
GangaManoj	82bf5e5539	fix: Replace post_depreciation_entries() with make_depreciation_entry()	2021-10-26 20:53:47 +05:30
Deepesh Garg	a87c201785	Merge pull request #28054 from deepeshgarg007/tax_withholding_category_filters ... fix(minor): Filters and validations in Tax Withholding Category	2021-10-26 20:51:24 +05:30
Deepesh Garg	6b22894275	Merge pull request #28052 from deepeshgarg007/company_address_update ... fix: Auto update company address check on linking with company	2021-10-26 20:40:13 +05:30
Deepesh Garg	277dfeaf4e	Merge pull request #28057 from deepeshgarg007/company_change_fixes ... fix: Update receivable/payable account on company change	2021-10-26 20:36:52 +05:30
Deepesh Garg	0136aedfdc	Merge pull request #28055 from deepeshgarg007/payment_entry_ux ... fix(UX): Add mandatory depends on condition for reference no and date fields	2021-10-26 20:02:34 +05:30
Deepesh Garg	1165a8ac3a	Merge branch 'develop' into company_change_fixes	2021-10-26 19:52:45 +05:30
Ganga Manoj	0515b4b6f6	Merge branch 'develop' into fix-depr-after-sale	2021-10-25 19:11:19 +05:30
Subin Tom	fc8307621c	fix: POS Closing Entry without linked invoices (#28042)	2021-10-25 13:18:08 +05:30
Deepesh Garg	e6e804e7d7	fix: Get LTDS based on tax withholding category	2021-10-23 18:58:41 +05:30
Deepesh Garg	7f2dde7d94	fix: Check for supplier name ... (cherry picked from commit 944e3d467c5ab0a2a4a76a8b532e53bca77f8e61)	2021-10-23 07:47:18 +00:00
Deepesh Garg	881e091b85	fix: Check for other properties ... (cherry picked from commit b7befe49dc83b938b74b7a63d31787734d7857f8)	2021-10-23 07:47:18 +00:00
Deepesh Garg	2ea4c95f86	fix: Error in TDS computation summary ... (cherry picked from commit f12deae24b7ab164edd0868a1254bdf28bfeac09)	2021-10-23 07:47:18 +00:00
Deepesh Garg	65025fb628	fix: Update receivable/payable account on company change	2021-10-21 19:30:06 +05:30
Deepesh Garg	a20058a343	fix(minor): Add mandatory depends on condition for reference no and date fields	2021-10-21 17:52:13 +05:30
Deepesh Garg	7733afc0ae	fix(minor): Filters and fixes in Tax Withholding Category	2021-10-21 16:13:00 +05:30
Deepesh Garg	c6d06816cf	fix: Auto update company address check on linking with company	2021-10-21 15:37:59 +05:30
Faris Ansari	8b547e39a8	feat: Taxes template for selling/buying doctypes ... Depends on the new Print Format Builder frappe/frappe#14134	2021-10-21 12:06:02 +05:30
rohitwaghchaure	871cb1157f	fix: consolidated report issue #28035 ... fix: consolidated report issue	2021-10-20 21:08:15 +05:30
Sagar Vora	8d9d0987fe	fix: incorrect status being set in Invoices (#28019) ... Co-authored-by: Pruthvi Patel <pruthvipatel145@gmail.com>	2021-10-20 19:15:35 +05:30
Deepesh Garg	21ba9ac744	fix: Totals row incorrect value in GL Entry (#27867) ... (cherry picked from commit ebe68c1a7a47f5e711cc9fc1d40c07e140b76888)	2021-10-19 09:38:40 +00:00
Saqib	ac381d21fe	fix: sider	2021-10-18 10:43:15 +05:30
Deepesh Garg	9c54d6df13	Merge pull request #27967 from deepeshgarg007/account_name_number_error ... fix: Account number and name incorrectly imported using COA importer	2021-10-18 09:16:09 +05:30
Deepesh Garg	46e80095c6	Merge pull request #27934 from deepeshgarg007/tds_round_off_error ... fix: TDS round off not working from second transaction	2021-10-18 08:53:37 +05:30
Deepesh Garg	b7a08535b5	fix: TDS round off not working from second transaction	2021-10-16 20:58:24 +05:30
Deepesh Garg	17a8649500	fix: Account number and name incorrectly import using COA importer	2021-10-15 21:19:41 +05:30
Subin Tom	f3cf36f613	fix: POS Profile payment methods table (#27956) ... Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>	2021-10-15 12:39:52 +05:30
Ganga Manoj	5a0289a810	Merge branch 'develop' into fix-depr-after-sale	2021-10-14 22:37:07 +05:30
Marica	ee25ba07a2	Merge pull request #27947 from marination/si-dn-sn-mismatch ... fix: Improve error message for Serial No mismatch between SI and DN	2021-10-14 13:49:04 +05:30
Ganga Manoj	8cc81a96fc	Merge branch 'develop' into fix-depr-after-sale	2021-10-14 03:12:44 +05:30
GangaManoj	8ea1ad9232	fix: Only validate against JV if it's not a reverse depreciation entry	2021-10-13 20:47:39 +05:30
marination	60f35ad8a2	fix: Remove trailing space and line break in translatable string	2021-10-13 16:50:10 +05:30
marination	646acb6b46	fix: Improve error message for Serial No mismatch between SI and DN	2021-10-13 16:41:11 +05:30
Noah Jacob	2bb383b178	fix: not authorized to update entries after freezing accounts (#27937) ... * fix: not authorized to update entries after freezing accounts * fix: Add test case * fix(patch): patched to requeue failed reposts(check_freezing_date) * chore: misc fixes Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com> Co-authored-by: Ankush Menat <ankushmenat@gmail.com>	2021-10-13 16:20:08 +05:30
Shariq Ansari	790c1cda6f	fix: Removing unused fields from workspace JSON files #27612 ... fix: Removing unused fields from workspace JSON files	2021-10-13 16:18:20 +05:30
Deepesh Garg	bd310e2816	Merge pull request #27783 from hrwX/subscription_generation_fix_develop ... fix(Subscription): reorder updation of end date	2021-10-13 15:21:50 +05:30
Deepesh Garg	ca0067212d	fix: TDS round off not working from second transaction	2021-10-13 12:00:25 +05:30
Deepesh Garg	0b263c5100	Merge pull request #27927 from Anuja-pawar/invoice-sections ... fix: minor ux fixes in Sales & Purchase Invoice	2021-10-12 23:05:48 +05:30
Deepesh Garg	b990d5b112	Merge pull request #27545 from nextchamp-saqib/pay-received-amt-fix ... fix: cannot add deductions in internal transfer payment entry	2021-10-12 23:04:04 +05:30
Deepesh Garg	3b9514d6e1	fix: Update message string	2021-10-12 21:49:51 +05:30
Anuja Pawar	b7769c733e	Merge branch 'develop' into invoice-sections	2021-10-12 21:32:01 +05:30
Anuja Pawar	d181cc42a1	fix: set collapsible & print hide	2021-10-12 20:57:08 +05:30
Ankush Menat	4ebae7c5dc	Merge branch 'develop' into optimize-get-item-details	2021-10-12 20:39:49 +05:30
marination	fd6f3c6b88	Merge branch 'develop' of https://github.com/frappe/erpnext into e-commerce-refactor-develop	2021-10-12 18:24:21 +05:30
Ankush Menat	8d69ec72a6	fix: remove transaction commit from tests	2021-10-12 16:17:15 +05:30
marination	37a246e738	chore: Patches for Website Item ... - Patch to make website item from item - Patch to move Products and Shopping Cart Settings into E Commerce Settings - Patch to move products in Homepage from Item to Website Item - Minor cleanup, replacing/removing references to Item website fields (obsolete)	2021-10-12 16:16:17 +05:30
marination	025574d9b5	chore: Removing Item's Website section & references ... - Removed old onboarding slide json and `create_onboarding_docs` methods - Removed website sections from Item master - Removed references to item website fields - Shifted Item doctype website methods to Website Item - Removed WebsiteGenerator from Item doctype - Website Items in Homepage Products section - Removed redundant code from item_group.py - Fix: Item field filters won’t appear in website	2021-10-12 16:03:19 +05:30
marination	eef9cf152f	chore: Drive E-commerce via Website Item ... - Removed Shopping Cart Settings - Portal fully driven via E Commerce Settings - All Item listing querying will happen via ProductQuery engine only - Product Listing via Website Items - removed redundant code - Moved all website logic from Item to Website Item	2021-10-12 15:48:06 +05:30
Anuja Pawar	2bc1ca993a	fix: keeping sections consistent across sales & purchase invoice	2021-10-12 14:52:40 +05:30
Saqib Ansari	7b691beabb	perf: fetch mode of payments data in single query	2021-10-12 13:28:31 +05:30
Saqib Ansari	a500252570	perf: skip get_pricing_rules if no pricing rule exists	2021-10-12 13:25:55 +05:30
Afshan	569dc5f6b1	fix: add cost center in gl entry for advance payment entry (#27840)	2021-10-12 13:23:20 +05:30
Chillar Anand	401e22fb8d	fix(accounts): Fix issue with fetching loyalty point entries (#27892)	2021-10-12 10:28:36 +05:30
Anuja Pawar	e1967870a9	Merge pull request #27906 from Anuja-pawar/accounts-settings ... fix(Accounts Settings): Update label	2021-10-12 10:27:23 +05:30
Dany Robert	7acdcc70ad	fix: v12 migrate error - unknown column ‘mandatory_depends_on’ (#27897) ... * fix: v12 doesn't have mandatory_depends_on field * fix: move update_vehicle_no_reqd_condition to v13 * fix: move update_vehicle_no_reqd_condition to v13 * fix: file name missing .py * refactor!: add back empty line * fix: linters issue	2021-10-11 15:05:55 +05:30
rohitwaghchaure	3f99a87e3d	Merge pull request #27863 from rohitwaghchaure/multi-currency-issue-for-consolidated-report ... fix: consolidated report not consider company currency	2021-10-11 14:06:08 +05:30
Deepesh Garg	1aba3592fa	Merge pull request #27369 from Havenir/ksa-vat ... feat(regional): KSA E-Invoicing and VAT Report	2021-10-11 12:16:51 +05:30
Rohit Waghchaure	19d14da0d4	fix: opening balance to calculate 'Unclosed Fiscal Years Profit / Loss (Credit)'	2021-10-10 14:00:25 +05:30
Himanshu	4f5d82c817	Merge branch 'develop' into subscription_generation_fix_develop	2021-10-09 09:39:27 +01:00
Himanshu	44306bd0e5	Update subscription.py	2021-10-09 09:37:54 +01:00
Rohit Waghchaure	dc4206428d	fix: consolidated report not consider company currency	2021-10-08 12:10:35 +05:30
Anuja Pawar	5cc3ea0aa7	fix(Payment Reconciliation): minor ux fixes (#27779) ... * fix: minor fixes * fix: Linters check * fix: sider check * fix: kept unallocated payment amount hidden in allocation * fix: removed Add row button from the tables (redundant) Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com> Co-authored-by: Saqib <nextchamp.saqib@gmail.com>	2021-10-07 21:09:15 +05:30
Himanshu	951ab9f78f	Merge branch 'develop' into subscription_generation_fix_develop	2021-10-06 19:22:40 +01:00
Chillar Anand	772d4753e7	refactor: Clean up mutable defaults and add CI check (#27828) ... * refactor: Clean up mutable defaults and add CI check	2021-10-06 16:58:48 +00:00
hrwx	ae657c7e4e	fix: create past invoices	2021-10-06 17:32:39 +01:00
Sagar Vora	656015d99d	test: use test_dependencies instead of duplication	2021-10-06 16:46:01 +01:00
Sagar Vora	fc375c5bde	fix: remove newline	2021-10-06 16:46:01 +01:00
hrwx	0f03b19109	fix: reorder updation of end date	2021-10-06 16:46:01 +01:00
Marica	ff7506d4a6	fix: revert "fix: missing link in dashboard missing on SI from DN" (#27832)	2021-10-06 13:35:22 +05:30
Marica	2691a15c91	Merge pull request #27360 from FHenry/dev_fix_27359 ... fix: missing link in dashboard missing on SI from DN	2021-10-06 13:04:50 +05:30
GangaManoj	273fccf0dd	fix: Add test for depreciation on return of sold Asset	2021-10-06 02:08:28 +05:30
GangaManoj	f51bd44929	fix: Unlink Depreciation Entry made on sale if the Asset is returned	2021-10-06 01:18:05 +05:30
GangaManoj	62fea8a5aa	fix: Rename tests	2021-10-05 21:38:39 +05:30
Deepesh Garg	91bf40d692	Merge pull request #27811 from frappe/mergify/bp/develop/pr-27792 ... fix: COA Importer showing blank validations (backport #27792)	2021-10-05 21:23:21 +05:30
Afshan	cec66d2d10	fix: removed redundant piece of code (#27817)	2021-10-05 19:14:39 +05:30
Deepesh Garg	fee54023a6	Merge branch 'develop' into mergify/bp/develop/pr-27792	2021-10-05 17:22:24 +05:30
mergify[bot]	233bf5dd29	fix: using DN for transfer w/o internal customer (backport #27798) (backport #27805) (#27807) ... * fix: using DN for transfer w/o internal customer (backport #27798) (#27805) * fix: using DN for transfer w/o internal customer (#27798) This used to be work before though not "advertised", since a lot of users have started using it as feature, it can't be broken now. (cherry picked from commit df1f8fddf6e2f4106c1a2778614ba9a1dc5ff67e) * fix(ux): use toast instead of popup Co-authored-by: Ankush Menat <ankush@iwebnotes.com> (cherry picked from commit fa944382c53bdeeb92f2dcc876e2c11ed03e20cc) # Conflicts: # erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py * fix: resolve conflict * fix: resolve conflicts Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> Co-authored-by: Ankush Menat <ankush@iwebnotes.com>	2021-10-05 16:16:21 +05:30
Deepesh Garg	020f94532b	fix: COA Importer showing blank validations ... (cherry picked from commit 0660d6ed01e0668ce828cf9bae9790aead874233)	2021-10-05 09:49:05 +00:00
Saqib	74c8e7bb97	Merge branch 'develop' into pay-received-amt-fix	2021-10-05 11:14:41 +05:30
Sagar Vora	09ccdee2db	feat: add total_billing_hours to Sales Invoice (fp #26783) (#27742) ... * feat: add `total_billing_hours` to Sales Invoice * fix: re-save doctypes * fix: indentation * fix: replace reference to old function	2021-10-04 16:41:24 +05:30
Rucha Mahabal	5905cf9002	refactor!: Removed healthcare module from ERPNext (#27362) ... * chore: Removed healthcare module * chore: Removed healthcare demo, patch files * chore: Rename imports from erpnext to healthcare * chore: Added healthcare deprecation warning patch * chore: Removed healthcare module code in other modules * chore: Code clean up * refactor: Remove sales invoice custom js related to healthcare * fix: sider Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2021-10-04 15:46:40 +05:30
Saqib	9051735529	perf: fetching of account balance in chart of accounts (#27661)	2021-10-04 11:44:46 +05:30
Saqib Ansari	1b7414e948	fix: cannot add deductions in internal transfer payment entry	2021-10-04 11:24:02 +05:30
Deepesh Garg	4abb43a425	Merge pull request #27749 from GangaManoj/fix-pe-payment-term ... fix: Display appropriate message for Payment Term discrepancies in Payment Entry	2021-10-04 11:06:20 +05:30
ChillarAnand	a1d3a09d3c	Merge branch 'develop' into care	2021-10-04 09:46:34 +05:30
Deepesh Garg	f109f6fd16	fix: Linting issues ... (cherry picked from commit ff570f48a0ba56925528eb8696b8b7d862252d8f)	2021-10-02 16:10:09 +00:00
Deepesh Garg	237b1a91de	fix: Remove unwanted comments ... (cherry picked from commit e4b89d2fcd6c1eb788f94ad5f9563ccec07a0f2a)	2021-10-02 16:10:09 +00:00
Deepesh Garg	9244fe563a	fix: Chart Of Accounts import button not visible ... (cherry picked from commit 3529622a0d28e9cdd6e602b5450ca79d13cfa0ed)	2021-10-02 16:10:08 +00:00
GangaManoj	9f14695743	fix: Display appropriate message if different Payment Terms are used in PE and its Payment References	2021-10-02 21:02:07 +05:30
HENRY Florian	0bc213ed17	Merge branch 'develop' into dev_fix_27359	2021-09-30 11:08:44 +02:00
Deepesh Garg	f1a669c2f7	fix: Test case ... (cherry picked from commit 23863c7663a94e32e32812301a7efca79575c470)	2021-09-30 03:06:02 +00:00
Deepesh Garg	774cd68f4c	fix: Test Case ... (cherry picked from commit 846d128c5d536b5003dc3055f3239e6f92a3146c)	2021-09-30 03:06:01 +00:00
Deepesh Garg	13d2e7b198	fix: Deferred revenue entries post account freezing ... (cherry picked from commit e2eb72eb5ba1aaadddf8278dd77bfe75a178ef01)	2021-09-30 03:06:00 +00:00
Deepesh Garg	b39f8a6215	fix: Ignore user permission for Represents Company field in Sales and Purchase docs (#27684) ... * fix: Ignore user permission for Represents Company field in Sales and Purchase docs * fix: Ignore user permission for fiscal year company	2021-09-29 15:54:35 +05:30
Ganga Manoj	28bdd6d2e3	Merge branch 'develop' into fix-depr-after-sale	2021-09-27 22:18:04 +05:30
Deepesh Garg	cc5dd5c67d	feat: TDS deduction using journal entry and other fixes (#27451) ... * fix: TDS deduction using journal entry * fix: Multi category application against single supplier * refactor: TDS payable monthly report * fix: Server side handling for default tax withholding category * fix: Supplier filter for Journal Entry * refactor: TDS computation summary report	2021-09-27 21:43:20 +05:30
Saqib	b68ac24cd5	chore: add shipping address in eway bill test (#27662)	2021-09-27 15:03:58 +05:30
ChillarAnand	765a9bb731	refactor: Remove sales invoice custom js related to healthcare	2021-09-27 07:34:54 +05:30
Saqib	e8ff649298	Merge branch 'develop' into fix-32644	2021-09-26 17:07:46 +05:30
Saqib Ansari	e6b4d33f4b	chore: hide exchange gain loss if empty	2021-09-26 17:07:13 +05:30
Saqib Ansari	dd2d039ca8	chore: hide exchange gain loss if empty	2021-09-26 15:51:03 +05:30
GangaManoj	796ed947ce	fix: Reverse depreciation entry made on sale if asset that was set to be sold in the future gets returned	2021-09-25 19:11:29 +05:30
GangaManoj	b9fb59da58	fix: Reset depreciation schedule on returning asset	2021-09-25 19:04:16 +05:30
Sagar Vora	c8b9a55e96	feat: add Partly Paid status in Invoices (#27625)	2021-09-22 12:11:35 +05:30
GangaManoj	7ab3b9dd5a	fix: Add test for depreciation on sale of a depreciated Asset	2021-09-21 07:11:40 +05:30
Ganga Manoj	eb8122baba	Merge branch 'develop' into fix-depr-after-sale	2021-09-21 06:29:41 +05:30
GangaManoj	244d9dee04	fix: Correct expected_values	2021-09-21 06:06:21 +05:30
Anuja Pawar	190c2d84da	fix: reference row added in allocation table (#27602)	2021-09-20 21:32:38 +05:30
ChillarAnand	aa580769a6	chore: Code clean up	2021-09-20 15:27:43 +05:30
Deepesh Garg	f07ff92a35	fix: Improvements in COA Importer (#27584)	2021-09-20 11:12:39 +05:30
Subin Tom	d49346ac45	fix: Tax breakup based on items, missing GST fields (#27524) ... * fix: Tax breakup based on items * fix: added gst fields,warehouse validation to pos inv,patch * fix: tax breakup test fix, eway bill hsn fix Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>	2021-09-17 10:39:03 +05:30
Deepesh Garg	c9c8957250	feat: Merge POS invoices based on customer group (#27471) ... * feat: Merge POS invoices based on customer group * fix: Linting Issues * fix: fieldname Co-authored-by: Saqib <nextchamp.saqib@gmail.com>	2021-09-16 19:33:57 +05:30
Rucha Mahabal	866763c16a	fix(minor): Employee filter in Unpaid Expense Claims report (#27530)	2021-09-16 00:05:16 +05:30
Deepesh Garg	625626b973	fix: Values with same account and different account number in consolidated balance sheet report (#27493)	2021-09-15 10:10:54 +05:30
Saif Ur Rehman	9ae0380a96	chore(Asset Capitalization): isort linting	2021-09-14 15:09:58 +05:00
Saif Ur Rehman	dc24a657fd	chore(Asset Capitalization): linting	2021-09-14 12:40:17 +05:00
Saif Ur Rehman	7a5d75b68d	feat(Asset Capitalization): Submission and Cancellation	2021-09-13 23:01:52 +05:00
Anuja Pawar	a58e309297	fix: fix to fetch customers and billing email in PSOA (#27363)	2021-09-09 19:37:52 +05:30
Anupam Kumar	7edac5a5d7	fix: removing duplicate currency() from sales_invoice.js (#27410)	2021-09-09 19:17:01 +05:30
Deepesh Garg	9104796eb8	Merge pull request #27258 from deepeshgarg007/tds_validity ... feat: Validity dates in Tax Withholding Rates	2021-09-09 12:17:36 +05:30
Anuja Pawar	3576668638	fix: added Show Remarks checkbox in AR & AP reports (#27374)	2021-09-09 11:57:29 +05:30
Deepesh Garg	e7e2ce1271	fix: Linting Issues	2021-09-09 11:36:57 +05:30
Deepesh Garg	c33bbd4f39	fix: Test Case	2021-09-09 11:13:29 +05:30
Saqib	9c27f9be1e	fix: document naming rule not working for subscription invoices (#27386)	2021-09-08 16:47:04 +05:30
Dany Robert	fa819f2fb0	fix: General Ledger translation issues (#27298) ... * fix: remove translations from GL report options Options need not be translated, their display label gets translated client side. * fix: make group by options translatable * ci: semgrep rule for translated options in report Co-authored-by: Ankush Menat <ankush@iwebnotes.com>	2021-09-08 16:28:05 +05:30
Saqib	df3e4ce1c0	fix: scan barcode fields input length (#27389) ... * fix: undo unintentional changes * fix: scan barcode fields input length	2021-09-08 16:04:13 +05:30
Deepesh Garg	ee1486209d	Merge branch 'develop' of https://github.com/frappe/erpnext into tds_validity	2021-09-08 11:33:42 +05:30
rohitwaghchaure	058d98342a	fix: missed to add voucher_type, voucher_no to get GL Entries (#27368) ... * fix: missed to add voucher_type, voucher_no to get gl entries * test: get voucherwise details utilities Co-authored-by: Ankush Menat <ankush@iwebnotes.com>	2021-09-07 12:14:40 +05:30
Ahmad	b42d63e526	Merge remote-tracking branch 'refs/remotes/havenir/ksa-vat' into ksa-vat	2021-09-06 23:26:52 +05:00
Ahmad	cb0c2d1477	feat(Regional): KSA VAT Report	2021-09-06 23:25:20 +05:00
ChillarAnand	c8565c7090	chore: Removed healthcare module code in other modules	2021-09-06 20:47:27 +05:30
Florian HENRY	aa7ee3ca03	fix: link in dashboard missing on SI from DN	2021-09-06 11:40:44 +02:00
Deepesh Garg	51d9572fe7	fix: Hardcode fiscal year and posting date	2021-09-05 17:56:12 +05:30
Deepesh Garg	ceaa804f04	fix: Presentation currency conversion in reports (#27316)	2021-09-05 17:21:29 +05:30
Deepesh Garg	092d41ecda	fix: Debug CI	2021-09-03 20:04:18 +05:30
Deepesh Garg	41392acd18	Merge branch 'develop' of https://github.com/frappe/erpnext into tds_validity	2021-09-03 19:19:35 +05:30
Deepesh Garg	8f5a77446e	Merge pull request #27279 from deepeshgarg007/gstr_1_cdnr_unregistered_json_develop ... feat: CDNR Unreg json generation	2021-09-03 13:55:00 +05:30
Subin Tom	798b464ee3	fix: braintree payment processed twice (#27300)	2021-09-03 12:30:57 +05:30
ChillarAnand	e913e277d9	chore: Rename imports from erpnext to healthcare	2021-09-02 19:47:39 +05:30
Deepesh Garg	e1fffdb262	fix: Linting issues	2021-09-02 19:10:49 +05:30
Deepesh Garg	c85242e03d	Merge branch 'develop' of https://github.com/frappe/erpnext into gstr_1_cdnr_unregistered_json_develop	2021-09-02 18:59:59 +05:30
Ankush Menat	eec40513be	fix: minor linting issues (#27314) ... * fix: syntax error in gratuity * fix: unpacking None into three variables * fix: unexpected kwarg for delete_accounting_dimensions	2021-09-02 17:42:45 +05:30
Chillar Anand	915b34391c	chore: Clean up imports (#27302) ... * chore: Added isort to pre-commit config * chore: Sort imports with isort * chore: Clean up imports with pycln * chore: Sort imports with isort * chore: Fix import issues * chore: Clean up sider issues * chore: Remove import errors from flake8 ignore list * chore: Clean up lint issues	2021-09-02 16:44:59 +05:30
Saqib	a158b825fc	Merge pull request #27124 from GangaManoj/gross-profit-product-bundle ... feat: Improve Product Bundle handling	2021-09-02 11:12:56 +05:30
Deepesh Garg	d5a736d11e	test: Update test case	2021-09-01 21:15:24 +05:30
Ankush Menat	b147b85e6a	chore: whitespace / eof fixes	2021-09-01 16:57:21 +05:30
Ankush Menat	e46567192a	fix: invalid escape sequences in regex	2021-09-01 16:57:17 +05:30
GangaManoj	bc79084dac	fix: Add Product Bundle field in Items table	2021-09-01 16:06:47 +05:30
Ankush Menat	7d9819f352	fix: remove duplicate imports	2021-09-01 15:33:35 +05:30
GangaManoj	4d8f833cc9	fix: Remove Add Row and Delete Row options for Packed Items table	2021-09-01 15:20:40 +05:30
Ankush Menat	2d62c500c4	fix: undefined variables	2021-09-01 15:05:00 +05:30
Ankush Menat	694ae81618	fix: remove bare excepts	2021-09-01 15:02:28 +05:30
Deepesh Garg	8b644d8889	fix: Report and JSON generation for Advances received	2021-09-01 10:28:15 +05:30
Deepesh Garg	b6d0b17ed6	fix: Linting and patch fixes	2021-09-01 10:11:18 +05:30
Deepesh Garg	d06221ad7a	fix: Advance TDS test case	2021-09-01 10:05:10 +05:30
Ganga Manoj	82118975e2	Merge branch 'develop' into gross-profit-product-bundle	2021-08-31 22:08:10 +05:30
Anuja Pawar	3e404f15ff	refactor: payment reconciliation tool (#27128)	2021-08-31 18:59:29 +05:30
Deepesh Garg	c37cec9b9d	fix(minor): Incorrect unallocated amount on type receive (#27262)	2021-08-31 18:50:23 +05:30
Deepesh Garg	5e10e10329	feat: Validity dates in Tax Withholding Rates	2021-08-31 18:23:28 +05:30
Anurag Mishra	ab47409e91	feat: Full and Final Settlement and Gratuity Fix (#26364) ... * feat: Full and Final Settlement * removed option to pay via salary slip * feat: Create JV * test:fnf * fix: tracking asset movement * fix: sider and test * fix: changes Requested * fix: changes requested * fix: valication for Asset * fix: add filter for reference document only if relevant field is present * fix: doctype cleanup - add more fields to the list view and standard filter - set title field - incorrect field labels * feat: add list view settings for FNF * fix: incorrect reference type set in Journal Entry * fix: validation message * chore: add Full and Final Statement link to Workspace Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2021-08-31 17:59:26 +05:30
Subin Tom	9cb642238f	fix: expense claim reimbursed amount update (#27204)	2021-08-30 13:17:22 +05:30
François de Ryckel	327071cb90	replace cur_frm with frm (#27210)	2021-08-28 14:55:11 +05:30
GangaManoj	e44567754d	fix: Display Packed/Bundle Items table only if it exists	2021-08-27 20:16:13 +05:30
Devin Slauenwhite	072151e16d	feat: Payment reconciliation on accounts module workspace (#25925) ... * feat: add payment reconciliation to accounting workspace * fix: update modified and duplicate the link Co-authored-by: Ankush Menat <ankush@iwebnotes.com>	2021-08-27 19:44:57 +05:30
Shadrak Gurupnor	7433757489	fix: patches were breaking during migration (#27200) ... * fix: patches were breaking during migrating * fix: patches were breaking during migration	2021-08-27 18:00:16 +05:30
Kamal Johnson	a285b5b78b	feat: Accounts, Selling & Assets Onboarding cleanup (#27112) ... * refactor: company form fields arrangement * refactor: accounts onboarding steps * refactor: re-arrange fields & modify labels in company form * feat: onbording steps for accounts module * fix: updated onboarding steps for selling module * fix: remove unwanted steps from accounts * feat: add more onboarding steps * feat: Refactor onboarding-module for accounting workspace * feat: Add basic asset onboarding steps * feat: Add basic asset item form tour * feat: Add basic selling onboarding-steps * feat: Add basic form tour for purchase recipt * feat: Add basic form tour for existing asset * feat: Adding asset category form tour * feat: Add form tour for asset category * feat: Refactor sales taxes and charges template form tour with new method * refactor: Remove old form tour for accounts settings * refactor: Change asset category form tour with new tour method * refactor: Change asset item form tour with new tour method * refactor: Change purchase receipt form tour with new tour method * refactor: Change asset form tour with new tour method * refactor: Remove old form tour for selling settings * refactor: general fix/typo in onboarding steps * Apply suggestions from code review Co-authored-by: Nabin Hait <nabinhait@gmail.com> * refactor: Remove old form tour method for sales order. * fix: removed duplicate section break * fix: Removed duplicate fields Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com> Co-authored-by: Anuja <anuja.pawar20@gmail.com> Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com> Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2021-08-27 15:47:11 +05:30
Saqib	08188f2ac7	Merge branch 'develop' into gross-profit-product-bundle	2021-08-27 15:41:41 +05:30
Saqib	987746592c	fix: period closing voucher tests (#27198)	2021-08-27 15:41:26 +05:30
Saqib	8008598eb2	Merge branch 'develop' into gross-profit-product-bundle	2021-08-27 14:48:54 +05:30
Deepesh Garg	ae7ec8e44d	fix: Base amount in tax gl entry	2021-08-26 23:51:09 +05:30
Rohan	16eed07a0f	fix: use Stripe's Price API for plan-price information (#26107) ... * fix: use Stripe's new Plan API for price information * patch: use inbuilt function to rename field * fix: patch call Co-authored-by: Ankush Menat <ankush@iwebnotes.com> Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2021-08-26 21:47:00 +05:30
Lovin Maxwell	f91faac7cd	fix: Pricing Rule on Transaction Based on Coupon (#26949)	2021-08-26 20:54:02 +05:30
Ankush Menat	ae55eab599	chore: remove deprecated and empty QUnit tests (#27179) ... * chore: remove deprecated and empty QUnit tests * ci: fix UI test config Testing library was added on Frappe, in order to reuse command testing library has to be installed during setup process.	2021-08-26 20:43:06 +05:30
Deepesh Garg	4b1f165429	fix: Use reverse debit and credit to get net amount in GL Entries (#27174) ... * fix: Use reverse debit and credit to get net amount in GL Entries * fix: Remove unused import	2021-08-26 18:34:15 +05:30
Deepesh Garg	417d6abcf4	fix: Party account validation in JV	2021-08-26 17:13:36 +05:30
marination	45edfd9d50	fix: Remove duplicate create_internal_customer util ... - Introduced via https://github.com/frappe/erpnext/pull/27086	2021-08-26 15:53:52 +05:30
Marica	f4dc9ee2aa	fix: Don't create inward SLE against SI unless is internal customer enabled (#27086) ... * fix: Dont create inward SLE against SI unless is internal customer enabled - Check if is internal customer enabled apart from target warehouse - Test to check if inward SLE is made if target warehouse is accidentally set but customer is not internal * test: Use internal customer for delivery of bundle items to target warehouse - created `create_internal_customer` util - reused it in delivery note and sales invoice tests - use internal customer for target warehouse test in delivery note	2021-08-26 13:12:51 +05:30
Deepesh Garg	e2af9d5761	Merge pull request #27039 from nextchamp-saqib/common-party-acc ... feat: common party accounting	2021-08-26 12:58:59 +05:30
rohitwaghchaure	fe4540d74d	fix: allow to change rate manually in case of stand-alone credit note (#27036) ... Co-authored-by: Marica <maricadsouza221197@gmail.com>	2021-08-26 12:52:36 +05:30
Brian Pond	1a919773d7	fix: Customers 'primary_address' not updated automatically (#26798) (#26799) ... * Fix for Issue #26798 This PR is a fix for GitHub Issue 26798: https://github.com/frappe/erpnext/issues/26798 TLDR: When an Address is updated, and that Address is a Customer's Primary Address, update the Read Only field `customer.primary_address` * Update address.py Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>	2021-08-26 11:57:28 +05:30
Ahmad	9cc451fc7d	feat(Regional): KSA VAT Report	2021-08-26 07:35:59 +05:00
Saqib Ansari	be7a38b662	fix: cost center in test_sales_invoice_against_supplier	2021-08-25 21:35:32 +05:30
Deepesh Garg	27ca9866e3	Merge branch 'develop' of https://github.com/frappe/erpnext into party_account_currency_check	2021-08-25 20:47:16 +05:30
Ganga Manoj	842ceb1301	fix: cannot reconcile bank transactions against internal transfer payment entries (#26932) ... * fix: Only set Clearance Date for Payment Entries of type Internal Transfer if both Transactions have been reconciled * fix: Reset clearance_date for intra-company Payment Entries that have only been reconciled with one Bank Transaction * fix: indentation and args Co-authored-by: Saqib <nextchamp.saqib@gmail.com> Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2021-08-25 20:32:26 +05:30
Rohan	87308465d8	fix: create zero-dollar invoices fro trial subscriptions (#26441)	2021-08-25 20:11:05 +05:30
Saqib Ansari	a2f8d6c31a	fix: party link permissions	2021-08-25 20:10:19 +05:30
Saqib Ansari	c101b42d4a	feat: validate multiple links	2021-08-25 20:08:28 +05:30
Saqib Ansari	881301ca9b	Merge branch 'develop' of https://github.com/frappe/erpnext into common-party-acc	2021-08-25 20:02:27 +05:30
Frappe PR Bot	81b4590479	fix: TDS calculation on net total (#27058) (#27140) ... (cherry picked from commit 4eb7c2a011f3abbe547c2a32978e7af6e1fd6d33) Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>	2021-08-25 18:18:16 +05:30
Ankush Menat	8d116fb9ff	fix: remove VARCHARs from Sales Invoice (#27136) ... Sales Invoice doctype is starting to hit row length limit as many integrations add custom fields on this doctype. This is just a small change to remove VARCHAR(140) fields and reduce row size wherever possible.	2021-08-25 16:45:41 +05:30
Saqib	62114b226f	feat: unreconcile on cancellation of bank transaction (#27109)	2021-08-25 16:25:51 +05:30
GangaManoj	3135d6dc6a	fix: Get Bundle Items	2021-08-25 15:35:40 +05:30
GangaManoj	13ae10b3a2	fix: Remove comments	2021-08-25 15:20:27 +05:30
Afshan	8366b6322e	fix: validate party and party type only if both available (#27002) ... * fix: validate party and party type only if both available * fix: indentation	2021-08-25 11:57:24 +05:30
Saqib	1dadea38a5	fix: remove unexpected comma (#27132)	2021-08-25 11:05:51 +05:30
GangaManoj	bea0f7a202	fix: Get data when grouped by invoice and otherwise	2021-08-25 02:52:18 +05:30
GangaManoj	96909b6c3b	fix: Display only the Invoice rows in bold	2021-08-25 02:49:14 +05:30
GangaManoj	b02effbc47	fix: Indentation	2021-08-25 01:00:40 +05:30
Ganga Manoj	3e5bbc9aa6	Merge branch 'develop' into gross-profit-product-bundle	2021-08-25 00:55:47 +05:30
GangaManoj	5f8c2b0946	fix: Remove base_rate and buying_rate for Invoice rows	2021-08-25 00:33:55 +05:30
GangaManoj	2dbf8075eb	fix: Calculate total buying_amount for each invoice	2021-08-25 00:09:07 +05:30
GangaManoj	3edb1938a9	fix: Fetch bundle item details	2021-08-24 23:38:24 +05:30
GangaManoj	257215f479	fix: Fetch base_net_total for each Invoice	2021-08-24 23:32:19 +05:30
GangaManoj	1956f62ad8	fix: Remove qty from Sales Invoice rows	2021-08-24 23:30:50 +05:30
Subin Tom	fbc5977248	fix: Updated timestamp for pos invoice json (#27110) ... Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>	2021-08-24 22:34:02 +05:30
Anupam Kumar	1d6ef4b0d3	fix: replacing $.each -> forEach in SI (#26995) ... * fix: replacing $.each -> forEach in SI * fix: removed console log Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2021-08-24 22:06:19 +05:30
Frappe PR Bot	512ddc589f	fix: timesheet amount issue (#25993) (#26889) ... * fix: timesheet amount issue * fix: timesheet detail rate conversion * fix: condition to check timesheet currency * fix: removing console statement (cherry picked from commit a6aa6cd7d6) Co-authored-by: Anupam Kumar <anupamvns0099@gmail.com> Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2021-08-24 22:00:32 +05:30
Saqib	f1313302c9	fix: pos invoice test (#27113)	2021-08-24 19:45:21 +05:30
Afshan	ad06fb2179	fix: calculation of gross profit percentage in Gross Profit Report (#27045)	2021-08-24 17:35:01 +05:30
Saqib	1db812ab9f	Merge branch 'develop' into common-party-acc	2021-08-24 17:27:43 +05:30
Saqib	f47cbae5e0	feat: allow draft pos invoices even if no stock available (#27078)	2021-08-24 17:27:27 +05:30
Saqib	9198caa5e7	fix: incorrect gl entry on period closing involving finance books (#26921)	2021-08-24 17:26:23 +05:30
Subin Tom	d4d5a4221a	feat: coupon code discount in pos invoice (#27004)	2021-08-24 16:22:46 +05:30
Saqib	9e82c24b27	fix: pos closing entry cancellation test (#27099) ... * fix: pos closing entry cancellation test * fix: invalid imports * fix: sider issue	2021-08-24 15:37:00 +05:30
Pruthvi Patel	332ac105b5	refactor: use read_only_depends_on instead of code (#27008)	2021-08-24 12:07:38 +05:30
GangaManoj	46650cce0d	fix: Calculate total buying_amount and gross profit for each invoice	2021-08-23 21:17:32 +05:30
Deepesh Garg	69973a65aa	Merge pull request #26900 from deepeshgarg007/payment_entry_validations_and_trigger_develop ... fix: Multiple fixes in payment entry	2021-08-23 18:03:01 +05:30
Subin Tom	47b63a627d	fix: Eway bill test update to check ver 1.0.0421 (#27083)	2021-08-23 15:38:26 +05:30
Deepesh Garg	df185045a1	Merge branch 'develop' into payment_entry_validations_and_trigger_develop	2021-08-23 10:34:28 +05:30
Deepesh Garg	496bff5136	feat: Column for total amount due in Accounts Receivable/Payable Summary (#27069)	2021-08-22 18:10:51 +05:30
Deepesh Garg	60915e874d	test: Update test cases for currency change validation	2021-08-21 23:05:48 +05:30
Deepesh Garg	57e326e7d0	fix: Consolidated balance sheet showing incorrect values (#26975)	2021-08-21 17:59:11 +05:30
Saqib	5395f56c88	Merge branch 'develop' into common-party-acc	2021-08-20 20:42:50 +05:30
GangaManoj	d1453c0cd0	fix: Remove Item Code and Item Name columns	2021-08-20 18:26:17 +05:30
GangaManoj	75d4fc99fc	fix: Display Items in the format Item Code: Item Name	2021-08-20 18:25:36 +05:30
Saqib	c335962827	refactor!: drop e-invoicing integration from erpnext (#26940)	2021-08-20 11:10:46 +05:30
Saqib	153fe1cdb4	refactor: scan barcode field scanning (#26990)	2021-08-20 11:09:51 +05:30
GangaManoj	b5fac83987	fix: Add items belonging to Product Bundles as children	2021-08-20 06:07:53 +05:30
GangaManoj	33f100d75d	fix: Set initial_depth to 3	2021-08-20 06:06:47 +05:30
GangaManoj	97a1d426a3	fix: Assign indent and parent_invoice	2021-08-20 03:54:19 +05:30
GangaManoj	779a1d68a5	fix: Make Invoice row bold	2021-08-20 02:38:34 +05:30
GangaManoj	5ffaff8e48	fix: Display items as descendants of invoices	2021-08-20 02:20:18 +05:30
GangaManoj	17a154017b	fix: Display data in tree form	2021-08-20 02:19:18 +05:30
GangaManoj	76921137ed	fix: Return data as dict if the report is grouped by Invoice	2021-08-20 02:16:49 +05:30
Saqib Ansari	8e79c48db8	fix: remove unwanted filter query	2021-08-19 18:10:02 +05:30
Saqib Ansari	71e7254184	test: creation of advance entry on invoice submission	2021-08-19 18:09:35 +05:30
Saqib Ansari	977b09b6ba	feat: auto create advance entry on invoice submission	2021-08-19 18:09:35 +05:30
Saqib Ansari	cad08bc428	feat: toggle to enable common party accounting	2021-08-19 18:09:35 +05:30
Saqib Ansari	dddc29fdc1	feat: initialize party link for customer & suppliers	2021-08-19 18:09:35 +05:30
Noah Jacob	6541453c16	fix(ux): removed rate from grid view	2021-08-19 15:53:55 +05:30
Ankush Menat	4551d7d602	chore: mass trailing whitespace and EOF fixes	2021-08-19 13:43:28 +05:30
Deepesh Garg	869e36c33a	Merge pull request #26737 from nemesis189/payment-reconc-party-validation-fix ... fix: Payment Reconciliation party validation issue	2021-08-19 12:40:54 +05:30
Afshan	ecd6584c50	fix: assigning values to rows in sales register reports (#26546) ... * fix: assigning values to rows in sales register reports * fix: check for is_internal_customer for unrealized_profit_loss_account	2021-08-19 12:18:27 +05:30
Subin Tom	ef792971f3	fix: Add ignore user perms to set_target_warehouse field in sales invoice (#26987) ... * reverting ot v12.7.1 * fix: Ignore user permissions for set_target_warehouse in SI Co-authored-by: Subin Tom <subin-home@Subins-MacBook-Air.local> Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>	2021-08-18 18:20:04 +05:30
Afshan	2416b3a1ee	Merge branch 'develop' into payment-reconc-party-validation-fix	2021-08-18 16:03:47 +05:30
rohitwaghchaure	c068e8128c	Merge pull request #26993 from rohitwaghchaure/fixed-sales-invoice-not-loading ... fix: sales invoice not loading issue	2021-08-18 10:32:54 +05:30
Rohit Waghchaure	e0862de863	fix: sales invoice not loading issue	2021-08-18 10:27:58 +05:30
GangaManoj	4a77bd2304	fix: Syntax error	2021-08-18 00:33:43 +05:30
Afshan	5fec44446e	fix: set account for change amount even if pos profile not found (#26986)	2021-08-17 20:06:19 +05:30
Deepesh Garg	93fc469ace	Merge pull request #26973 from deepeshgarg007/payment_entry_unallocated_fix ... fix: Incorrect unallocated amount calculation in payment entry	2021-08-17 19:13:58 +05:30
Mohammed Redah	a2966db1e5	fix: change print_format_type from Server to Jinja (#26374)	2021-08-17 18:45:55 +05:30
Deepesh Garg	fd739749ba	test: Add test case for payment entry	2021-08-17 16:38:25 +05:30
Frappe PR Bot	a14d218834	fix: typo (#26967) (#26984) ... (cherry picked from commit ace8cf965d2aab3faa18aa704e0e796f707cc666) Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>	2021-08-17 16:14:37 +05:30
Deepesh Garg	b1bcb3bf13	fix: Incorrect unallocated amount calculation in payment entry	2021-08-17 11:28:46 +05:30
Rohit Waghchaure	eb1e3181a4	fix: conflicts while merging brnach version-13 to develop	2021-08-17 10:53:19 +05:30
Deepesh Garg	58c1739eac	fix: Budget variance missing values	2021-08-16 18:04:57 +05:30
Deepesh Garg	8410e4854f	fix: Budget variance missing values	2021-08-16 17:14:40 +05:30
GangaManoj	f9356ee642	fix: Sider issues	2021-08-13 17:40:51 +05:30
GangaManoj	f977c65e80	fix: Make enable_discount_accounting a class property	2021-08-13 17:17:58 +05:30
GangaManoj	5999760a65	fix: Syntax error	2021-08-13 17:13:38 +05:30
Deepesh Garg	5122948450	Merge branch 'develop' of https://github.com/frappe/erpnext into enable-discount-accounting	2021-08-13 16:00:20 +05:30
Shariq Ansari	b32c2fa561	fix: updated erpnext wspace json files (#26380) ... * fix: updated erpnext wspace json files * fix: updated wspace json files * fix: updated wspace json files * fix: removed padding code from wspace json files * fix: Updated restrict_to_domain in wspace json Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>	2021-08-13 12:19:16 +05:30
Afshan	587d2db6a9	fix: show proper currency symbol in taxes and charges table (#26827) ... Co-authored-by: Saqib <nextchamp.saqib@gmail.com> Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>	2021-08-13 10:59:06 +05:30
Afshan	1de4c01942	fix: Deferred Revenue Section should be collapsible only if its not enabled (#26928)	2021-08-12 23:06:34 +05:30
Ganga Manoj	54c31ed33c	feat: depreciate asset after sale (#26543)	2021-08-12 13:42:56 +05:30
Deepesh Garg	a7054560da	Merge branch 'develop' into po-payment-terms	2021-08-11 19:31:30 +05:30
Deepesh Garg	13fb71f642	Merge branch 'develop' into payment_entry_validations_and_trigger_develop	2021-08-11 18:20:42 +05:30
Deepesh Garg	a1f0cebda5	fix: Do not update settings for test	2021-08-11 11:50:39 +05:30
Deepesh Garg	02f44528f2	test: Add test case for payment entry unlink	2021-08-11 11:50:39 +05:30
Deepesh Garg	7141860c04	test: Update exchange rate in test cases	2021-08-11 11:50:39 +05:30
Deepesh Garg	b5162390e5	fix: Only do specific validations on reference unlink	2021-08-11 11:50:39 +05:30
Deepesh Garg	188bba8feb	fix: Validation for receivingfrom customer against negative outstanding	2021-08-11 11:50:39 +05:30
Deepesh Garg	c5276f3fd3	fix: Multiple fixes in payment entry	2021-08-11 11:50:16 +05:30
Deepesh Garg	a57d13e1e9	fix: Multiple fixes in payment entry	2021-08-11 11:50:16 +05:30
Afshan	976ae13c1e	Merge branch 'develop' into payment-reconc-party-validation-fix	2021-08-11 11:49:27 +05:30
Ankush	9152715f90	perf: various minor perf fixes for ledger postings (#26775) ... * perf: only validate if voucher is journal entry * perf: optimize merge GLE - Order fields such that comparison will fail faster - Break out of loops if not matched * perf: don't try to match SLE if count mismatch * refactor: simplify initialize_previous_data * perf: use cache for fetching valuation_method These are set only once fields * refactor: simplify get_future_stock_vouchers * refactor: simplify get_voucherwise_gl_entries * perf: fetch only required fields for GL comparison `select *` fetches all fields, output of this function is only used for comparing. * perf: reorder conditions in PL cost center check * perf: reduce query while validating new gle * perf: use cache for validating warehouse props These properties don't change often, no need to query everytime. * perf: use cached stock settings to validate SLE * docs: update misleading docstring Co-authored-by: Marica <maricadsouza221197@gmail.com>	2021-08-11 11:17:50 +05:30
Anupam Kumar	a6aa6cd7d6	fix: timesheet amount issue (#25993) ... * fix: timesheet amount issue * fix: timesheet detail rate conversion * fix: condition to check timesheet currency * fix: removing console statement	2021-08-10 20:32:15 +05:30
Frappe PR Bot	1a39d1a311	fix: cost center & account validation in Sales/Purchase Taxes and Charges (#26881)	2021-08-10 19:38:39 +05:30
Anuja Pawar	66784a16cb	fix: Sales Return cancellation if linked with Payment Entry (#26883)	2021-08-10 19:38:16 +05:30
Marica	d657f39ab8	Merge pull request #25622 from noahjacob/promo_scheme_feat ... feat: added multi-select fields to create multiple pricing rules.	2021-08-10 19:09:42 +05:30
Marica	af9863146d	fix: Grammar in Error message	2021-08-10 18:49:07 +05:30
Noah Jacob	49b7c7575e	refactor: code cleanup	2021-08-10 18:35:46 +05:30
Noah Jacob	4ee6e32d74	test(fix): fixed test case	2021-08-10 18:34:18 +05:30
Anuja Pawar	0e337be065	fix: cost center & account validation in Sales/Purchase Taxes and Charges (#25929)	2021-08-10 17:26:35 +05:30
Anuja Pawar	1cba77cfbd	fix: Sales Return cancellation if linked with Payment Entry (#26551)	2021-08-10 17:25:12 +05:30
Frappe PR Bot	1ba04fdfe5	fix: pos profile not mandatory for Sales Invoice (#26876)	2021-08-10 15:47:36 +05:30
Afshan	af2f5277d5	fix: pos profile not mandatory for Sales Invoice (#26853)	2021-08-10 14:16:16 +05:30
Noah Jacob	10ce2f5d6e	refactor: added naming series for pricing rule	2021-08-10 11:42:59 +05:30
noahjacob	dd86642037	refactor: removed py2 code	2021-08-10 11:41:29 +05:30
noahjacob	b214e624bb	style: fixed formatting	2021-08-10 11:41:29 +05:30
noahjacob	74bcb987f3	style: fixed formatting	2021-08-10 11:41:29 +05:30
noahjacob	4fb1b6b80c	fix: Sider	2021-08-10 11:41:29 +05:30
noahjacob	a4cea1e56d	refactor: variable names	2021-08-10 11:41:29 +05:30
noahjacob	3a663ac77f	test: changed test item name	2021-08-10 11:41:29 +05:30
noahjacob	c95d96e7ae	refactor: changed variable names	2021-08-10 11:41:29 +05:30
noahjacob	a9ef56a107	test: added test case for creating and updating	2021-08-10 11:41:29 +05:30
noahjacob	415519af15	feat: added multi-select fields to create multiple pricing rules.	2021-08-10 11:41:29 +05:30
Deepesh Garg	797170e913	fix: Linting issues	2021-08-10 11:02:21 +05:30
Deepesh Garg	428ccebad9	test: Update test cases for discount accounting	2021-08-10 10:43:01 +05:30
Deepesh Garg	b73bb3e501	fix: Add discount account handling in Purchase Invoice	2021-08-10 10:42:47 +05:30
Deepesh Garg	9b561ea839	Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into discount_accounting_v13	2021-08-10 10:38:14 +05:30
Deepesh Garg	cd980f5e6b	Merge pull request #26723 from GangaManoj/backport-po-payment-terms ... feat: Fetch Payment Terms from linked Sales/Purchase Order	2021-08-10 10:34:39 +05:30
Afshan	f5b5be9644	Merge branch 'develop' into po-payment-terms	2021-08-10 09:32:08 +05:30
Afshan	a982a2a72e	Merge branch 'develop' into payment-reconc-party-validation-fix	2021-08-10 09:30:48 +05:30
Francisco Roldan	0a90302170	fix: depends_on in price list field	2021-08-09 11:41:56 -03:00
Francisco Roldan	7e3dd9e8ee	fix: depends_on in price list field	2021-08-09 11:21:41 -03:00
Deepesh Garg	75a832715c	test: Update test cases for discount accounting	2021-08-09 19:03:14 +05:30
Deepesh Garg	cb539b7a6a	fix: Add discount account handling in Purchase Invoice	2021-08-09 19:01:41 +05:30
Deepesh Garg	bcf56e64ba	fix: Ignore default payment term templates when coping payment terms from orders	2021-08-09 18:53:14 +05:30
GangaManoj	072f63b324	Revert "fix: Only fetch default Payment Terms Template if present" ... This reverts commit fb80ca9e06.	2021-08-09 18:53:14 +05:30
GangaManoj	e247e3a4b2	fix: Only fetch default Payment Terms Template if present	2021-08-09 18:53:14 +05:30
Deepesh Garg	90cca2cb55	Merge branch 'develop' into payment-reconc-party-validation-fix	2021-08-09 18:06:33 +05:30
Frappe PR Bot	ea83e2b45f	fix: validate python expressions (#26835) (#26856) ... (cherry picked from commit 07337d5c78) Co-authored-by: Ankush <ankush@iwebnotes.com>	2021-08-09 14:48:59 +05:30
Anupam Kumar	9c04c297b8	refactor: Accounts Settings form cleanup (#26842)	2021-08-09 14:01:02 +05:30
Ankush	07337d5c78	fix: validate python expressions (#26835)	2021-08-09 12:38:40 +05:30
Deepesh Garg	a59a761f99	Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into backport-po-payment-terms	2021-08-06 23:55:01 +05:30
Deepesh Garg	0bba425fe3	fix: Ignore default payment term templates when coping payment terms from orders	2021-08-06 23:53:16 +05:30
Saqib	f1141e7756	fix: failing budget test due to project naming (#26834)	2021-08-06 17:37:17 +05:30
Saqib	668f442139	Merge branch 'develop' into po-payment-terms	2021-08-06 13:42:10 +05:30
Deepesh Garg	6871c07685	test: Failing budget test due to project naming	2021-08-06 10:53:38 +05:30
GangaManoj	232c728636	Revert "fix: Only fetch default Payment Terms Template if present" ... This reverts commit fb80ca9e06.	2021-08-05 23:04:58 +05:30
GangaManoj	fb80ca9e06	fix: Only fetch default Payment Terms Template if present	2021-08-05 22:04:11 +05:30
Frappe PR Bot	6e07ec2617	fix: Do not fetch fully return issued purchase receipts (#26809) (#26825) ... (cherry picked from commit 1d90f7684e) Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>	2021-08-05 20:13:28 +05:30
Deepesh Garg	1d90f7684e	fix: Do not fetch fully return issued purchase receipts (#26809)	2021-08-05 19:17:32 +05:30
GangaManoj	23c104555b	fix: Remove irrelevant code	2021-08-05 00:28:42 +05:30
Frappe PR Bot	bf8d0c256d	fix: typo in error message (#26816) (#26817) ... (cherry picked from commit 005291e6dd) Co-authored-by: François de Ryckel <f.deryckel@gmail.com>	2021-08-04 22:01:17 +05:30
François de Ryckel	005291e6dd	fix: typo in error message (#26816)	2021-08-04 21:59:18 +05:30
Saqib	5c9d4db0e9	Merge branch 'develop' into payment-reconc-party-validation-fix	2021-08-04 13:57:00 +05:30
Deepesh Garg	346bde875c	Merge branch 'develop' of https://github.com/frappe/erpnext into sa-vat-report	2021-08-03 14:44:20 +05:30
Deepesh Garg	db40d88fc2	Merge pull request #26780 from nemesis189/added-dispatch-address-to-sales-v13-new ... feat: Added dispatch address fields in Sales Ord, Sales Inv, Delivery Note for Eway Bill	2021-08-02 21:11:50 +05:30
Subin Tom	6ba11a382a	test: Updated test case for Eway bill	2021-08-02 20:36:46 +05:30
Subin Tom	8800aaaee7	feat: Added fields for dispatch address in Sales Order, Sales Invoice, Delivery Note for Eway Bill	2021-08-02 20:36:37 +05:30
Deepesh Garg	c677d47a4a	fix: Test Cases	2021-08-02 12:40:44 +05:30
Deepesh Garg	c525b372c6	fix: Tests	2021-08-02 12:40:00 +05:30
Deepesh Garg	92f7a5a390	fix: GL For taxes if discount applied on Grand Total	2021-08-02 12:39:43 +05:30
Deepesh Garg	b7267f8f5f	fix: Syntax Error	2021-08-02 12:39:22 +05:30
Frappe PR Bot	a9474a9fbd	fix: POS Invoice consolidated Sales Invoice field set to no copy (#26768)	2021-08-02 12:25:27 +05:30
Subin Tom	e99cd2e9da	fix: POS Invoice consolidated Sales Invoice field set to no copy (#26706)	2021-08-02 11:39:20 +05:30
Anuja Pawar	4ec02ad91d	Merge branch 'develop' into sa-vat-report	2021-08-02 10:42:04 +05:30
Rohit Waghchaure	343143037c	fix: conflicts	2021-08-01 14:45:24 +05:30
Deepesh Garg	36f6e9b58e	Merge pull request #26654 from marination/pi-expense-account ... fix: Set Expense account from warehouse only if warehouse exists (Inter company invoice)	2021-07-31 17:32:24 +05:30
Rohit Waghchaure	2a14f255cf	fix: COGS account in purchase receipt	2021-07-31 11:14:14 +05:30
Deepesh Garg	6eded547f5	fix: TDS calculation for first threshold breach for TDS category 194Q	2021-07-30 20:12:51 +05:30
Subin Tom	b8845b9ed9	Fix: Payment Entry party validation issue	2021-07-30 16:30:18 +05:30
Saqib	d4ae1febe3	fix: gl entries for exchange gain loss (#26734)	2021-07-30 11:21:49 +05:30
Saqib	2d6f2fea5b	fix: gl entries for exchange gain loss (#26728)	2021-07-30 10:55:53 +05:30
rohitwaghchaure	50b4b70589	Merge pull request #26727 from deepeshgarg007/pricing_rule_item_group_v13 ... fix: Parent condition in pricing rules	2021-07-29 20:06:47 +05:30
Deepesh Garg	9c7a9f3a13	fix: Parent condition in pricing rules	2021-07-29 20:02:49 +05:30
rohitwaghchaure	bd33bdf210	Merge pull request #26717 from deepeshgarg007/pricing_rule_item_group ... fix: Parent condition in pricing rules	2021-07-29 19:51:53 +05:30
Ankush	57cd273f7c	fix: empty "against account" in Purchase Receipt GLE bp #26712 (#26719) ... * fix: correct field for GLE against account in PR * fix: remove incorrect field check from reposting	2021-07-29 19:49:36 +05:30
Ankush	c7df759324	fix: empty "against account" in Purchase Receipt GLE bp #26712 (#26718) ... * fix: correct field for GLE against account in PR * fix: remove incorrect field check from reposting	2021-07-29 19:49:12 +05:30
GangaManoj	b389c9e375	fix: Fetch Payment Terms from Sales/Purchase Orders	2021-07-29 19:25:29 +05:30
GangaManoj	1011c1b01a	fix: Clear Payment Schedule if PI has default Payment Schedule, but linked PO doensn't	2021-07-29 19:24:29 +05:30
Deepesh Garg	19a6d80927	fix: Parent condition in pricing rules	2021-07-29 18:47:16 +05:30
Saqib	bbb96899a5	Merge branch 'develop' into po-payment-terms	2021-07-29 17:23:09 +05:30
Deepesh Garg	e014d7a00e	Merge pull request #26710 from deepeshgarg007/tds_194q_calculations ... fix: TDS calculation for first threshold breach for TDS category 194Q	2021-07-29 15:55:16 +05:30
Saqib	e39bbc85e1	fix: cannot cancel payment entry if linked with invoices (#26703)	2021-07-29 15:46:25 +05:30
Ankush Menat	5764b49767	fix: remove incorrect field check from reposting	2021-07-29 15:41:22 +05:30
Deepesh Garg	4c681592bf	fix: TDS calculation for first threshold breach for TDS category 194Q	2021-07-29 15:26:19 +05:30
Ankush	f8343890b9	feat: don't recompute taxes (#26695)	2021-07-29 11:09:34 +05:30
Ankush	8859574aab	feat: don't recompute taxes (#26694)	2021-07-29 11:09:22 +05:30
Deepesh Garg	e79bfbb104	Merge pull request #26665 from ankush/dont_recompute_taxes ... feat: don't recompute taxes	2021-07-28 19:36:27 +05:30
Deepesh Garg	8c7d9efa9d	fix: Chnage fieldtype from data to check	2021-07-28 17:18:50 +05:30
Marica	d43e6ced91	Merge branch 'develop' into pi-expense-account	2021-07-28 14:38:48 +05:30
Deepesh Garg	9350249941	fix: Chnage fieldtype from data to check	2021-07-28 12:57:59 +05:30
Deepesh Garg	441adf763f	fix(minor): Consider grand total for threshold check	2021-07-28 10:51:50 +05:30
Deepesh Garg	64af124f88	fix(minor): Consider grand total for threshold check	2021-07-28 10:43:02 +05:30
rohitwaghchaure	c1eb5a06a3	Merge pull request #26679 from rohitwaghchaure/removed-remarks-field-from-ar-ap-report-develop ... fix: removed Remarks column from AR/AP report	2021-07-27 22:23:40 +05:30
Rohit Waghchaure	5d121c41f3	fix: removed Remarks column from AR/AP report	2021-07-27 22:22:56 +05:30
Deepesh Garg	5a7fad8a6a	feat: Enhancements in TDS	2021-07-27 18:55:14 +05:30
Nabin Hait	11a1610781	Merge pull request #26661 from deepeshgarg007/tds_enhancements ... feat: Enhancements in Tax Withholding Category	2021-07-27 18:26:00 +05:30
Deepesh Garg	9d8efbe1db	Merge pull request #26651 from deepeshgarg007/exchange_rate_reval_fixes_v13_pre_release ... fix: Exchange rate revaluation posting date and precision fixes	2021-07-27 16:41:59 +05:30
Deepesh Garg	f28595cad0	Merge pull request #26650 from deepeshgarg007/exchange_rate_reval_fixes_v13 ... fix: Exchange rate revaluation posting date and precision fixes	2021-07-27 16:41:23 +05:30
Ankush Menat	dfdd1c6e02	feat: don't recompute taxes	2021-07-27 14:49:44 +05:30
Deepesh Garg	6e6823c3aa	feat: Enhancements in TDS	2021-07-27 10:59:25 +05:30
Anuja Pawar	9302e0b6c5	Merge branch 'develop' into sa-vat-report	2021-07-27 10:18:53 +05:30
Deepesh Garg	831ce88d1c	Merge pull request #26643 from nemesis189/ignore-mandatory-in-payment-reconcilitation-pre-release ... fix:Ignore mandatory fields while creating payment reconciliation Journal Entry	2021-07-27 10:16:04 +05:30
Deepesh Garg	3fae0db8d9	Merge pull request #26550 from nemesis189/ignore-mandatory-in-payment-reconcilitation-v13 ... fix: Ignore mandatory fields while creating payment reconciliation Journal Entry	2021-07-27 10:15:39 +05:30
marination	77f9f048b6	chore: test case for missing default warehouse on mapping	2021-07-26 21:33:17 +05:30
marination	5c82af50f9	fix: Set Expense account from warehouse only if warehouse exists	2021-07-26 19:41:53 +05:30
Deepesh Garg	3fcc5e3134	fix: Convert null values to empty string on grouping	2021-07-26 19:09:09 +05:30
Deepesh Garg	19a0ca1980	fix: Ignore GL Entry on cancel	2021-07-26 19:08:56 +05:30
Deepesh Garg	356a55258e	fix: Exchange rate revaluation posting date and precision fixes	2021-07-26 19:08:45 +05:30
Deepesh Garg	dc2cd35b93	fix: Convert null values to empty string on grouping	2021-07-26 19:07:02 +05:30
Deepesh Garg	5749e52bf6	fix: Ignore GL Entry on cancel	2021-07-26 19:06:51 +05:30
Deepesh Garg	fb72df7dce	fix: Exchange rate revaluation posting date and precision fixes	2021-07-26 19:06:40 +05:30
Subin Tom	50b76d04bf	fix:Ignore mandatory fields while creating payment reconciliation Journal Entry	2021-07-26 16:52:05 +05:30
Deepesh Garg	67273b9551	fix: Convert null values to empty string on grouping	2021-07-25 21:26:22 +05:30
Deepesh Garg	a8bf61c14e	Merge branch 'develop' of https://github.com/frappe/erpnext into exchange_rate_reval_fixes	2021-07-25 19:58:04 +05:30
Deepesh Garg	c485d5c3b7	fix: Ignore GL Entry on cancel	2021-07-25 19:46:50 +05:30
Deepesh Garg	f4701c174a	fix: Exchange rate revaluation posting date and precision fixes	2021-07-25 19:46:20 +05:30
Devin Slauenwhite	0d968fabfe	fix: missing parameter 'country'	2021-07-22 13:44:09 +05:30
Deepesh Garg	2ff0d3e0eb	fix: Test Cases	2021-07-22 10:43:16 +05:30
Deepesh Garg	c765073c2a	fix: Tests	2021-07-21 22:28:32 +05:30
Rohit Waghchaure	f3158ea448	fix: removed Remarks column from AR/AP report	2021-07-21 19:47:41 +05:30
Deepesh Garg	5a06019440	fix: GL For taxes if discount applied on Grand Total	2021-07-21 15:25:40 +05:30
Deepesh Garg	fc09d845c5	fix: Syntax Error	2021-07-21 15:25:09 +05:30
GangaManoj	4fa409e019	fix: Add mandatory_depends_on property for Discount Account	2021-07-21 14:26:52 +05:30
GangaManoj	45327e04db	fix: Tests	2021-07-21 14:26:52 +05:30
GangaManoj	1f6c05f013	fix: Make discount_account mandatory if discount accounting is enabled	2021-07-21 14:26:52 +05:30
GangaManoj	566e8f8499	fix: Create GL Entries for Additional Discount Account	2021-07-21 14:26:51 +05:30
Ganga Manoj	ed6ebdf5ed	fix: Filter for additional_discount_account ... Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>	2021-07-21 14:24:21 +05:30
Ganga Manoj	821b75f1b1	fix: Filter for additional_discount_account ... Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>	2021-07-21 14:24:21 +05:30
GangaManoj	251f229601	fix: Add test for additional discount applied on taxes	2021-07-21 14:23:53 +05:30
GangaManoj	99652876d0	fix: Add test for additional discount applied on taxes	2021-07-21 14:23:53 +05:30
GangaManoj	d62af77ca8	fix: Remove unnecessary condition	2021-07-21 14:23:52 +05:30
GangaManoj	4da7c5882b	fix: Only display Additional Discount Account if Enable Discount Accounting is checked	2021-07-21 14:23:52 +05:30
GangaManoj	9dd2a9e897	fix: Create ledger entries for discount applied on taxes in make_tax_gl_entries	2021-07-21 14:23:52 +05:30
GangaManoj	ff25683378	fix: Filter options for Additional Discount Account	2021-07-21 14:23:52 +05:30
GangaManoj	03f2706971	fix: Add Additional Discount Account field	2021-07-21 14:23:52 +05:30
GangaManoj	d0d9e83ad2	fix: Check all expected GL Entries	2021-07-21 14:23:52 +05:30
GangaManoj	b64787ee9c	fix: Only display Additional Discount Account if Enable Discount Accounting is checked	2021-07-21 14:23:52 +05:30
GangaManoj	c1d65cfa8d	fix: Filter options for Additional Discount Account	2021-07-21 14:23:52 +05:30
GangaManoj	9e788cfdcd	fix: Add Additional Discount Account field	2021-07-21 14:23:52 +05:30
GangaManoj	38e87fce09	fix: Add tests for discount accounting	2021-07-21 14:23:51 +05:30
GangaManoj	fd2852e87e	fix: Create common function for discount accounting	2021-07-21 14:23:15 +05:30
GangaManoj	e06eb8e6a9	fix: Filter options for Discount Account	2021-07-21 14:22:26 +05:30
GangaManoj	377775ad8e	fix: Copy Discount Account from first row	2021-07-21 14:22:25 +05:30
GangaManoj	e2c83c3baf	fix: Display Discount Account only if Enable Discount Accounting is checked	2021-07-21 14:21:32 +05:30
GangaManoj	bde5c619db	fix: Add Discount Account field	2021-07-21 14:21:31 +05:30
GangaManoj	613d08faad	fix: Copy discount account from first row to all Items	2021-07-21 14:21:15 +05:30
GangaManoj	cfb94175a2	fix: Filter Discount Account list	2021-07-21 14:20:32 +05:30
GangaManoj	d24b5f707a	fix: Add description for Enable Discount Accounting checkbox	2021-07-21 14:20:32 +05:30
GangaManoj	f48fa2e7f3	feat: Toggle display for discount accounting fields according to enable_discount_accounting	2021-07-21 14:20:06 +05:30
GangaManoj	c4e5429560	feat: Filter list for Discount Account field in Items table	2021-07-21 14:20:06 +05:30
GangaManoj	f6a9374356	feat: Create GL Entries for discount accounting	2021-07-21 14:20:06 +05:30
GangaManoj	a6690a8a3d	feat(Sales Invoice): Add 'Discount Account' field in Items table	2021-07-21 14:20:06 +05:30
GangaManoj	e1dc6980d0	feat(Accounts Settings): Add 'Enable Discount Accounting' checkbox	2021-07-21 14:20:06 +05:30
Deepesh Garg	3e109840f9	Merge pull request #26464 from nemesis189/added-dispatch-address-to-sales ... feat: Added dispatch address fields in Sales Ord, Sales Inv, Delivery Note for Eway Bill	2021-07-21 10:52:10 +05:30
GangaManoj	46bed5e6cc	fix: Add mandatory_depends_on property for Discount Account	2021-07-20 22:03:44 +05:30
Rohit Waghchaure	c14aa45720	fix: incorrect valuation rate calculation in gross profit report	2021-07-20 18:19:15 +05:30
GangaManoj	82d147ea62	fix: Tests	2021-07-20 05:16:33 +05:30
GangaManoj	59ee6958aa	fix: Make discount_account mandatory if discount accounting is enabled	2021-07-20 03:52:39 +05:30
GangaManoj	4105e27138	fix: Create GL Entries for Additional Discount Account	2021-07-20 03:46:02 +05:30
Ganga Manoj	1d830dfd92	fix: Filter for additional_discount_account ... Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>	2021-07-19 23:47:58 +05:30
Ganga Manoj	8fc9c13734	fix: Filter for additional_discount_account ... Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>	2021-07-19 23:46:38 +05:30
Subin Tom	ff9d631f15	fix:Ignore mandatory fields while creating payment reconciliation Journal Entry	2021-07-19 20:28:34 +05:30
Subin Tom	b24a149dbc	test: Updated test case for Eway bill	2021-07-19 14:37:12 +05:30
Anuja Pawar	2bbf48e835	Merge branch 'develop' into sa-vat-report	2021-07-18 11:13:25 +05:30
Devin Slauenwhite	d5ff636159	fix: missing parameter 'country'	2021-07-17 14:42:38 -04:00
GangaManoj	831f5edd02	fix: Remove unused imports	2021-07-17 22:55:24 +05:30
GangaManoj	cde0cc0678	fix: Fetch Payment Terms from Sales/Purchase Orders	2021-07-17 22:53:21 +05:30
Ganga Manoj	bfb7256143	Merge branch 'develop' into enable-discount-accounting	2021-07-17 20:01:09 +05:30
GangaManoj	d6956ff075	fix: Add test for additional discount applied on taxes	2021-07-17 19:49:42 +05:30
GangaManoj	99551e9b7f	fix: Add test for additional discount applied on taxes	2021-07-17 18:45:21 +05:30
GangaManoj	c4d2dc0da3	fix: Remove unnecessary condition	2021-07-17 17:47:20 +05:30
GangaManoj	c2ba6897b0	fix: Only display Additional Discount Account if Enable Discount Accounting is checked	2021-07-17 17:45:35 +05:30
GangaManoj	fa4c03e7a1	fix: Create ledger entries for discount applied on taxes in make_tax_gl_entries	2021-07-17 17:42:36 +05:30
GangaManoj	7bbc9a886d	fix: Filter options for Additional Discount Account	2021-07-17 17:41:06 +05:30
GangaManoj	87d448e039	fix: Add Additional Discount Account field	2021-07-17 17:40:43 +05:30
GangaManoj	b0f21824bc	fix: Check all expected GL Entries	2021-07-17 17:34:50 +05:30
Nabin Hait	11475487fb	fix: merge conflict	2021-07-16 15:58:50 +05:30
GangaManoj	40412f7e61	fix: Only display Additional Discount Account if Enable Discount Accounting is checked	2021-07-15 22:02:43 +05:30
GangaManoj	8e96e2d5a2	fix: Filter options for Additional Discount Account	2021-07-15 22:01:38 +05:30
GangaManoj	4f2bf98966	fix: Add Additional Discount Account field	2021-07-15 22:01:02 +05:30
Deepesh Garg	cc73e7d6fa	Merge pull request #26472 from deepeshgarg007/payment_entry_taxes_unallocated_amount_v13 ... fix: Unallocated amount in Payment Entry after taxes	2021-07-15 12:38:45 +05:30
Deepesh Garg	5ad759897f	Merge pull request #26471 from deepeshgarg007/payment_entry_taxes_unallocated_amount ... fix: Unallocated amount in Payment Entry after taxes	2021-07-15 12:38:32 +05:30
Deepesh Garg	1524e7f5ba	Merge pull request #26412 from deepeshgarg007/payment_entry_taxes_v12 ... fix: Unallocated amount in Payment Entry after taxes	2021-07-15 12:38:23 +05:30
Anuja Pawar	259947dae9	Merge branch 'develop' into sa-vat-report	2021-07-14 20:47:41 +05:30
Afshan	74d7baa80a	fix: filter by accounts with group by accounts (#26438) ... * fix: filter by accounts with group by accounts * fix: parsing json Co-authored-by: Saqib <nextchamp.saqib@gmail.com>	2021-07-14 19:59:11 +05:30
Deepesh Garg	13fffeb97b	Merge pull request #26473 from deepeshgarg007/bootstrapped_gst_setup_develop ... feat(India): Bootstrapped GST Setup	2021-07-14 16:44:12 +05:30
Saqib	72715956f1	fix: tds computation summary shows cancelled invoices (#26486)	2021-07-14 15:56:20 +05:30
Saqib	ac721ae147	fix: tds computation summary shows cancelled invoices (#26485)	2021-07-14 15:20:14 +05:30
Saqib	1c76154096	fix: tds computation summary shows cancelled invoices (#26456)	2021-07-14 14:45:39 +05:30
Saqib	9c04079d04	fix: test fails due to improper gain loss account set (#26482) (#26484)	2021-07-14 14:45:11 +05:30
Afshan	9168bb369a	fix: filter by accounts with group by accounts (#26439)	2021-07-14 13:57:14 +05:30
Saqib	d86cdb4368	Merge branch 'develop' into payment_entry_taxes_unallocated_amount	2021-07-14 13:55:09 +05:30
Saqib	be773f4052	Merge branch 'develop' into bootstrapped_gst_setup_develop	2021-07-14 13:55:00 +05:30
Saqib	c978fdf3df	fix: test fails due to improper gain loss account set (#26482)	2021-07-14 13:53:30 +05:30
Frappe	1dfb5eb535	feat: South Africa VAT report	2021-07-14 12:33:45 +05:30
Saqib	bb493a0602	Merge pull request #26159 from GangaManoj/asset-credit-note	2021-07-14 12:02:02 +05:30
GangaManoj	6357ffe4a1	fix: Create asset data	2021-07-13 22:31:01 +05:30
GangaManoj	2f4c607fc8	fix: Add tests for discount accounting	2021-07-13 17:41:29 +05:30
Deepesh Garg	779d2afa60	fix: Update account heads in GST test cases	2021-07-13 16:50:04 +05:30
Deepesh Garg	bb679cc036	fix: Add validate bank account method back	2021-07-13 16:49:21 +05:30
Deepesh Garg	a72589cb7e	fix: Add accounts and templates for reverse charge	2021-07-13 16:48:06 +05:30