8563 Commits

Author	SHA1	Message	Date
anandbaburajan	03662be150	chore: have different functions for draft. active and cancelled depr schedules	2022-12-25 18:05:19 +05:30
ruthra kumar	a0484793c3	refactor: remove unrelated filters from Supplier Ledger Summary ... Territory, Sales Partner and Sales Person doesn't belong in Supplier Ledger	2022-12-24 11:20:39 +05:30
ruthra kumar	bfa511cb65	refactor: hidden columns to help framework handle user permissions ... 'territory', 'supplier_group', 'customer_group' have been added as hidden columns to handle 'user permission' based access control.	2022-12-24 10:30:30 +05:30
Anand Baburajan	b17ef34042	Merge branch 'develop' into asset_depreciation_schedule	2022-12-23 11:02:17 +05:30
ruthra kumar	8f5d8e0474	Merge pull request #33418 from ruthra-kumar/filter_issue_in_ar_ap_report ... fix: payment terms and sales partner filter issue in Accounts Receivable report	2022-12-22 11:38:38 +05:30
ruthra kumar	13c4420f42	fix: payment terms and sales partner filter issue in AR/AP report	2022-12-22 10:55:22 +05:30
ruthra kumar	a26698b88e	Merge pull request #33410 from ruthra-kumar/typeerror_on_gp_due_to_incorrect_warehouse_on_bundle_item ... fix: TypeError on GP Report due to multiple warehouse on bundled items	2022-12-21 18:26:40 +05:30
ruthra kumar	5918bb03f7	test: type error on bundled products with different warehouses	2022-12-21 17:47:57 +05:30
ruthra kumar	e684eb32d0	fix: typerror on multi warehouse in Packed Items ... DN(with bundled item with varying warehouses)-> Sales Invoice.	2022-12-21 15:09:55 +05:30
sonali	81e5f71172	fix: json issue	2022-12-21 14:02:54 +05:30
Deepesh Garg	ade83cbab3	fix: Consolidated financial report	2022-12-20 16:45:46 +05:30
Deepesh Garg	1da14b7ec3	Merge pull request #33393 from deepeshgarg007/cc_filter_cashflow_report ... fix: Cost center filter not working in cash flow report	2022-12-20 13:46:18 +05:30
Deepesh Garg	31c95deb88	chore: More fixes	2022-12-20 11:45:51 +05:30
Deepesh Garg	ff48634cbb	Merge branch 'develop' of https://github.com/frappe/erpnext into payment_request_flow	2022-12-20 11:42:15 +05:30
Deepesh Garg	e25b98b620	chore: Update test case	2022-12-20 11:42:05 +05:30
Deepesh Garg	068df9f815	chore: remove print statement	2022-12-20 10:00:53 +05:30
Deepesh Garg	d0dbfec052	fix: Cost center filter not working in cash flow report	2022-12-20 09:59:27 +05:30
ruthra kumar	65db9cea25	Merge pull request #33380 from ruthra-kumar/err_for_invoices_should_reflect_in_ar_ap_report ... fix: ERR journals should reported in AR/AP	2022-12-18 16:56:19 +05:30
ruthra kumar	2ed86760d7	test: err for party should be in AR/AP report	2022-12-18 12:40:07 +05:30
ruthra kumar	b09eade3e4	fix: ERR journals reported in AR/AP ... Exchange Rate Revaluation on Receivable/Payable will included in AR/AP report	2022-12-18 06:38:23 +05:30
Deepesh Garg	6238fd9d9e	Merge pull request #33341 from deepeshgarg007/tds_tcs_cost_center ... fix: Cost Center for tax withholding invoices	2022-12-17 19:24:34 +05:30
sonali	05b6fce03d	feat:filters on bank reconciliation ... Added date filters on bank transactions, payment entries and journal entries and sorted list as per date in ascending order.	2022-12-17 17:15:28 +05:30
Deepesh Garg	2a4eec245a	Merge pull request #33371 from deepeshgarg007/coa_import_srbnb ... fix: Unable to import COA through importer	2022-12-17 16:42:37 +05:30
Deepesh Garg	3b66920342	fix: Unable to import COA through importer	2022-12-16 19:22:29 +05:30
Deepesh Garg	6bb22c703a	Merge pull request #33275 from pps190/fix-pe-exchange-rate-precision ... fix: use highest precision for exchange rate.	2022-12-16 15:43:36 +05:30
Deepesh Garg	b76129c1dd	Merge pull request #33286 from artykbasar/develop ... Subscription Cost center value is fixed to Default value(Bug fix)	2022-12-16 14:44:51 +05:30
sonali	408c89df03	Feat:Filter on Payment Entries and Journal Entries ... Applying filters on Payement entries and Journal Entries as per reference date and posting date	2022-12-15 18:09:57 +05:30
ruthra kumar	d126c8030f	Merge pull request #33335 from ruthra-kumar/cost_center_issue_on_reconciliation_tool ... fix: paid invoices shows up as outstanding when 'cost_center' filter is applied	2022-12-15 15:02:18 +05:30
Anand Baburajan	246d3b4075	Merge branch 'develop' into asset_depreciation_schedule	2022-12-15 14:51:16 +05:30
ruthra kumar	a998a8a2da	test: cost center should not affect outstanding calculation	2022-12-15 14:28:33 +05:30
Deepesh Garg	dc178984ae	fix: Payment Request flow fixes from Order to Payment Entry	2022-12-15 14:15:20 +05:30
Deepesh Garg	3a8a467edb	Merge pull request #33329 from Gokulnath17/Gokulnath_dev ... fix: in gross profit report	2022-12-15 12:01:39 +05:30
Deepesh Garg	076527bb88	Merge pull request #33305 from barredterra/incoterm-named-place ... feat: incoterm named place	2022-12-15 11:59:54 +05:30
Gokulnath	f73976946e	Merge branch 'develop' into Gokulnath_dev	2022-12-15 10:22:49 +05:30
Deepesh Garg	b7e9942681	Merge pull request #33309 from barredterra/refactor-validate_payment_against_negative_invoice ... refactor: translatable strings and guard clause	2022-12-15 09:21:16 +05:30
Deepesh Garg	26277cfcf3	chore: resolve errors in test	2022-12-14 21:22:48 +05:30
Deepesh Garg	973ef33eb5	fix: Cost Center for tax withholding invoices	2022-12-14 20:41:00 +05:30
ruthra kumar	8eb93004f7	fix: cost_center filter fix for 'Get Outstanding Invoice' in PE	2022-12-14 16:16:22 +05:30
ruthra kumar	6d9d730759	fix: cost_center filter gives incorrect output ... filtering on cost center gives invoices that are reconciled as having outstanding	2022-12-14 16:05:15 +05:30
Gokulnath17	41fc3be339	fixes in gross profit report	2022-12-14 10:46:11 +05:30
Anand Baburajan	8534390627	Merge branch 'develop' into asset_depreciation_schedule	2022-12-13 20:49:06 +05:30
anandbaburajan	22ef342ac7	chore: fixing all tests	2022-12-13 20:48:34 +05:30
anandbaburajan	df134c7c5b	chore: fixing some tests	2022-12-13 16:26:33 +05:30
ruthra kumar	3db446e35a	Merge pull request #33313 from nabinhait/tax_detail_report_perm_issue ... fix: Permission issue in Tax Detail report	2022-12-13 14:27:08 +05:30
Nabin Hait	aa787e4030	fix: Permission issue in Tax Detail report	2022-12-13 13:16:24 +05:30
ruthra kumar	2175784142	Merge pull request #33303 from ruthra-kumar/incorrect_balance_on_consolidate_balance_sheet ... fix: incorrect balance on parent company on consolidate Balance sheet due to key mismatch	2022-12-13 09:04:13 +05:30
barredterra	f20370c5ef	refactor: translatable strings and guard clause	2022-12-13 02:36:12 +01:00
barredterra	e057e1dfe7	feat: incoterm named place	2022-12-12 18:49:47 +01:00
ruthra kumar	7b3316dc31	fix: incorrect balance on parent company due to key mismatch	2022-12-12 20:15:59 +05:30
anandbaburajan	b997d1eb87	chore: add some validation, shorten some function names	2022-12-12 17:25:38 +05:30
Anand Baburajan	f8cd424559	Merge branch 'develop' into asset_depreciation_schedule	2022-12-12 16:36:59 +05:30
anandbaburajan	ec6505d747	chore: fix some bugs, refactor some functions, add proper notes	2022-12-12 16:35:30 +05:30
Ankush Menat	915e0347b0	chore!: remove activity log feeds (#33294) ... - This contains little to no information and practically no one uses this. - Also causes a lot of problem by adding way too many feeds in activity log to the point where activity page doesn't even load.	2022-12-12 15:14:30 +05:30
Ankush Menat	593626f502	perf: add indexes on payment entry reference (#33288) ... Adds index on: 1. reference doctype 2. reference name *Why not composite index?* There are three type of queries on this doctype - filtering ref_doctype - doctype index helps here - filtering ref_name - name index helps here - filtering both - name index helps here too. Since it has sufficiently high cardinality. Composite index wont help in case where ref_doctype isn't specfied. [skip ci]	2022-12-12 12:58:11 +05:30
artykbasar	d512919f5c	Subscription Cost center value is fixed to Default value(Bug fix) ... self.cost_center field value keeps changing to erpnext.get_default_cost_center(self.get("company")) after validation of this doctype. This overrides the user input. simple fix, it will first check if the field is empty, if empty then puts the company's default cost center value if not then user input will be saved.	2022-12-11 08:51:34 +00:00
anandbaburajan	90e1b9cb3d	chore: fix asset depr schedule notes	2022-12-09 16:18:40 +05:30
anandbaburajan	16365bfca3	chore: more refactoring	2022-12-09 14:04:00 +05:30
Devin Slauenwhite	2010b1b6e8	fix: use highest precision for exchange rate.	2022-12-08 16:26:07 -05:00
anandbaburajan	1fd73af744	chore: refactor some reports	2022-12-09 00:28:34 +05:30
Deepesh Garg	6db52930d8	Merge branch 'develop' of https://github.com/frappe/erpnext into buying_selling_pricing_rule	2022-12-08 18:05:05 +05:30
Deepesh Garg	6192af5cf0	chore: Update tests	2022-12-08 18:04:40 +05:30
sonali	8e7c8a6482	Update bank_reconciliation_tool.json ... Adding fields in bank reconciliation tool	2022-12-08 17:23:08 +05:30
Ankush Menat	0b86b1baca	refactor: make payments app a soft dependency (#33245) ... refactor: make payment app a soft dependency	2022-12-08 16:40:13 +05:30
sonali	447272aa4d	Filters on Bank Reconciliation ... Applying date filter on transactions and all the bank entries and also gives the filter the bank entries as per reference date. Sorted all transactions and entries as per date in ascending order. Also added posting date columns in all bank entries and default checkbox tick of journal entry, hide the sales invoice and purchase invoice checkbox.	2022-12-08 16:11:53 +05:30
sonali	e5a1189bec	Update bank_reconciliation_tool.py ... Applying date filter on transactions and all the bank entries and also gives the filter the bank entries as per reference date. Sorted all transactions and entries as per date in ascending order. Also added posting date columns in all bank entries and default checkbox tick of journal entry, hide the sales invoice and purchase invoice checkbox.	2022-12-08 13:29:28 +05:30
anandbaburajan	18fc2b5695	chore: fix bug in unlink_asset_reference	2022-12-06 23:34:56 +05:30
Deepesh Garg	c1a82dc9e5	Merge pull request #33191 from ruthra-kumar/key_error_in_profit_loss_report ... fix: key error while filtering on date range and reporting on foreign currency	2022-12-06 15:42:53 +05:30
ruthra kumar	a6794c3606	fix: key error on p/l and balance sheet reports on foreign currency	2022-12-06 13:48:46 +05:30
ruthra kumar	19db7e2989	fix: replace sql code with fields list in get_cached_value	2022-12-06 13:48:46 +05:30
Deepesh Garg	3aa6f97420	Merge pull request #33216 from barredterra/validate-accounts-dates ... refactor: validate dates in accounts module	2022-12-06 12:33:01 +05:30
Deepesh Garg	921f8edde8	Merge pull request #33219 from deepeshgarg007/internal_transfer_editable_rate ... fix: Allow item rate updates for non-stock invoices	2022-12-06 09:12:24 +05:30
Raffael Meyer	8301d3b13f	Merge branch 'develop' into key_error_in_profit_loss_report	2022-12-06 02:08:47 +01:00
barredterra	a26a29f33b	fix: incorrect dates in test records	2022-12-05 19:49:05 +01:00
Raffael Meyer	e526a0e282	Merge branch 'develop' into validate-accounts-dates	2022-12-05 19:37:54 +01:00
ruthra kumar	3814db02eb	fix: data import mandatory account_head, charge_type	2022-12-05 16:24:05 +05:30
Deepesh Garg	5f821b93a5	chore: Add POS Invoices	2022-12-05 15:43:03 +05:30
Deepesh Garg	ef9d126254	fix: Allow item rate udpates for non-stock invoices	2022-12-05 10:17:19 +05:30
barredterra	eb66b749b2	refactor: validate dates in accounts module	2022-12-04 14:41:21 +01:00
Deepesh Garg	b741ae143c	fix: Reapply pricing rule on qty change	2022-12-02 17:14:06 +05:30
Deepesh Garg	f54838ab56	fix: Buying and selling check in pricing rule	2022-12-01 21:23:17 +05:30
anandbaburajan	f20238fa3e	chore: use make_new_active_asset_depr_schedules_and_cancel_current_ones instead of prepare_depreciation_data	2022-12-01 15:15:32 +05:30
ruthra kumar	9b8d6fe411	fix: key error while filtering on date range and different currency	2022-12-01 13:38:41 +05:30
Deepesh Garg	3eb1ed19a1	fix: Tax withholding net total for PI in reports	2022-11-29 13:10:31 +05:30
Deepesh Garg	8253f4379f	Merge pull request #33098 from ssiyad/fix/pos/warehouse_selection ... fix(pos): warehouse selection	2022-11-29 10:15:31 +05:30
Deepesh Garg	bdb15c3331	Merge pull request #33112 from ssiyad/fix/pos/customer_group_filter ... fix(pos): filter on customer groups	2022-11-29 09:55:56 +05:30
Deepesh Garg	8112493c3c	Merge pull request #33138 from deepeshgarg007/bank_reco_button_fix ... fix(ux): Action buttons in Bank Reconciliation	2022-11-29 09:23:21 +05:30
Deepesh Garg	6ebe8ad60d	fix(ux): Action buttons in Bank Reconciliation	2022-11-28 17:37:41 +05:30
Deepesh Garg	f6126069ee	Merge pull request #33129 from deepeshgarg007/accounts_settings_fix ... chore: Supplier invoice no field description	2022-11-28 13:05:12 +05:30
Deepesh Garg	4f2ece34df	chore: Supplier invoice no field description	2022-11-27 21:50:26 +05:30
Raffael Meyer	905a50cbb2	Merge branch 'develop' into incoterms	2022-11-25 16:50:55 +01:00
anandbaburajan	7d09440579	chore: more refactoring	2022-11-25 16:49:44 +05:30
Sabu Siyad	cc63415887	fix(pos): filter on customer groups ... Signed-off-by: Sabu Siyad <hello@ssiyad.com>	2022-11-25 15:10:01 +05:30
anandbaburajan	4e63ba3ac6	chore: refactor schedules in journal_entry	2022-11-24 17:39:11 +05:30
Sabu Siyad	4ad0e2ed7e	feat(pos): invoice: fitler warehouse by company ... Signed-off-by: Sabu Siyad <hello@ssiyad.com>	2022-11-24 16:11:26 +05:30
Sabu Siyad	95a620a30d	fix(pos): warehouse should be in company ... Signed-off-by: Sabu Siyad <hello@ssiyad.com>	2022-11-24 15:40:05 +05:30
Deepesh Garg	3724f2287c	Merge pull request #33092 from deepeshgarg007/debit_credit_issue ... fix: Debit and Credit not equal while submitting PI containing asset item	2022-11-24 14:42:56 +05:30
Deepesh Garg	dc8d635120	fix: Debit and Credit not equal while submitting PI containing asset item	2022-11-23 20:29:12 +05:30
Deepesh Garg	7a7b8c2284	Merge pull request #32836 from resilient-tech/perf-fix-get-cached-value-for-accounts ... perf: use `get_cached_value` instead of `db.get_value` in accounts module	2022-11-23 18:20:48 +05:30
Deepesh Garg	a3c81da890	Merge pull request #33062 from nabinhait/pcv-rounding-issue ... fix: create rounding gl entry for PCV during gle post processing	2022-11-23 10:36:04 +05:30
Deepesh Garg	06c9c679e6	Merge pull request #33063 from niralisatapara/tds_purchase_order ... feat: item wise tds in purchase order	2022-11-23 09:52:00 +05:30
Deepesh Garg	34e775136d	Merge pull request #33069 from deepeshgarg007/jv_filter ... fix: Remove unnecessary filters from Journal Entry	2022-11-22 20:15:12 +05:30
Deepesh Garg	eb74362263	Merge pull request #33068 from deepeshgarg007/payment_button_visibility ... fix: Don't show payment button for invoices on hold	2022-11-22 20:14:41 +05:30
niralisatapara	46e8cdf31a	feat: item wise tds calculation for purchase order.	2022-11-22 14:15:36 +05:30
Deepesh Garg	e96be712b8	chore: Rearrange supplier invoice section in Purchase Invoice	2022-11-22 12:50:00 +05:30
Deepesh Garg	cd88a53533	fix: Remove unnecessary filters from Journal Entry	2022-11-21 22:21:03 +05:30
Deepesh Garg	1b9e83251f	fix: Don't show payment button for invoices on hold	2022-11-21 21:50:55 +05:30
Nabin Hait	022d8d5d79	fix: create rounding gl entry for PCV during gle post processing	2022-11-21 15:16:53 +05:30
Deepesh Garg	15e74c5d7b	fix: Viewing account ledger from party master	2022-11-20 20:30:24 +05:30
Deepesh Garg	26dcde2931	Merge pull request #32999 from ruthra-kumar/exchange_rate_reval_company_currency ... fix: incorrect currency in Exchange rate revaluation	2022-11-19 18:30:03 +05:30
Deepesh Garg	f96c66bbc0	Merge pull request #33032 from deepeshgarg007/dimension_report_filtering ... fix: Accounting Dimension filtering for Sales and Purchase Report	2022-11-19 18:19:37 +05:30
gavin	dd2493a541	fix(realtime): Restrict updates to only last modified or current user (#33034)	2022-11-18 17:17:54 +05:30
ruthra kumar	5caaccc94b	fix: always send account currency in response	2022-11-18 17:10:39 +05:30
ruthra kumar	68b04e2577	fix: incorrect currency in Exchange rate revaluation	2022-11-18 17:10:39 +05:30
Deepesh Garg	df096688f7	Merge pull request #33014 from deepeshgarg007/multi_invoice_payment ... fix: Bulk payment generation against invoices	2022-11-18 15:10:35 +05:30
Deepesh Garg	8b394afaa9	fix: Accounting Dimension filtering for Sales and Purchase Report	2022-11-18 15:07:12 +05:30
barredterra	77105306f2	feat: add incoterm to purchasing transactions	2022-11-17 22:18:26 +01:00
barredterra	029f22c549	feat: add incoterm to sales transactions	2022-11-17 22:17:59 +01:00
Sagar Vora	48413b0778	fix: reduce function call	2022-11-18 02:22:43 +05:30
Sagar Vora	66ac65482d	fix: add missing comma	2022-11-18 02:16:56 +05:30
Sagar Vora	8ae58ed427	fix: use doc_before_save and other changes	2022-11-18 02:13:16 +05:30
Daizy Modi	fdfe5cbf93	fix: use get_cached_value to avoid db call with db.exists	2022-11-17 19:14:10 +05:30
Daizy Modi	678a4c33da	fix: resolved merge conflicts	2022-11-17 19:13:10 +05:30
Sagar Sharma	29a8d9a9b4	Merge branch 'develop' into internal_transfer	2022-11-17 16:42:18 +05:30
Deepesh Garg	2dfe849c7d	fix: Bulk payment generation against invoices	2022-11-17 15:53:56 +05:30
Deepesh Garg	3a523b56bf	Merge pull request #32983 from deepeshgarg007/journal_entry_template_fix ... fix: Opening journal entry templates	2022-11-16 20:41:07 +05:30
Vishal	71412f6877	fix: Internal Transfer Material Request cycle and tracking fixed till purchase receipt	2022-11-16 13:53:21 +05:30
Nabin Hait	b89b07d0ff	fix: Validate for deferred revenue only if sales invoice needs repost	2022-11-16 12:16:23 +05:30
Deepesh Garg	33b61aef5a	fix: Opening journal entry templates	2022-11-16 11:57:17 +05:30
Gavin D'souza	35088bb4c4	chore(payment_entry): Remove dead validations ... (cherry picked from commit e1ecc9a81973d20084f5a053d8d0155354079b2e)	2022-11-15 08:34:08 +00:00
Deepesh Garg	a0d9e1bd57	Merge pull request #32962 from deepeshgarg007/return_write_off ... fix: Write Off section visibility for non POS Invoices	2022-11-15 13:01:06 +05:30
Deepesh Garg	9f5d613c78	fix: Write Off section visibility for non POS Invoices	2022-11-15 09:45:39 +05:30
Deepesh Garg	a1a992b0dd	Merge pull request #32956 from deepeshgarg007/acc_dimension_filter_label ... fix: Label for applicable dimension table	2022-11-15 09:24:30 +05:30
Deepesh Garg	8c13f70fc5	fix: Label for applicable dimension table	2022-11-14 20:39:40 +05:30
Sagar Vora	b06345af46	fix: check type for reference name	2022-11-13 19:58:49 +05:30
Deepesh Garg	a2260a3dc2	Merge branch 'develop' into bg_query	2022-11-13 19:47:43 +05:30
Deepesh Garg	6b93b3f12a	Merge pull request #32866 from ruthra-kumar/gross_profit_fix_buying_amount ... fix: incorrect buying amount on Gross Profit	2022-11-13 19:15:03 +05:30
Deepesh Garg	4b9921782b	chore: Remove qb doc reference	2022-11-13 18:48:32 +05:30
Deepesh Garg	42a59d5c17	chore: Remove raw SQL query	2022-11-12 17:32:04 +05:30
ruthra kumar	2c8b0b17a7	test: buying amount of invoices ... 1. Invoice with unset `update_stock`, with and without Delivery Notes	2022-11-11 08:33:54 +05:30
ruthra kumar	e4d16c31da	fix: GP incorrect buying amount if no upd on SI and Delivery Note	2022-11-11 08:33:48 +05:30
rohitwaghchaure	8ae9c1d192	Merge pull request #32895 from rohitwaghchaure/fixed-performance-issue-for-purchase-receipt ... fix: Purchase Receipt timeout error	2022-11-10 22:41:54 +05:30
Deepesh Garg	f4920d6475	Merge pull request #32880 from ernestoruiz89/patch-7 ... fix: add translate function to valitate company msg in chart of accounts importer	2022-11-10 20:07:52 +05:30
Deepesh Garg	e559fea8ff	Merge pull request #32921 from deepeshgarg007/netvalues_psoa ... feat: Add net value filter on PSOA	2022-11-10 19:51:56 +05:30
Deepesh Garg	51521fc19f	feat: Add net value filter on PSOA	2022-11-10 17:48:25 +05:30
Ernesto Ruiz	a007f1da9d	Merge branch 'develop' into patch-7	2022-11-09 15:53:36 -06:00
Ankush Menat	7e1742956c	refactor: Remove usage of deprecated methods (#32914) ... Warn: Just used regex to replace all usage. ```regex s/frappe.db.set(\(.*\),\(.*\),\(.*\))/\1.db_set(\2, \3)/g ``` Required after: https://github.com/frappe/frappe/pull/18815	2022-11-09 20:09:06 +05:30
Deepesh Garg	ff51f3b95e	Merge branch 'develop' into patch-7	2022-11-09 14:34:39 +05:30
Deepesh Garg	5f1b226362	Merge pull request #32742 from ruthra-kumar/ple_repost ... feat: Tool to repost PLE manually	2022-11-09 14:26:37 +05:30
Rohit Waghchaure	4082149f0e	fix: Purchase Receipt timeout error	2022-11-08 20:59:20 +05:30
ruthra kumar	0448c0fa36	feat: Repost Payment Ledger entries for vouchers ... primarily intended to manually correct PLE entries for vouchers affected by Item Value repost-https://github.com/frappe/erpnext/pull/32567	2022-11-08 07:47:47 +05:30
Ernesto Ruiz	637c08d189	fix: add translate function to valitate company msg in chart of accounts importer	2022-11-07 09:22:38 -06:00
Deepesh Garg	e29f756146	chore: Validate for deferred revenue invoices	2022-11-07 16:42:45 +05:30
Deepesh Garg	5fe55176ec	chore: Enable no-copy for repost required field	2022-11-07 16:42:12 +05:30
ruthra kumar	9209ec59c2	refactor: split delete gl utility function into two	2022-11-06 11:39:44 +05:30
Deepesh Garg	be0f6b3e6e	Merge branch 'develop' of https://github.com/frappe/erpnext into editable_inovice	2022-11-05 16:35:55 +05:30
Deepesh Garg	0966867c08	chore: Reset repost_required_flag on cancel	2022-11-05 16:35:43 +05:30
Deepesh Garg	cbf82872fb	Merge pull request #32646 from niralisatapara/tds_purchase_invoice ... feat: Item Wise TDS Calculation	2022-11-04 13:08:10 +05:30
Deepesh Garg	159b511d16	Merge pull request #32809 from monolithon/develop ... feat: Optional Hungarian COA for microenterprises	2022-11-04 13:00:13 +05:30
rohitwaghchaure	441f082fcb	Merge pull request #32799 from rohitwaghchaure/fix-scan-qrcode-functionality ... fix: Scan Barcode UX	2022-11-04 11:04:40 +05:30
Ernesto Ruiz	ad0dd693ac	chore: add translation function to Bank Reconciliation Tool related files ... chore: add translation function to Bank Reconciliation Tool related files	2022-11-04 01:06:01 +05:30
Deepesh Garg	e2ad785422	chore: Hide tax withholding net total field	2022-11-04 01:03:20 +05:30
Daizy Modi	010bd9c558	fix: remove cache param	2022-11-03 14:36:48 +05:30
Daizy Modi	27df455b98	perf: use get_cached_value instead of db.get_value in accounts module	2022-11-03 13:38:48 +05:30
niralisatapara	12456f9850	feat: item wise tds calculation	2022-11-03 10:46:30 +05:30
Deepesh Garg	8581b7820d	Merge pull request #32713 from ernestoruiz89/patch-9 ... fix: add missing translation function on report related documents	2022-11-03 09:46:43 +05:30
Rohit Waghchaure	e1f9ba78e5	fix: Scan Barcode UX	2022-11-02 15:37:46 +05:30
niralisatapara	ea387937d0	feat: item wise tds calculation	2022-11-02 12:30:58 +05:30
niralisatapara	2ca0cf6fc4	feat: item wise tds calculation	2022-11-02 12:19:51 +05:30
niralisatapara	4aff2a32ad	Merge branch 'develop' of https://github.com/niralisatapara/erpnext into develop	2022-11-02 11:21:02 +05:30
Muvuk	579afed460	feat: Optional Hungarian COA for microenterprises #32688	2022-11-01 19:36:42 +01:00
Deepesh Garg	e0a705afe7	Merge pull request #32779 from deepeshgarg007/sales_invoice_default_mop ... fix: Mode of payment for returns in POS Sales Invoice	2022-11-01 21:28:54 +05:30
Deepesh Garg	62ae329be3	Merge pull request #32801 from deepeshgarg007/purchase_invoice_cancel_amend ... fix: Issues while cancel/amending Purchase Invoice with TDS enabled	2022-11-01 20:47:55 +05:30
Deepesh Garg	a4f7079270	Merge branch 'develop' of https://github.com/frappe/erpnext into sales_invoice_default_mop	2022-11-01 20:17:43 +05:30
Deepesh Garg	5b74161195	chore: Update tests	2022-11-01 20:17:34 +05:30
Deepesh Garg	f7c9258770	fix: Issues while cancel/amending Purchase Invoice with TDS enabled	2022-11-01 19:54:41 +05:30
Dany Robert	1d83fb20d6	feat(pricing rule): free qty rounding and recursion qty (#32577) ... Option to specify recursion start qty and repeating qty Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>	2022-11-01 16:39:32 +05:30
Maharshi Patel	cc6dfd91cf	Merge branch 'develop' into fix-pricing-rule-item-group-uom	2022-11-01 15:06:22 +05:30
Maharshi Patel	935f31eff9	fix: test cases added for item group	2022-11-01 12:55:46 +05:30
Deepesh Garg	5b150abdcb	Merge pull request #32768 from deepeshgarg007/cc_main_allocation ... fix: Budget validation for main cost center	2022-10-31 22:18:50 +05:30
Deepesh Garg	4e26d42d17	fix: Budget validation for main cost center	2022-10-30 19:33:27 +05:30
Deepesh Garg	49343e9f68	chore: column name	2022-10-28 22:03:09 +05:30
Deepesh Garg	323e45374f	Merge pull request #32620 from rtdany10/psa_pdf_issue ... feat: page break in SoA pdf	2022-10-28 21:00:01 +05:30
Deepesh Garg	aee4fe9f7b	Merge pull request #32722 from deepeshgarg007/reference_due_date ... fix: Reference due date field type in Journal Entry Accounts table	2022-10-28 20:55:36 +05:30
Deepesh Garg	50652be6e3	Merge branch 'develop' of https://github.com/frappe/erpnext into editable_inovice	2022-10-28 20:48:26 +05:30
Deepesh Garg	9ac1c4bc4f	Merge pull request #32699 from deepeshgarg007/general_ledeger_print ... fix: Curreny in SOA print for multi-currency party	2022-10-28 20:41:49 +05:30
Deepesh Garg	c3275c3f3c	Merge pull request #32692 from deepeshgarg007/opening_invoice_creation_tool_ux ... fix: Clear invoice table post importing invoices	2022-10-28 20:40:52 +05:30
Deepesh Garg	d9eda45b0b	chore: Minor updates	2022-10-28 20:19:13 +05:30
Deepesh Garg	fb41bdd700	Merge branch 'develop' of https://github.com/frappe/erpnext into tds_purchase_invoice	2022-10-28 17:18:11 +05:30
Deepesh Garg	09fa2298ba	Merge pull request #32716 from deepeshgarg007/bank_account_filter ... fix: Company bank account filter in Bank Clearance	2022-10-28 12:53:53 +05:30
Deepesh Garg	16959c0a8c	Merge pull request #32717 from deepeshgarg007/discount_section_collapse ... fix: Add condition for discount section collapse	2022-10-28 11:24:25 +05:30
Dany Robert	de20dfe459	chore: remove commented line	2022-10-27 09:33:49 +05:30
Deepesh Garg	a5a73ba857	fix: Filter fixes in Accounts Payable report	2022-10-26 21:18:50 +05:30
Deepesh Garg	e7caa48e2f	fix: Reference due date field type in Journal Entry Accounts table	2022-10-26 20:21:36 +05:30
Deepesh Garg	4cd65027c4	fix: Add condition for discount section collapse	2022-10-26 16:48:24 +05:30
Deepesh Garg	f9f78c1086	fix: Company bank account filter in Bank Clearance	2022-10-26 11:02:14 +05:30
Ernesto Ruiz	2012bdf4bd	fix: add translate function to string on budget_variance_report.js to match the variance word translated	2022-10-25 22:24:33 -06:00
Ernesto Ruiz	48ed6381b3	fix: add translate function to name of chart labels in budget_variance_report.py	2022-10-25 22:18:47 -06:00
Ernesto Ruiz	a671652ab2	fix: refactor code for better translatable string	2022-10-25 22:00:46 -06:00
Ernesto Ruiz	a963618b08	fix: add translate function to name of chart labels in deferred_revenue_and_expense.py	2022-10-25 21:54:55 -06:00
niralisatapara	397e3b1ade	feat: item wise tds calculation ... item wise tds calculation	2022-10-25 15:09:59 +05:30
Deepesh Garg	a18a715bb4	chore: Use account currency as fallback	2022-10-24 19:13:02 +05:30
Deepesh Garg	49ee873655	fix: Curreny in SOA print for multi-currency party	2022-10-24 17:34:12 +05:30
Deepesh Garg	267e7c3a90	fix: Clear invoice table post importing invoices	2022-10-24 11:45:24 +05:30
Deepesh Garg	1a980123a2	chore: Update tests	2022-10-24 10:08:55 +05:30
Deepesh Garg	ed98015a56	test: Add unit tests	2022-10-23 23:03:50 +05:30
Deepesh Garg	1105e52031	chore: Update allow on submit fields	2022-10-23 22:55:08 +05:30
ruthra kumar	eedf7e44a2	Merge pull request #32651 from ruthra-kumar/report_payment_ledger ... feat: Payment Ledger report	2022-10-21 11:25:24 +05:30
Deepesh Garg	1ca472cc8a	chore: Linting issues	2022-10-20 12:09:42 +05:30
Deepesh Garg	b4d008b743	Merge branch 'develop' into subscription-plan-fix-months	2022-10-20 12:07:44 +05:30
Deepesh Garg	796f2d3c09	fix: Billing Address for inter-company purchase docs	2022-10-19 23:50:39 +05:30
ruthra kumar	6e55b419a6	test: invoice outstandings and payments	2022-10-19 21:49:13 +05:30
ruthra kumar	8f60f0a0cf	feat: Basic Payment Ledger report	2022-10-19 21:49:08 +05:30
Deepesh Garg	430492152f	fix: Advance paid amount in orders (#32642)	2022-10-19 15:37:13 +05:30
niralisatapara	21d09c5bf2	Item Wise TDS Calculation	2022-10-19 14:33:02 +05:30
Maharshi Patel	d100e68fd0	Merge branch 'frappe:develop' into fix-pricing-rule-item-group-uom	2022-10-19 11:08:05 +05:30
ruthra kumar	f844097f8e	Merge pull request #32635 from ruthra-kumar/fix_tax_or_charges_acc_updating_voucher_outstanding ... fix: Integrity Error on PLE while submitting sales invoice	2022-10-19 09:43:24 +05:30
Maharshi Patel	96b4211ea1	fix: pricing rule for non stock UOM and conversions ... * fix: pricing rule for non stock UOM and conversions	2022-10-18 22:26:11 +05:30
ruthra kumar	8f42e7f703	test: use payable account in tax and to trigger party validation	2022-10-18 17:27:46 +05:30
ruthra kumar	43b80683eb	fix: party type and party mandatory on updating outstanding	2022-10-18 09:33:37 +05:30
Deepesh Garg	42e4c37f15	chore: Break into smaller functions	2022-10-17 20:09:07 +05:30
Deepesh Garg	32117c030a	Merge pull request #32622 from deepeshgarg007/ignore_pi_reference ... fix: Ignore linked purchase invoice on cancel	2022-10-17 19:38:26 +05:30
Dany Robert	9df9915600	fix: query condition change	2022-10-17 15:54:46 +02:00
Deepesh Garg	faadf78332	fix: Ignore linked purchase invoice on cancel	2022-10-17 18:50:54 +05:30
ruthra kumar	9b50221bf0	refactor: split ple creation function into two ... refactor create_payment_ledger_entry function into 2. one for generating ple map and one for DB entry creation	2022-10-17 18:02:52 +05:30
Dany Robert	2665d7d293	feat: page break in SoA pdf	2022-10-17 14:29:03 +02:00
Deepesh Garg	e626107d3d	chore: Update allow on submit for Sales Invoice fields	2022-10-17 16:48:13 +05:30
Deepesh Garg	dc3fe85921	chore: Remove HRMS related code (#32607) ... Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2022-10-17 11:37:50 +05:30
Deepesh Garg	30da6ab2c1	feat: Editable Sales Invoice	2022-10-17 11:10:38 +05:30
ruthra kumar	2d0217abd5	Merge pull request #32567 from ruthra-kumar/remove_duplicate_ple_on_item_value_repost ... fix: deduplicate Payment Ledger on Item value repost	2022-10-13 14:01:59 +05:30
Maharshi Patel	edc93ab6aa	fix: pricing rule item group uom ... Handle use case where pricing rule is applied on item group and user have selected UOM. pricing rule was applied on all UOM's even after specifying UOM. i have added condition in sql to fix this.	2022-10-13 12:00:30 +05:30
Deepesh Garg	43c2bd1351	Merge pull request #32272 from deepeshgarg007/internal_transfer_precision_fixes ... fix: Incoming rate precision fixes for intra company transfer	2022-10-12 16:23:16 +05:30
Rohit Waghchaure	98bf8e1304	fix: test case	2022-10-12 15:45:36 +05:30
Rohit Waghchaure	683a47f7a1	fix: consider sales rate as incoming rate for transit warehouse in purchase flow	2022-10-12 15:44:53 +05:30
ruthra kumar	65992304bc	fix: delete old ple's on item value repost	2022-10-12 15:34:50 +05:30
Deepesh Garg	c8d2181498	chore: Increase precision for other doc fields	2022-10-12 14:17:55 +05:30
Deepesh Garg	38b34f2a45	Merge pull request #32408 from nabinhait/sales-purchase-tab-break ... feat: Tab Breaks in all Sales and Purchase cycle transactions	2022-10-11 16:02:45 +05:30
Deepesh Garg	dc20b21fb5	test: Internal tranfer precision loss test	2022-10-11 14:54:27 +05:30
Deepesh Garg	b31c3bd35d	chore: Increase incoming_rate field precision to 6	2022-10-11 14:53:26 +05:30
ruthra kumar	633c2a289e	Merge pull request #32557 from ruthra-kumar/value_error_on_pos_save ... fix: Value error on validation of POS invoices with Serial Nos	2022-10-11 14:42:47 +05:30
Nabin Hait	e71c417f7e	fix: minor cleanup	2022-10-11 13:21:27 +05:30
Nabin Hait	5389a35798	fix: more fields reordering related to Tab Break	2022-10-11 13:21:07 +05:30
Nabin Hait	aaf3c2b329	feat: Tab Break in Purchase Invoice	2022-10-11 13:20:41 +05:30
Nabin Hait	f6613e1e4c	feat: Tab Break in Sales Order, Delivery Note, Sales Invoice and Purchase Order	2022-10-11 13:18:21 +05:30
ruthra kumar	9e2bd10d03	test: value error on serial no validation on pos	2022-10-11 12:54:50 +05:30
Deepesh Garg	b99b2b75ca	Merge pull request #32477 from rasos/patch-1 ... Austria chart of accounts update	2022-10-11 10:20:49 +05:30
Anand Baburajan	ba754825b9	Merge branch 'develop' into fix_budget_autoname	2022-10-10 23:17:18 +05:30
anandbaburajan	e4d7d8c42d	fix: use naming_series in budget	2022-10-10 23:04:34 +05:30
codezart	2d30b36cca	fix: number of months subscription plan	2022-10-10 11:24:42 -04:00
ruthra kumar	65194efa97	Merge pull request #32548 from ruthra-kumar/suppress_linked_doc_valdiation_on_delete ... fix: allow deletion of cancelled Invoices once payments are unlinked	2022-10-10 16:41:07 +05:30
ruthra kumar	143f905838	test: update ple on payment unlink for SI's and SO's	2022-10-10 15:57:38 +05:30
ruthra kumar	537d953f4c	fix: unlink payment on invoice cancellation	2022-10-10 10:17:19 +05:30
Deepesh Garg	17201facf1	Merge pull request #32522 from deepeshgarg007/tax_withholding_related_fixes ... fix: Tax withholding related fixes	2022-10-07 16:32:18 +05:30
Deepesh Garg	781d160c68	fix: Do not add tax withheld vouchers post tax withheding in one document	2022-10-07 14:22:40 +05:30
Deepesh Garg	abf5b6be3e	fix: Tax withholding related fixes	2022-10-07 14:04:36 +05:30
Ankush Menat	8d1db0ea3d	fix: single column indexes (#32425) ... refactor: move single column indexes to doctypes	2022-10-06 11:28:26 +05:30
Dany Robert	c35adcf5a1	feat(JE): trigger account field when fetched from template ... Closes #32409	2022-10-03 19:31:20 +05:30
Roland	7d84cca431	Austria chart of accounts update ... improved mapping of VAT accounts	2022-10-03 14:13:27 +02:00
niralisatapara	e758a753f8	Item Wise TDS Calculation ... For calculating Item wise TDS in Purchase Invoice.	2022-10-03 16:39:35 +05:30
rohitwaghchaure	1c5ae80029	Merge pull request #32466 from rohitwaghchaure/allow-to-return-expired-batches ... fix: not able to return sold expired batches	2022-10-03 13:14:59 +05:30
Deepesh Garg	8c23b19da1	Merge pull request #32394 from maharshivpatel/fix-payment-request-fetch-swift-number ... fix: fetch swift number in payment request from bank doctype	2022-10-03 12:55:02 +05:30
Rohit Waghchaure	0b1727cf79	fix: not able to return sold expired batches	2022-10-03 12:06:32 +05:30
Shridhar Patil	69efd2ee24	fix: fixes query builder order by issue in postgres (#32441) ... * fix: fixes query builder order by issue in postgres * fix: linter	2022-10-03 11:07:24 +05:30
Deepesh Garg	1c560a967c	Merge branch 'develop' into fix-payment-request-fetch-swift-number	2022-10-01 16:14:27 +05:30
Maharshi Patel	62c5b28690	fix: typo in sales_register's filter mode_of_payment (#32371) ... * fix: typo in sales_register's filter mode_of_payment	2022-10-01 11:04:53 +05:30
Maharshi Patel	dc8d49260c	fix: payment request make bank field Link instead of Read Only	2022-09-30 16:22:57 +05:30
Deepesh Garg	cceb29c005	Merge pull request #32412 from deepeshgarg007/tcs_deduction_issue ... fix: Incorrect TCS amount deducted in Sales Invoice	2022-09-30 16:05:30 +05:30
Maharshi Patel	9245d3b5cd	Revert "fix: fetch swift_number in payment_request" ... This reverts commit f42a8e4e03.	2022-09-30 15:35:12 +05:30
Sagar Sharma	b1edd911f9	Merge branch 'develop' into remove_code_for_buying_side_discount_accounting	2022-09-30 12:39:29 +05:30
Deepesh Garg	bff3cd9068	chore: Remove print statements	2022-09-28 20:13:24 +05:30
Deepesh Garg	08443c6421	fix: Incorrect TCS amount deducted in Sales Invoice	2022-09-28 20:11:00 +05:30
Maharshi Patel	f42a8e4e03	fix: fetch swift_number in payment_request ... There isn't direct link between payment_request and bank so swift_number wasn't fetched using Fetch form. I fixed it by fetching swift_number on_change of bank_account.	2022-09-28 12:54:00 +05:30
Anand Baburajan	c1e3498a2a	Merge branch 'develop' into fix_asset_scrap_and_sale_dep	2022-09-28 12:18:38 +05:30
Deepesh Garg	0c869251ce	Merge branch 'develop' into fix_asset_scrap_and_sale_dep	2022-09-28 08:38:52 +05:30
Maharshi Patel	d850b0adb1	Merge branch 'develop' into fix-pos-validate-qty-if-is_stock_item	2022-09-27 23:45:50 +05:30
Maharshi Patel	e392ea1104	fix: POS properly validate stock for bundle products ... Stock availability was not calculated properly for Product Bundle with non stock item so i have added logic to properly calculate that as well.	2022-09-27 23:44:56 +05:30
Deepesh Garg	4c8617e1bb	Merge pull request #32378 from deepeshgarg007/add_index_return_against ... fix: Add return against indexes for POS Invoice	2022-09-27 22:22:03 +05:30
Deepesh Garg	cbfe28286a	fix: Add return against indexes for POS Invoice	2022-09-27 16:22:59 +05:30
Nabin Hait	6145013f30	Merge branch 'develop' into fix_asset_scrap_and_sale_dep	2022-09-27 15:56:39 +05:30
Maharshi Patel	e39e088f18	fix: POS only validate QTY if is_stock_item ... POS invoice raised " Item not available " validation error even though item is non_stock.	2022-09-27 15:44:38 +05:30
Deepesh Garg	1f6205e1ea	fix: Add return against indexes for POS Invoice	2022-09-27 15:37:41 +05:30
Maharshi Patel	c760ca2323	fix: Scrap Asset Accounting Dimensions (#31949) ... * fix: Scrap Asset Accounting Dimensions	2022-09-27 15:31:36 +05:30
Rohit Waghchaure	a4a86ee23f	fix: allow to return expired batches using purchase return	2022-09-27 13:55:27 +05:30
ruthra kumar	21095502b9	chore: clean up purchase invoice and purchase invoice item ... 1. remove discount accounting related fields from purchase invoice and purchase invoice item 2. clean buying settings doctype	2022-09-27 11:10:41 +05:30
rohitwaghchaure	106ee1bf4d	Merge pull request #32339 from rohitwaghchaure/fixed-opening-entry-trial-balance-issue ... fix: opening entry causing discrepancy between stock and trial balance	2022-09-26 20:32:41 +05:30
ruthra kumar	8b21d27f04	Merge pull request #32310 from nishibakabeer/patch-4 ... fix: total value in all keys	2022-09-26 11:27:47 +05:30
nishibakabeer	6919f389aa	fix: total value in all keys ... Gross and net profit report showing wrong values in monthly quarterly and half yearly filters which is the total value @ruthra-kumar added in develop branch as suggested ( https://github.com/frappe/erpnext/pull/32020)	2022-09-26 10:40:55 +05:30
Rohit Waghchaure	bc3ab45af2	fix: opening entry causing discepancy between stock and trial balance	2022-09-23 15:21:09 +05:30
ruthra kumar	122d5f2729	fix: difference amount calculation on payment reconciliation	2022-09-21 08:36:09 +05:30
Deepesh Garg	d4b01f6ffd	Merge branch 'develop' of https://github.com/frappe/erpnext into fix-remove-no-copy-for-ignore_pricing_rule	2022-09-20 14:58:48 +05:30
Deepesh Garg	ef7d7e7d71	Merge pull request #32204 from deepeshgarg007/pending_tds_vouchers ... fix(UX): More predictable tax withholding application in invoices	2022-09-20 14:35:16 +05:30
Deepesh Garg	3d356763d0	Merge pull request #32217 from ruthra-kumar/bug_in_tax_on_multi_currency_payment_entry ... fix: incorrect gl if tax on multi currency payment entry	2022-09-20 09:59:47 +05:30
Deepesh Garg	49538e81de	Merge pull request #32235 from maharshivpatel/fix-payment-schedule-description ... fix: fetch description only if empty on the payment schedule	2022-09-20 09:13:43 +05:30
Deepesh Garg	1f4932966a	Merge branch 'develop' of https://github.com/frappe/erpnext into pending_tds_vouchers	2022-09-20 09:06:35 +05:30
Deepesh Garg	9aa1f84d45	chore: fix tests	2022-09-20 09:06:18 +05:30
rohitwaghchaure	3c01bf3a12	Merge pull request #32238 from rohitwaghchaure/fix-pricing-rules-issues ... fix: suggestion threshold label and rule was not working for other item with min and max amount	2022-09-17 12:11:24 +05:30
Maharshi Patel	8c5b420aea	fix: remove no_copy for ignore_pricing_rule	2022-09-16 18:26:00 +05:30
ruthra kumar	5bd5dd7262	test: gl entries of payments with advance tax	2022-09-16 16:22:21 +05:30
Rohit Waghchaure	f5bd3fa952	fix: suggestion threshold label and rule was not working for other items with min and max amount	2022-09-16 16:03:08 +05:30
Maharshi Patel	f4b64686ae	fix: fetch description only if empty on the payment schedule ... added fetch_if_empty on description field of payment_schedule.	2022-09-16 14:14:14 +05:30
Deepesh Garg	36d0906ea2	fix: TDS deduction via journal entry	2022-09-16 13:50:37 +05:30
ruthra kumar	f0ae77b23b	fix: incorrect gl if tax on multi currency payment entry	2022-09-16 12:40:40 +05:30
Deepesh Garg	0a6462e627	Merge branch 'develop' of https://github.com/frappe/erpnext into pending_tds_vouchers	2022-09-16 12:35:39 +05:30
Deepesh Garg	38d00f407e	Merge pull request #32225 from nabinhait/dunning-fix ... fix: create dunning from sales invoice	2022-09-16 11:04:55 +05:30
Deepesh Garg	e4ef6c9645	Merge pull request #32219 from nabinhait/bank-clearnance-perm-issue ... fix: No permission to read doctype	2022-09-16 11:04:42 +05:30
Nabin Hait	0286f2da78	Merge branch 'develop' into dunning-fix	2022-09-16 09:40:18 +05:30
anandbaburajan	ff5cad1cd6	fix: calculate depreciation properly on asset sale entry and scrap entry	2022-09-15 13:15:34 +05:30
Nabin Hait	29db084dc3	fix: create dunning from sales invoice	2022-09-15 13:11:53 +05:30
Nabin Hait	af21a11e1e	fix: abbreviation issue on renaming cost center	2022-09-15 12:09:18 +05:30
Nabin Hait	c0da948a4e	fix: No permission to read doctype	2022-09-15 11:27:35 +05:30
Deepesh Garg	b6184ce471	test: Add tests	2022-09-14 09:13:02 +05:30
Deepesh Garg	b6d87ae25b	Merge branch 'develop' of https://github.com/frappe/erpnext into pending_tds_vouchers	2022-09-13 22:31:21 +05:30
Deepesh Garg	3fb1595a4e	fix: Fetch vouchers to show in Invoice	2022-09-13 20:31:31 +05:30
Deepesh Garg	246c1a9380	fix: Add child table for tax withheld vouchers	2022-09-13 20:05:20 +05:30
Nabin Hait	e24a4b18c4	Merge branch 'SaiFi0102-asset-capitalization' into develop	2022-09-13 15:00:21 +05:30
Maharshi Patel	62163ab3d3	fix: item wise sales register taxes and charges ... i have added separate column for other charges. Instead of adding all values to tax_total, it checks if account_type is tax, and then only it adds to total_tax otherwise it adds to the total_other_charges.	2022-09-12 23:44:56 +05:30
rohitwaghchaure	b3b1df7184	Merge pull request #32181 from rohitwaghchaure/fix-min-max-amount-configuration ... fix: promotional scheme min and max amount configuration	2022-09-12 18:30:01 +05:30
Rohit Waghchaure	a8fd92ddc1	fix: promotional scheme min and max amount configuration	2022-09-12 16:53:52 +05:30
Nihantra C. Patel	e2b4ae13fa	fix: Set filter condition and spell in AR	2022-09-12 14:09:42 +05:30
Ankush Menat	12d99b3292	refactor: use util method for checking if job is queued	2022-09-12 13:14:48 +05:30
ruthra kumar	0aeb7c6484	Merge pull request #32156 from ruthra-kumar/bug_multiple_call_to_ple_creation ... fix: remove duplicate call to ple creation	2022-09-11 12:21:01 +05:30
ruthra kumar	4adc372f9a	fix: remove multiple call to ple creation	2022-09-11 11:52:17 +05:30
Nabin Hait	fefe95052d	fix: resolved merge conflict	2022-09-09 14:40:36 +05:30
Deepesh Garg	33d0e09497	Merge pull request #32117 from deepeshgarg007/psoa_fontsize ... fix: Reduce font size for Process Statement of accounts print/pdf	2022-09-09 11:18:13 +05:30
Deepesh Garg	6bfd193b0d	fix: Reduce font size for Process Statement of accounts print/pdf	2022-09-07 16:34:10 +05:30
ruthra kumar	741b5b4978	Merge pull request #32110 from ruthra-kumar/bank_import_statement_bug ... fix: error on bank statement import	2022-09-07 15:22:14 +05:30
Rohit Waghchaure	b4a102d119	fix: internal transfer flow	2022-09-07 12:48:18 +05:30
ruthra kumar	a6fbb80b94	fix: import error on bank statement import ... Name collision between frameworks file importer's internal log and doctype fieldname - import_log. Frameworks internal log overrode, doctypes field which caused failure in basic fieldtype validation.	2022-09-07 11:19:54 +05:30
Deepesh Garg	10d94ed539	Merge pull request #32045 from SolufyPrivateLimited/Solufy-JET ... fix: Naming series in Journal Entry Template	2022-09-04 16:34:05 +05:30
Deepesh Garg	acb88e5c57	Merge pull request #31850 from HarryPaulo/add-two-new-filters-gross-profit ... feat: two new filters for gross profit	2022-09-04 15:56:54 +05:30
Deepesh Garg	1a61d4e8a8	Merge branch 'develop' into fix-consolidation-precision-error	2022-09-04 13:18:10 +05:30
Deepesh Garg	ad8d0efa29	chore: Linting Issues	2022-09-04 13:15:59 +05:30
ruthra kumar	e424ad5ff2	Merge pull request #32054 from ruthra-kumar/bug_in_process_deferred_accounting ... fix: type error on cancellation of Process Deferred Accounting	2022-09-02 16:20:31 +05:30
ruthra kumar	64f8010a25	Merge pull request #32052 from ruthra-kumar/key_error_on_consolidate_financial_report ... fix: key error on consolidated financial report	2022-09-02 16:13:19 +05:30
ruthra kumar	1c385541fa	test: pda document submission and cancellation	2022-09-02 12:34:02 +05:30
ruthra kumar	08f2e4edc3	fix: incorrect import parameter for cancel PDA	2022-09-02 10:51:51 +05:30
ruthra kumar	6e8395cccd	fix: key error on consolidated financial report ... accounts with same name but different account number will throw key error on consolidated report	2022-09-02 09:55:24 +05:30
Solufyin	2085626390	fix: Naming series in Journal Entry Template	2022-09-01 11:49:13 +05:30
ruthra kumar	25072e5d32	Merge pull request #32009 from ruthra-kumar/add_remarks_to_payment_ledger ... refactor: readd remarks field to payment ledger	2022-08-29 19:48:36 +05:30
ruthra kumar	5782c4469a	refactor: re-add remarks field to payment ledger and AR/AP report	2022-08-29 15:59:37 +05:30
Deepesh Garg	87ca23736d	Merge pull request #31988 from ruthra-kumar/remove_precision_discount_percentage ... chore: remove precision on discount_percentage of Sales Invoice Item	2022-08-26 16:03:57 +05:30
ruthra kumar	c42fef541a	chore: remove precision on discount_percentage of Sales Invoice Item	2022-08-26 13:15:55 +05:30
ruthra kumar	6aa8fd0f7b	fix: restrict party types to Supplier/Customer for AR/AP report	2022-08-25 15:50:06 +05:30
Deepesh Garg	e9b0c7177f	Merge branch 'develop' into fix-consolidation-precision-error	2022-08-25 11:41:20 +05:30
Deepesh Garg	77906ea4ab	Merge pull request #31934 from ruthra-kumar/disable_discount_accounting_for_buying ... refactor: disable discount accounting on Buying module(PI)	2022-08-25 10:34:30 +05:30
ruthra kumar	e5b04d54ff	fix: display amount in account currency if party is supplied	2022-08-25 10:05:25 +05:30
ruthra kumar	ee889afd4c	Merge pull request #31942 from ruthra-kumar/bug_ar_ap_report_include_payment_against_po ... fix: include payment against PO in AR/AP report	2022-08-25 09:40:45 +05:30
ruthra kumar	36f5883dda	test: payments against so/po will show up as outstanding amount ... 1. Class will use FrappeTestCase fixture 2. setup and teardown methods are introduced 3. test for payments against SO	2022-08-24 13:59:42 +05:30
ruthra kumar	fdd167cac1	fix: include payment against PO in AR/AP report	2022-08-24 12:24:55 +05:30
ruthra kumar	277ef04b60	test: remove discount accounting tests	2022-08-23 15:17:27 +05:30
ruthra kumar	a956e20f29	refactor: disable discount accounting on Buying module(PI)	2022-08-23 11:36:00 +05:30