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 |
|
Deepesh Garg
|
1001f29784
|
fix: Gracefully handle duplicate bank account name to make setup faster
|
2021-07-13 16:47:38 +05:30 |
|
Deepesh Garg
|
c00d851a88
|
fix: Unallocated amount for inclusive charges
|
2021-07-13 16:42:21 +05:30 |
|
Deepesh Garg
|
740d5c6c53
|
fix: Deduct included taxes from unallocated amount
|
2021-07-13 16:42:10 +05:30 |
|
Deepesh Garg
|
01c89eaad9
|
fix: Remove unintentional changes
|
2021-07-13 16:42:10 +05:30 |
|
Deepesh Garg
|
2f350bf450
|
fix: Remove unintentional changes
|
2021-07-13 16:42:10 +05:30 |
|
Deepesh Garg
|
9513d61a50
|
fix: Hide amount after tax fields
|
2021-07-13 16:42:10 +05:30 |
|
Deepesh Garg
|
51ae46f0de
|
fix: Unallocated amount in Payment Entry after taxes
|
2021-07-13 16:42:10 +05:30 |
|
Deepesh Garg
|
4478c547bf
|
fix: Unallocated amount for inclusive charges
|
2021-07-13 16:35:58 +05:30 |
|
Deepesh Garg
|
754f432d97
|
fix: Deduct included taxes from unallocated amount
|
2021-07-13 16:35:47 +05:30 |
|
Deepesh Garg
|
7c634f66ca
|
fix: Remove unintentional changes
|
2021-07-13 16:35:47 +05:30 |
|
Deepesh Garg
|
5179f85e63
|
fix: Remove unintentional changes
|
2021-07-13 16:35:47 +05:30 |
|
Deepesh Garg
|
5cc4a201cb
|
fix: Hide amount after tax fields
|
2021-07-13 16:35:47 +05:30 |
|
Deepesh Garg
|
f661d82c00
|
fix: Unallocated amount in Payment Entry after taxes
|
2021-07-13 16:35:47 +05:30 |
|
Subin Tom
|
5265ba39f0
|
feat: Added fields for dispatch address in Sales Order, Sales Invoice, Delivery Note for Eway Bill
|
2021-07-13 14:58:17 +05:30 |
|
Deepesh Garg
|
4a2e4748ac
|
fix: Unallocated amount for inclusive charges
|
2021-07-13 11:22:55 +05:30 |
|
GangaManoj
|
8f7b0a1753
|
fix: Create common function for discount accounting
|
2021-07-13 03:01:02 +05:30 |
|
GangaManoj
|
65e2b9fee6
|
fix: Filter options for Discount Account
|
2021-07-13 02:14:18 +05:30 |
|
GangaManoj
|
81375aec1f
|
fix: Copy Discount Account from first row
|
2021-07-13 02:09:40 +05:30 |
|
GangaManoj
|
4b8918e8a7
|
fix: Display Discount Account only if Enable Discount Accounting is checked
|
2021-07-13 02:07:46 +05:30 |
|
GangaManoj
|
555852c5ef
|
fix: Add Discount Account field
|
2021-07-13 02:06:03 +05:30 |
|
GangaManoj
|
4fcdc5d129
|
fix: Copy discount account from first row to all Items
|
2021-07-13 01:45:20 +05:30 |
|
GangaManoj
|
b22dba1146
|
fix: Filter Discount Account list
|
2021-07-13 01:45:20 +05:30 |
|
GangaManoj
|
0d5ad3b1bb
|
fix: Add description for Enable Discount Accounting checkbox
|
2021-07-13 01:45:20 +05:30 |
|
Deepesh Garg
|
30f771b26c
|
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into payment_entry_taxes_v12
|
2021-07-12 23:34:13 +05:30 |
|
Deepesh Garg
|
855e9030f2
|
fix: Deduct included taxes from unallocated amount
|
2021-07-12 22:11:57 +05:30 |
|
Saqib
|
7fb64d1645
|
fix: exchange gain loss not set for advances linked with invoices (#26436)
|
2021-07-12 18:33:16 +05:30 |
|
Saqib
|
a20999cfbc
|
fix: exchange gain loss not set for advances linked with invoices (#25369)
|
2021-07-12 14:33:23 +05:30 |
|
Afshan
|
7e05bea6a9
|
fix: dunning calculation of grand total when rate of interest is 0% (#26286)
|
2021-07-12 11:11:58 +05:30 |
|
Afshan
|
10473b1195
|
fix: dunning calculation of grand total when rate of interest is 0% (#26285)
|
2021-07-12 11:11:29 +05:30 |
|
Afshan
|
bf03671a33
|
fix(report): iterate on accounts only when accounts exist (#26391)
|
2021-07-12 11:10:28 +05:30 |
|
Afshan
|
4b4ac7c051
|
fix(report): iterate on accounts only when accounts exist (#26390)
|
2021-07-12 11:10:00 +05:30 |
|
Afshan
|
f60c3f0655
|
fix: error popup for COA errors (#26358)
|
2021-07-12 11:07:30 +05:30 |
|
Afshan
|
6467632f60
|
fix: error popup for COA errors (#26357)
|
2021-07-12 11:07:06 +05:30 |
|
Deepesh Garg
|
eae7c1891f
|
fix: Remove unintentional changes
|
2021-07-09 20:08:29 +05:30 |
|
Deepesh Garg
|
c13ac4ab11
|
fix: Remove unintentional changes
|
2021-07-09 20:00:55 +05:30 |
|
GangaManoj
|
ef42e80065
|
fix: Sider issues
|
2021-07-09 19:25:54 +05:30 |
|
Deepesh Garg
|
171ee51507
|
fix: Hide amount after tax fields
|
2021-07-09 18:52:39 +05:30 |
|
Deepesh Garg
|
38fa3a3f89
|
fix: Unallocated amount in Payment Entry after taxes
|
2021-07-09 18:04:24 +05:30 |
|
Saqib
|
13d7043451
|
fix: column 'outstanding_amount' cannot be null (#26404)
|
2021-07-09 15:33:14 +05:30 |
|
Saqib
|
47ccfd6c9d
|
fix: column 'outstanding_amount' cannot be null (#26371)
|
2021-07-09 14:36:13 +05:30 |
|
Subin Tom
|
d53991857c
|
fix: Fixed Budget Variance Graph color from all black to default (#26368)
|
2021-07-09 14:33:00 +05:30 |
|
Saqib
|
f6f924b340
|
Merge branch 'develop' into asset-credit-note
|
2021-07-09 10:38:50 +05:30 |
|
Saqib
|
8f3c7ab402
|
fix: escape quotes while fetching customer emails (#26329) (#26376)
|
2021-07-09 10:35:55 +05:30 |
|
GangaManoj
|
bf245e5e39
|
fix: Clear Payment Schedule if PI has default Payment Schedule, but linked PO doensn't
|
2021-07-09 01:44:34 +05:30 |
|
GangaManoj
|
5a62467a3e
|
feat: Fetch Payment Terms from linked Purchase Order
|
2021-07-09 00:53:42 +05:30 |
|
Rucha Mahabal
|
3888488b36
|
fix: precision for expected values in payment entry test
|
2021-07-08 23:21:48 +05:30 |
|
Rucha Mahabal
|
88929b055c
|
fix: precision for expected values in payment entry test
|
2021-07-08 19:27:53 +05:30 |
|
Saqib
|
eaef371585
|
fix: escape quotes while fetching customer emails (#26329)
|
2021-07-08 10:52:41 +05:30 |
|
GangaManoj
|
cfff3b8726
|
fix: Test GL Entries made when an Asset is returned
|
2021-07-07 21:04:20 +05:30 |
|
GangaManoj
|
3a7f25b218
|
fix: Make functions more readable
|
2021-07-07 15:59:52 +05:30 |
|
Saqib
|
9910968398
|
Merge branch 'develop' into enable-discount-accounting
|
2021-07-07 12:56:11 +05:30 |
|
GangaManoj
|
ca87745be1
|
fix: Rename get_gl_entries_on_asset_movement to get_gl_entries_on_asset_disposal_and_regain
|
2021-07-06 23:43:08 +05:30 |
|
Nabin Hait
|
11d56903e7
|
Merge pull request #25415 from deepeshgarg007/bootstraped_gst_setup
feat(India): Bootstrapped GST Setup
|
2021-07-06 21:44:30 +05:30 |
|
Deepesh Garg
|
bd40669dab
|
Merge pull request #26289 from nemesis189/fixed-budget-variance-report-color
fix: Fixed Budget Variance Graph color from all black to default
|
2021-07-06 20:36:00 +05:30 |
|
GangaManoj
|
3ea4f993b7
|
feat: Toggle display for discount accounting fields according to enable_discount_accounting
|
2021-07-06 20:22:13 +05:30 |
|
Deepesh Garg
|
3636efd7e6
|
Merge pull request #26355 from deepeshgarg007/flaky_test
test: Purchase Invoice advance test case
|
2021-07-06 18:22:26 +05:30 |
|
Deepesh Garg
|
7f794cc0ea
|
fix: Purchase Invoice advance test case
|
2021-07-06 17:58:44 +05:30 |
|
Deepesh Garg
|
a62f94379b
|
Merge pull request #26324 from deepeshgarg007/bank_statement_import_fix_develop
fix: Bank statement import
|
2021-07-06 17:25:21 +05:30 |
|
GangaManoj
|
b08bb1f1a2
|
feat: Filter list for Discount Account field in Items table
|
2021-07-06 16:28:19 +05:30 |
|
Deepesh Garg
|
2f3f87dc66
|
Merge branch 'develop' into multi-company-deferred-revenue_develop
|
2021-07-06 16:14:25 +05:30 |
|
Deepesh Garg
|
26dc02aa38
|
Merge branch 'develop' into bank_statement_import_fix_develop
|
2021-07-06 16:14:13 +05:30 |
|
Deepesh Garg
|
381c05eb87
|
Merge pull request #26322 from deepeshgarg007/party_dashboard_develop
fix: Do not consider cancelled entries in party dashboard
|
2021-07-06 16:13:49 +05:30 |
|
Deepesh Garg
|
8985231a96
|
fix: Rewrite tests
|
2021-07-06 15:34:47 +05:30 |
|
Afshan
|
c8eca8a448
|
fix: remove cancelled entries in consolidated financial statements (#26331)
|
2021-07-06 14:37:57 +05:30 |
|
Afshan
|
53e3435770
|
fix: remove cancelled entries in consolidated financial statements (#26330)
|
2021-07-06 14:37:21 +05:30 |
|
GangaManoj
|
cf7579e29f
|
feat: Create GL Entries for discount accounting
|
2021-07-06 00:36:06 +05:30 |
|
Deepesh Garg
|
8c1b764a90
|
fix: Debug tests
|
2021-07-05 21:49:10 +05:30 |
|
GangaManoj
|
6e0d83d925
|
feat(Sales Invoice): Add 'Discount Account' field in Items table
|
2021-07-05 15:09:05 +05:30 |
|
GangaManoj
|
be15e16b84
|
feat(Accounts Settings): Add 'Enable Discount Accounting' checkbox
|
2021-07-05 14:58:32 +05:30 |
|
Deepesh Garg
|
ddf87594a1
|
Merge pull request #26287 from deepeshgarg007/bank_statement_import_fix
fix: Bank statement import
|
2021-07-04 20:34:10 +05:30 |
|
Deepesh Garg
|
9d295ca939
|
fix: Bank statement import
|
2021-07-04 20:33:36 +05:30 |
|
Deepesh Garg
|
ea5b7d38bb
|
Merge pull request #26277 from deepeshgarg007/multi-company-deferred-revenue
fix: Auto process deferred accounting for multi-company setup
|
2021-07-04 20:32:22 +05:30 |
|
Deepesh Garg
|
5069095984
|
fix: Auto process deferred accounting for multi-company setup
|
2021-07-04 20:31:37 +05:30 |
|
Deepesh Garg
|
cd036e115b
|
Merge pull request #26231 from deepeshgarg007/party_dashboard
fix: Do not consider cancelled entries in party dashboard
|
2021-07-04 20:30:34 +05:30 |
|
Deepesh Garg
|
802e63a9d7
|
fix: Do not consider cancelled entries in party dashboard
|
2021-07-04 20:29:41 +05:30 |
|
Deepesh Garg
|
63096014a7
|
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into bootstraped_gst_setup
|
2021-07-02 20:30:18 +05:30 |
|
GangaManoj
|
f8ee8058e7
|
fix(Sales Invoice): Reset disposal_date on returning the Asset
|
2021-07-02 15:45:52 +05:30 |
|
GangaManoj
|
4cf3d9ac20
|
fix(Sales Invoice): Let invoice be created for Sold Assets if it's a return invoice
|
2021-07-02 15:25:04 +05:30 |
|
Deepesh Garg
|
d4146a91d6
|
Merge pull request #25323 from m1ngaa/patch-1
Delete accounts (an empty file)
|
2021-07-01 23:38:56 +05:30 |
|
Subin Tom
|
d2c86bb9d7
|
fix: Fixed Budget Variance Graph color from all black to default
|
2021-07-01 19:59:08 +05:30 |
|
Deepesh Garg
|
ba2c3c776f
|
fix: Bank statement import
|
2021-07-01 18:56:51 +05:30 |
|
Anuja Pawar
|
d8bc514226
|
fix: to fetch the correct field in Tax Rule (#25927)
|
2021-07-01 14:06:01 +05:30 |
|
Nabin Hait
|
fa006402b8
|
fix: merge conflict
|
2021-07-01 12:47:28 +05:30 |
|
Deepesh Garg
|
68c697b354
|
fix: Auto process deferred accounting for multi-company setup
|
2021-07-01 09:31:31 +05:30 |
|