Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
40,014 Commits 3 Branches 0 Tags 1 GiB
bf30932de0
Commit Graph

7352 Commits

Author SHA1 Message Date
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
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
Deepesh Garg
cf7af62b05 fix: Code cleanup 2021-06-30 14:14:32 +05:30
GangaManoj
d748e7f49c fix: Create common function for fetching conversion rate details of linked docs 2021-06-28 22:39:43 +05:30
GangaManoj
506d5ac3d5 fix: Make exchange rate handling more efficient 2021-06-28 22:39:43 +05:30
GangaManoj
8f52db788a fix(Purchase Invoice): Improve test for exchange rate difference handling 2021-06-28 22:39:41 +05:30
GangaManoj
3f5e7bf6d7 fix(Purchase Invoice): Fetch Purchase Receipt details using a function 2021-06-28 22:38:59 +05:30
GangaManoj
206313d69b fix(Purchase Invoice): Add test for exchange rate difference handling 2021-06-28 22:02:20 +05:30
GangaManoj
6233eaa3bb fix(Purchase Invoice): Fix condition 2021-06-28 22:00:49 +05:30
GangaManoj
785a71dcd2 fix(Purchase Invoice): Resolve difference caused by change in exchange rate 2021-06-28 22:00:49 +05:30
Saqib
4277e4c94b
fix: unreachable test case (#26234) 2021-06-28 19:10:46 +05:30
Deepesh Garg
7d7d797ffc fix: Do not consider cancelled entries in party dashboard 2021-06-28 11:24:32 +05:30
Deepesh Garg
ebc46c1e09 fix: Update account heads in GST test cases 2021-06-28 10:52:38 +05:30
Deepesh Garg
cf445eb7b4 fix: Add validate bank account method back 2021-06-26 23:59:47 +05:30
Subin Tom
43f85a2877
fix: changed profitability analysis report width (#26165) 2021-06-25 11:38:11 +05:30
Deepesh Garg
dce2676f7a Merge branch 'develop' of https://github.com/frappe/erpnext into internal_transfer_payment_tax 2021-06-24 21:08:57 +05:30
Deepesh Garg
c151c67d97 fix: Flaky test 2021-06-24 21:08:19 +05:30
Deepesh Garg
970d2af7ad
Merge pull request #26211 from deepeshgarg007/include_dimension_filter 
fix: Account filter not working with accounting dimension filter
 2021-06-24 19:55:12 +05:30
Deepesh Garg
1564d39bf4
Merge pull request #26188 from deepeshgarg007/internal_transfer_payment_tax_v13 
fix: Taxes on Internal Transfer payment entry
 2021-06-24 19:51:48 +05:30
Deepesh Garg
e3ca177828 fix: Remove debug flag 2021-06-24 19:51:23 +05:30
Deepesh Garg
bdba29bab5 fix: Account filter not working with accounting dimension filter 2021-06-24 19:48:11 +05:30
Saqib
3b5978cdb8
Merge pull request #26093 from nextchamp-saqib/pr-item-gl-fix 
fix: purchase receipt gl entries with same item code
 2021-06-24 19:29:08 +05:30
Deepesh Garg
9382b1f154 fix: Flaky test 2021-06-24 19:03:22 +05:30
Anuja Pawar
a50196bcd9
fix: dunning permission error in payment entry (#26204) 2021-06-24 18:25:16 +05:30
Saqib Ansari
1ca8f6a51d fix: purchase receipt gl entries with same item code 2021-06-24 17:41:44 +05:30
Saqib
c10fea8a59
Merge branch 'develop' into pr-item-gl-fix 2021-06-24 17:39:36 +05:30
Deepesh Garg
e693cceb58
Merge pull request #26132 from noahjacob/shipping_address_fix 
fix: fetch preferred shipping address
 2021-06-24 17:31:21 +05:30
Noah Jacob
dbdf2515cd fix: fetches correct preferred shipping address 2021-06-24 17:06:18 +05:30
Nabin Hait
5b462ad11a fix: merge conflict 2021-06-24 15:36:51 +05:30
Nabin Hait
c1954ec72a
Merge pull request #26195 from deepeshgarg007/deferred_revenue_error 
fix: Error while booking deferred revenue
 2021-06-24 15:35:02 +05:30
Deepesh Garg
f79a72dbf3 fix: Error while booking deferred revenue 2021-06-24 14:49:09 +05:30
Deepesh Garg
ca2e914715 fix: Error while booking deferred revenue 2021-06-24 14:14:46 +05:30
Deepesh Garg
ab7a16a952
Merge pull request #26180 from deepeshgarg007/pi_billing_address_develop 
fix: Billing address not fetched in Purchase Invoice
 2021-06-24 12:13:17 +05:30
Deepesh Garg
9d8e8f8bdf fix: Do not show received amount after tax for internal tarnsfers 2021-06-24 12:02:39 +05:30
Deepesh Garg
bd9317956b fix: Taxes on Internal Transfer payment entry 2021-06-24 12:02:32 +05:30
Ganga Manoj
604f0b8f01
fix: message on successful creation of opening invoices (#25998) 2021-06-24 11:04:27 +05:30
Deepesh Garg
03b629c851
Merge pull request #26100 from deepeshgarg007/pi_billing_address 
fix: Billing address not fetched in Purchase Invoice
 2021-06-24 10:29:01 +05:30
Deepesh Garg
7bef18f3d8 fix: Remove unintentional changes 2021-06-24 10:28:25 +05:30
Deepesh Garg
c8a6b31f06 Merge branch 'develop' of https://github.com/frappe/erpnext into pi_billing_address_develop 2021-06-24 10:27:16 +05:30
Deepesh Garg
da7f45130b fix: Billing address not fetched in Purchase Invoice 2021-06-24 10:25:24 +05:30
Noah Jacob
b4b6288596 fix: fetches correct preferred shipping address 2021-06-23 17:05:44 +05:30
GangaManoj
88348e2da7 fix(Sales Invoice): Print appropriate message if Asset isn't specified when the Item is a Fixed Asset 2021-06-23 11:57:53 +05:30
Deepesh Garg
e8817f97d6
Merge pull request #26150 from nemesis189/changed-profitability-analysis-report-width 
fix: Changed profitability analysis report width
 2021-06-23 11:36:43 +05:30
Deepesh Garg
673470705b Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into bootstraped_gst_setup 2021-06-23 11:33:15 +05:30
GangaManoj
32d7b1f6ad fix(Sales Invoice): Fix GL Entry creation for Return Invoices linked with Assets 2021-06-23 11:24:05 +05:30
Saqib
46ae97dfd3
Merge branch 'develop' into pr-item-gl-fix 2021-06-23 11:02:48 +05:30
Saqib
5a824cad81
fix: cannot cancel payment entry if linked with invoices (#26075) 2021-06-23 11:02:05 +05:30
GangaManoj
8127208774 fix(Sales Invoice): Reset Asset status on issuing Credit Note 2021-06-22 23:12:56 +05:30
GangaManoj
721ff9438a Merge branch 'develop' into asset-credit-note 2021-06-22 22:45:11 +05:30
Deepesh Garg
7b0d86ead5 fix: Do not show received amount after tax for internal tarnsfers 2021-06-22 20:38:35 +05:30
Deepesh Garg
2af8c171c1 fix: Taxes on Internal Transfer payment entry 2021-06-22 19:48:08 +05:30
Subin Tom
a446d61e10 fix: Changed profitability analysis report width 2021-06-22 16:51:15 +05:30
GangaManoj
d0d5fedd48 fix(Sales Invoice): Print appropriate message if item.asset is missing when the Item is a Fixed Asset 2021-06-22 00:22:08 +05:30
GangaManoj
5b07e58412 fix(Sales Invoice): Let invoice be created for Sold Assets if it's a return invoice 2021-06-21 23:51:09 +05:30
GangaManoj
600333875a fix(Sales Invoice): Let item.asset be copied on duplicating the doc 2021-06-21 23:41:35 +05:30
Afshan
127d637b3d
fix: check for duplicate payment terms in Payment Term Template (#25999) 2021-06-21 11:24:45 +05:30
Saqib Ansari
d329e27346 Merge branch 'develop' of https://github.com/frappe/erpnext into pr-item-gl-fix 2021-06-21 11:18:45 +05:30
Saqib
fb89008a13
fix(pos): unsupported operand type -=: for 'float' and 'NoneType' (#26097) 2021-06-21 10:49:09 +05:30
Saqib
7ff19ebec8
fix(pos): unsupported operand type -= for 'float' and 'NoneType' (#26096) 2021-06-21 10:48:50 +05:30
Saqib Ansari
99531a35e0 fix(pos): unsupported operand type -= for 'float' and 'NoneType' 2021-06-21 10:47:23 +05:30
Rohit Waghchaure
110e152fa3 fix: purchase invoice qty change not recalculate the consumed qty and added test cases for purchase invoice 2021-06-20 15:28:23 +05:30
Rohit Waghchaure
7b7ceaadd9 feat: subcontract code refactor and enhancement 2021-06-20 15:27:01 +05:30
Rohit Waghchaure
5cc3f14506 fix: purchase invoice qty change not recalculate the consumed qty and added test cases for purchase invoice 2021-06-19 23:16:23 +05:30
Rohit Waghchaure
a94b89727c feat: subcontract code refactor and enhancement 2021-06-19 23:16:22 +05:30
Anuja Pawar
b066fe9519
fix: insufficient permission for dunning error (#26092) 2021-06-18 11:29:07 +05:30
Saqib
cceabff6e1
Merge branch 'develop' into pr-item-gl-fix 2021-06-18 11:24:54 +05:30
Deepesh Garg
a58b571ccb fix: Billing address not fetched in Purchase Invoice 2021-06-18 10:45:35 +05:30
Deepesh Garg
d3ccb024f8
Merge pull request #26078 from nemesis189/fixed-label-rate-for-purchase-invoice-item-v13 
fix: removed extra space from label rate
 2021-06-17 17:19:17 +05:30
Saqib Ansari
61675f1a43 fix: purchase receipt gl entries with same item code 2021-06-17 13:05:43 +05:30
Deepesh Garg
913e92c29f
Merge pull request #26044 from GangaManoj/account-multiselect-gl 
feat(General Ledger): Implement multi-account selection
 2021-06-16 22:33:50 +05:30
Subin Tom
6f9de8c86f fix: removed extra space from label rate 2021-06-16 20:01:29 +05:30
Subin Tom
c03a947e98 fix: removed extra space from label rate 2021-06-16 19:47:55 +05:30
GangaManoj
41b7c1aec0 fix(General Ledger): Improve account filter 2021-06-16 14:40:14 +05:30
Afshan
3b1b4684ba
fix: check for duplicate payment terms in Payment Term Template (#26003) 2021-06-16 14:30:45 +05:30
Saqib
60ce00531d
fix: label for enabling ledger posting of change amount (#26070) 2021-06-16 14:25:55 +05:30
GangaManoj
86f689e54a fix(General Ledger): Get account_currency accurately 2021-06-16 14:23:02 +05:30
Deepesh Garg
d70c6996f2
Merge pull request #25951 from nextchamp-saqib/invoice-opening-pnl-validation 
fix: opening invoices can alter profit and loss of a closed year
 2021-06-16 10:52:40 +05:30
GangaManoj
53a9ac4466 fix(General Ledger): Condense account_conditions 2021-06-16 04:10:29 +05:30
GangaManoj
79dc0f0afc fix: Remove console.log() 2021-06-16 03:37:11 +05:30
Deepesh Garg
fb9cb78980
Merge pull request #26045 from GangaManoj/filter-cc-project 
fix(General Ledger): Filter Cost Center and Project drop-down lists by Company
 2021-06-15 21:18:49 +05:30
Nabin Hait
0950481253 fix: merge conflict 2021-06-15 20:18:06 +05:30
Deepesh Garg
95bc141531
Merge pull request #26056 from deepeshgarg007/gst_taxtable_value_with_discount_v13 
fix(India): Taxable value for invoices with additional discount
 2021-06-15 12:05:16 +05:30
Deepesh Garg
433815daba fix: Update einvoice json test 2021-06-14 20:43:51 +05:30
Deepesh Garg
5149101045
Merge pull request #26037 from deepeshgarg007/payment_entry_auto_tax_fixes 
fix: Auto tax calculations in Payment Entry
 2021-06-14 20:39:41 +05:30
Deepesh Garg
ac52daa14f fix: Import throw 2021-06-14 20:09:23 +05:30
Deepesh Garg
5ef9a62917 fix: Add separate function to validate payment entry taxes 2021-06-14 20:09:17 +05:30
Deepesh Garg
302855e160 fix: Auto tax calculations in Payment Entry 2021-06-14 20:09:10 +05:30
Deepesh Garg
cf1fc40b06
Merge pull request #25906 from deepeshgarg007/gst_taxtable_value_with_discount 
fix(India): Taxable value for invoices with additional discount
 2021-06-14 17:11:08 +05:30
GangaManoj
75b30efb05 fix(General Ledger): Filter Project drop-down list by Company 2021-06-14 16:42:27 +05:30
GangaManoj
27ec51f021 fix(General Ledger): Filter Cost Center drop-down list by Company 2021-06-14 16:41:56 +05:30
Deepesh Garg
9eac4d0af6 fix: Import throw 2021-06-14 14:44:19 +05:30
Deepesh Garg
8718013c96 fix: Add separate function to validate payment entry taxes 2021-06-14 14:34:44 +05:30
GangaManoj
0511ffcf30 fix(General Ledger): Implement multi-account selection 2021-06-14 13:22:44 +05:30
Deepesh Garg
856484aeb0 Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into gst_taxtable_value_with_discount 2021-06-14 11:29:41 +05:30
Deepesh Garg
580346360f fix: Auto tax calculations in Payment Entry 2021-06-14 11:16:39 +05:30
Rucha Mahabal
17550fb4bf feat: add Inactive status to Employee 2021-06-12 13:36:47 +05:30
Rucha Mahabal
efd7d584b2 feat: add Inactive status to Employee 2021-06-12 13:34:20 +05:30
Rucha Mahabal
a38147a8ba feat: add Inactive status to Employee 2021-06-12 13:33:21 +05:30
Ankush Menat
9891780f5a
perf(minor): remove unnecessary comprehensions (port #25645) 2021-06-11 18:40:22 +05:30
Ankush Menat
a9c84f749a
perf(minor): remove unnecessary comprehensions (#25645) 2021-06-11 16:00:48 +05:30
Nabin Hait
d17217c4e2
Merge pull request #25831 from deepeshgarg007/tds_advance_payment_v13 
feat: Tax deduction against advance payments
 2021-06-10 20:25:30 +05:30
Deepesh Garg
48f2839079 fix: Sort account balances by account name 2021-06-10 19:00:50 +05:30
Deepesh Garg
3b34fc4cce Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into tds_advance_payment_v13 2021-06-10 18:57:31 +05:30
Deepesh Garg
5434dd048b Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into dynamic_gst_rates 2021-06-10 18:56:39 +05:30
Deepesh Garg
a5c3427293 fix: Sort account balances by account name 2021-06-10 18:09:49 +05:30
Deepesh Garg
882913ca4e
Merge pull request #26000 from GangaManoj/gst-settings-card 
fix: Only display GST card in Accounting Workspace if it's in India
 2021-06-10 12:46:15 +05:30
Deepesh Garg
d063f9a5d1 fix: GL Entry ordering 2021-06-10 12:26:21 +05:30
GangaManoj
076bd5eaab fix: Only display GST card in Accounting Workspace if it's in India 2021-06-10 12:08:44 +05:30
Deepesh Garg
701cba7f03 Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into gst_taxtable_value_with_discount 2021-06-10 12:04:38 +05:30
Deepesh Garg
edecd5b0c6 fix: Update einvoice json test 2021-06-10 12:04:30 +05:30
Deepesh Garg
0b5fe1b5eb fix: Failing test case 2021-06-10 10:34:49 +05:30
Deepesh Garg
911818a9e2 fix: Add multiple fixes 2021-06-09 22:55:10 +05:30
Saqib
42557c4ad3
feat: cost-center wise period closing entry (#25766) 2021-06-09 19:48:31 +05:30
Saqib
26f0609390
feat: enable/disable gl entry posting for change given in pos (#25822) 2021-06-09 19:47:28 +05:30
Deepesh Garg
9e648183db fix: Test case 2021-06-09 18:26:16 +05:30
Deepesh Garg
7dabb6be30 Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into tds_advance_payment_v13 2021-06-09 18:10:55 +05:30
Deepesh Garg
b57ebba3fd
fix: Validate negative allocated amount in Payment Entry (#25799) 2021-06-09 17:56:41 +05:30
Deepesh Garg
4c1dad8207 fix: Debug tests 2021-06-09 14:18:23 +05:30
Deepesh Garg
8090965162 fix: Debug test 2021-06-09 13:45:42 +05:30
Deepesh Garg
758db793be Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into tds_advance_payment_v13 2021-06-09 13:39:07 +05:30
Anupam Kumar
21b8e2f0d8
fix: hiding Rounding Adjustment field (#25380) 
* fix: hiding Rounding Adjustment field

* fix: updating purchase_invoice.json
 2021-06-09 12:57:21 +05:30
Deepesh Garg
e4fcc5562f refactor: Advance taxes and charges calculation 2021-06-08 16:35:47 +05:30
Anuja Pawar
d4398fd84a
fix: update cost center from pos (#25971) 2021-06-07 16:20:21 +05:30
Deepesh Garg
6f2dacc60c Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into tds_advance_payment_v13 2021-06-06 19:31:50 +05:30
Deepesh Garg
18be767f75 fix: Remove invalid test 2021-06-06 13:25:34 +05:30
Saqib
d689068d82
Merge pull request #25928 from nextchamp-saqib/pos-fixes-8 
fix(pos): multiple pos issues
 2021-06-06 11:25:29 +05:30
Deepesh Garg
e8a78bd43d fix: Add test cases 2021-06-05 13:16:39 +05:30
Saqib
c6e016e545
fix: wrong round off gl entry posted in case of purchase invoice (#25775) 2021-06-04 10:08:22 +05:30
Saqib Ansari
48036b4bab fix: invoices can alter profit and loss of a closed year 2021-06-04 09:54:34 +05:30
Saqib Ansari
81b9a5ee47 fix(pos): cannot cancel consolidated sales invoice 2021-06-03 12:59:09 +05:30
Deepesh Garg
ca34eec2d6 Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into bootstraped_gst_setup 2021-06-02 13:26:27 +05:30
Fisher Yu
865663857c
fix: chart of accounts importer always error (#25882) 
* fix: chart of accounts importer always error 

chart of accounts importer always error Parent Account Missing

* Update chart_of_accounts_importer.py
 2021-06-01 12:15:58 +05:30
Deepesh Garg
2f5885627d fix: Labeling and other fixes 2021-06-01 11:07:18 +05:30
Ganga Manoj
908b0090e9
fix: Create POS Invoice for Product Bundles (#25847) 
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
 2021-05-31 19:49:03 +05:30
Nabin Hait
a3d1b6973a fix: merge conflict 2021-05-31 11:21:33 +05:30
Saqib
89f621baa4
fix(pos): closing entry shows incorrect expected amount (#25868) 2021-05-31 09:56:49 +05:30
Deepesh Garg
48b1a82fa1 fix: Add accounts and templates for reverse charge 2021-05-29 23:54:51 +05:30
Rucha Mahabal
05d5fb24f7
fix(test): tax detail report (#25884) 2021-05-29 23:18:36 +05:30
Deepesh Garg
ea4f8102e8
Merge pull request #25869 from nextchamp-saqib/plaid-link-reset 
fix(plaid): cannot reset plaid link for a bank account
 2021-05-29 20:05:25 +05:30
Deepesh Garg
fb9cb0fd23
Merge pull request #25866 from deepeshgarg007/itc_reversa_address 
fix(India): Show only company addresses for ITC reversal entry
 2021-05-28 18:46:09 +05:30
Saqib Ansari
05386ff12f chore: remove unwanted method 2021-05-28 12:58:18 +05:30
Deepesh Garg
b084f1d320 fix(India): Show only company addresses for ITC reversal entry 2021-05-28 12:14:56 +05:30
Deepesh Garg
20be7fb93d fix(India): Show only company addresses for ITC reversal entry 2021-05-28 11:57:38 +05:30
Saqib Ansari
bbce2e91a3 fix: reset plaid link button 2021-05-28 11:56:47 +05:30
Saqib Ansari
d24eccd623 fix(plaid): cannot reset plaid link for a bank account 2021-05-28 11:36:24 +05:30
Suraj Shetty
96542c3d04 style: Fix sider issues 2021-05-28 09:10:34 +05:30
Suraj Shetty
a891d6eed2 fix: allow_zero_valuation_rate for rejected qty 2021-05-28 09:10:33 +05:30
Suraj Shetty
19c5fd72d6 refactor: Rename assertEquals to assertEqual to avoid deprecation warnings 2021-05-28 09:10:33 +05:30
Suraj Shetty
ab8816e11d test: Fix test dependency 2021-05-28 09:09:36 +05:30
Suraj Shetty
232cd28d67 test: Fix dependencies 2021-05-28 09:07:57 +05:30
Suraj Shetty
7b74985a54 test: Fix test_dependencies 2021-05-28 09:07:57 +05:30
Deepesh Garg
a150645b57 fix: Remove GL Entry from print 2021-05-27 20:10:50 +05:30
Deepesh Garg
2e83cb77ca fix: Split GL Entry 2021-05-27 20:09:45 +05:30
Deepesh Garg
4311fdc3a1 Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into bootstraped_gst_setup 2021-05-27 17:49:23 +05:30
Deepesh Garg
740c68d075 fix: Debug Test 2021-05-27 17:43:53 +05:30
Anuja P
753e5894de fix: ageing error in PSOA 2021-05-27 17:33:22 +05:30
Anuja P
bb0a40b995 fix: ageing error in PSOA 2021-05-27 17:15:47 +05:30
Deepesh Garg
ea18230274 fix: Update GL Entry ordering 2021-05-27 16:40:37 +05:30
Deepesh Garg
be3671fe7b fix: Create new supplier for test case 2021-05-27 13:27:17 +05:30
Marica
477a90e2ac
Merge pull request #25833 from ankush/translation_fixes 
fix(ux): fix unstranslated text in msgprint/throw
 2021-05-26 14:12:36 +05:30
Deepesh Garg
5e27c7dae2 fix: Add non group filter for account 2021-05-25 22:34:58 +05:30
Deepesh Garg
8fddd0f0c1 fix: Update TDS rate for test 2021-05-25 22:03:50 +05:30
Ankush Menat
ff96bdf0c1
fix(ux): fix unstranslated text in msgprint/throw 2021-05-25 20:59:20 +05:30
Deepesh Garg
81376ea44f
feat: Show net values in Party Accounts (#25714) 2021-05-25 20:39:17 +05:30
Afshan
4d61fa2497
fix: incorrect cr/dr shown in general ledger for multi-currency transactions (#25654) 2021-05-25 19:16:02 +05:30
Deepesh Garg
55a3fb57dd fix: Linting Issues 2021-05-25 17:40:06 +05:30
Deepesh Garg
6f84cee6fe fix: Uncommentt test 2021-05-25 17:39:06 +05:30
Deepesh Garg
b07f7d1b70 fix: Linting and other fixes 2021-05-25 17:39:04 +05:30
Deepesh Garg
c9da1fc568 chore: Test case for adance TDS allocation 2021-05-25 17:37:17 +05:30
Deepesh Garg
a23aaf43f4 fix: Allocate advance taxes only for payment entry 2021-05-25 17:36:06 +05:30
Deepesh Garg
e2f83ffaa4 fix: Linting fixes and other checks 2021-05-25 17:35:41 +05:30
Deepesh Garg
77dcee9d67 fix: Test Cases 2021-05-25 17:35:15 +05:30
Deepesh Garg
fd380d34f9 fix: Linting errors 2021-05-25 17:35:05 +05:30
Deepesh Garg
a87e3fcb7c fix: TDS report cleanup 2021-05-25 17:34:45 +05:30
Deepesh Garg
79b422c0a9 fix: Advance TDS in TDS payable monthly report 2021-05-25 17:33:59 +05:30
Deepesh Garg
d18dde7757 fix: Add tds in PO and code cleanup 2021-05-25 17:32:28 +05:30
Deepesh Garg
c26de28613 fix: TDS against Purhase Orders 2021-05-25 17:25:13 +05:30
Deepesh Garg
61c5e478af feat: Tax deduction against advance payments 2021-05-25 17:20:52 +05:30
Deepesh Garg
c9aa726818 feat: Tax deduction against advance payments 2021-05-25 17:17:40 +05:30
Deepesh Garg
09d9bd19ac
Merge pull request #25816 from deepeshgarg007/jv_diff_ignore_v13 
fix: Ignore rounding diff while importing JV using data import
 2021-05-25 10:59:50 +05:30
rohitwaghchaure
bc7c5bfbe2
Merge pull request #25817 from rohitwaghchaure/fix-removed-serial-no-validate-for-sales-invoice 
fix: removed serial no validation for sales invoice
 2021-05-25 10:40:46 +05:30
Rohit Waghchaure
b4f0347c02 fix: removed serial no validation for sales invoice 2021-05-24 23:39:25 +05:30
Deepesh Garg
7c0383a9a6
Merge pull request #25815 from deepeshgarg007/cash_flow_mapper_v13 
fix: Cashflow mapper not showing data
 2021-05-24 20:40:07 +05:30
Deepesh Garg
25112244ed fix: Ignore rounding diff while importig JV using data import 2021-05-24 20:01:21 +05:30
Deepesh Garg
c348215f61 fix: Cashlfow mapper not showing data 2021-05-24 19:57:53 +05:30
Deepesh Garg
63e4ab4f2d
Merge pull request #25777 from Anuja-pawar/fix-process-SOA-format 
fix: Process Statement of Accounts formatting
 2021-05-24 19:55:21 +05:30
Saqib
b6d061fa8c
fix(pos): handle db lock timeout error while pos closing (#25813) 2021-05-24 18:22:03 +05:30
Nabin Hait
9b912b6adc Merge branch 'version-13' into develop 2021-05-24 16:45:27 +05:30
Saqib
6368c976c7 fix: expected amount in pos closing payments table (#25737) 2021-05-24 16:44:38 +05:30
Suraj Shetty
540c82712a
Merge pull request #25803 from surajshetty3416/fix-extend-cscript 2021-05-23 13:39:09 +05:30
Rucha Mahabal
59961f70ee refactor: timesheet 2021-05-22 10:21:04 +05:30
Suraj Shetty
3e6cc5037b fix: Remove unnecessary code 2021-05-21 17:37:19 +05:30
Suraj Shetty
81d49e9c71 fix: Use extend_cscript function to properly extend class methods to cscript 2021-05-21 17:03:09 +05:30
Saqib
0b5e340b6e
fix(pos): return case for item with available qty equal to one (#25760) 2021-05-21 16:32:56 +05:30
Anuja P
605ea044f3 fix: update process SOA format 2021-05-21 11:24:33 +05:30
Rucha Mahabal
722cfdb7e5
Merge pull request #25701 from anupamvs/timesheet-refactor 
refactor: timesheet
 2021-05-20 23:43:19 +05:30
Rucha Mahabal
a7d0dbb085 fix: calculate total billing amount on fetching timesheets 
- show timesheet billing amounts in doc currency
 2021-05-20 23:02:11 +05:30
Deepesh Garg
42e0692a81
Merge pull request #25704 from CaseSolvedUK/workspace-onlyfor-v13 
fix: filter for Indian workspace card
 2021-05-20 17:10:29 +05:30
Deepesh Garg
9de1a45185
Merge pull request #25699 from Anuja-pawar/fix_process_statement_report 
fix: Process Statement of Accounts formatting
 2021-05-19 19:21:43 +05:30
Saqib Ansari
f79ef5d8cf fix: missing cost center message on creating gl entries 2021-05-19 13:04:44 +05:30
Deepesh Garg
d15d0d8568
Merge pull request #25254 from CaseSolvedUK/taxdetail-v13 
feat: Tax Detail Report
 2021-05-18 22:45:29 +05:30
Saqib
8d7d4b0ba7
fix: expected amount in pos closing payments table (#25737) 2021-05-18 18:39:35 +05:30
Marica
5da34bddd6
Merge pull request #25731 from ankush/escaping_company_name 
fix: escape company name
 2021-05-18 16:35:19 +05:30
Suraj Shetty
a83d2aacd9
Merge branch 'develop' into esbuild 2021-05-18 14:48:28 +05:30
Ankush Menat
b6783b158f
chore: translation fixes 2021-05-17 17:06:41 +05:30
Ankush Menat
f3b3d81e0b
fix: escape company name in deferred_revenue 2021-05-17 17:06:41 +05:30
Nabin Hait
8b2fef11b1 fix: merge conflict 2021-05-17 11:37:14 +05:30
Deepesh Garg
87baa646e7
Merge pull request #25260 from AfshanKhan/dimension-wise-accounts-balance-reports 
feat: Dimension-wise Accounts Balance Report
 2021-05-16 18:04:01 +05:30
Anupam
35137ba9e0 removing currency filter and added rate conversion while fetching timesheets in SI 2021-05-16 14:17:56 +05:30
Anupam
fd4743cc31 refactor: timesheet 2021-05-15 20:01:17 +05:30
Deepesh Garg
55fe85d850
feat(India): Multiple GST enhancement and fixes (#25249) 
* fix: RCM tax calculation

* feat(India): ITC Reversal via Journal Entry

* fix: Reverse Charge booking logic and validation

* fix: Addd patch for availed ITC fields

* fix: Hooks method to update availed ITC field

* fix: Cleanup and fixes in GSTR3B report

* fix: Update params in GSTR-1 report

* fix: Debit note using Sales Invoice

* fix: Setup and patch

* fix: GSTR 3B report cleanup and updates

* fix: Add method to get invoices liable to reverse charge

* fix: Add taxable value in Purchase Invoice Item

* fix: Inward supplies liable to reverse charge

* fix: Linting issues

* fix: GSTR3B report test
 2021-05-14 12:17:41 +05:30
casesolved-co-uk
6ab46e288f fix: workspace formatting due to manual edit and filter tweaks 2021-05-13 12:56:02 +00:00