Rucha Mahabal
0222ee0358
fix: sider
2021-07-20 12:19:44 +05:30
Suraj Shetty
8790248318
Merge pull request #26554 from surajshetty3416/fix-customer-quick-entry
...
fix: Pass doc and other parameters to properly prefill information
2021-07-20 11:39:32 +05:30
Suraj Shetty
cbe5718db9
Merge pull request #26555 from surajshetty3416/fix-customer-quick-entry-version-13-hotfix
2021-07-20 11:13:21 +05:30
Rucha Mahabal
41dd0c5a8a
fix: sider
2021-07-20 10:55:05 +05:30
Suraj Shetty
85c8daae9c
fix: Pass doc and other parameters to properly prefill information - while creating customer from form dashboard
2021-07-20 10:24:14 +05:30
Rucha Mahabal
eb65ce662a
fix(test): increase timeout for record creation
2021-07-20 10:23:52 +05:30
Suraj Shetty
c077314568
fix: Pass doc and other parameters to properly prefill information
...
- while creating customer from form dashboard
2021-07-20 09:57:18 +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
Ganga Manoj
0ea2934cd5
fix: GL Entry creation
...
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2021-07-19 23:44:55 +05:30
Ganga Manoj
63b7ecd0fe
fix: Use the item's project instead of the invoice's
...
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2021-07-19 23:44:21 +05:30
Ganga Manoj
980798c6fd
fix: Use the item's cost centre instead of the Invoice's
...
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2021-07-19 23:43:36 +05:30
Rucha Mahabal
7176c0847e
fix: tests
2021-07-19 23:34:02 +05:30
Rucha Mahabal
89c5bb6066
fix: tests
2021-07-19 22:19:28 +05:30
Ankush
92273cade0
fix(ux): item description should fall back to name ( #26339 ) ( #26552 )
...
Don't set item description = item code from front end. This is already
being set to item_name in before_insert and item_name is better
fallback than item code for description.
Also fixed wrong condition for erasing description while duplicating
item.
2021-07-19 20:44:05 +05:30
Ankush
80e269887d
fix(ux): item description should fall back to name ( #26339 )
...
Don't set item description = item code from front end. This is already
being set to item_name in before_insert and item_name is better
fallback than item code for description.
Also fixed wrong condition for erasing description while duplicating
item.
2021-07-19 20:42:44 +05:30
Anuja Pawar
ba31e3695f
Merge branch 'develop' into sa-vat-report
2021-07-19 20:40:25 +05:30
Ankush
c86656f499
Merge branch 'develop' into ignore-mandatory-in-payment-reconcilitation
2021-07-19 20:36:59 +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
23b1c25ff5
fix:Ignore mandatory fields while creating payment reconciliation Journal Entry
2021-07-19 20:09:37 +05:30
Rucha Mahabal
e327148edf
fix: tests
2021-07-19 17:34:15 +05:30
Rucha Mahabal
6e46be5058
fix(tests): apply filters correctly
2021-07-19 17:03:17 +05:30
Rucha Mahabal
7270ab5c20
fix(tests): clear filter before typing
2021-07-19 16:26:17 +05:30
Rucha Mahabal
9d89b2afcf
fix: UI tests
2021-07-19 15:47:31 +05:30
Subin Tom
b24a149dbc
test: Updated test case for Eway bill
2021-07-19 14:37:12 +05:30
Deepesh Garg
cad1170782
fix: Add missing cess amount in GSTR-3B report
2021-07-19 14:36:54 +05:30
Deepesh Garg
354e2984c2
Merge pull request #26541 from deepeshgarg007/travis_tax_setup
...
fix: Typo and remove duplicate function
2021-07-19 10:42:58 +05:30
Deepesh Garg
2686d04800
fix: Typo and remove duplicate function
2021-07-18 17:54:35 +05:30
Deepesh Garg
ce79faa738
Merge pull request #26539 from dj12djdjs/fix-req-argument
...
fix: missing parameter 'country'
2021-07-18 17:48:22 +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
228499369c
fix: Switch debit and credit for ledger entries for discount applied on taxes for Purchase Invoice
2021-07-17 19:49:16 +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
Ankush
d8ed9dfcf4
chore: update CODEOWNERS ( #26536 ) ( #26537 )
2021-07-17 12:49:56 +05:30
Ankush
70a7252469
chore: update CODEOWNERS ( #26536 )
2021-07-17 12:48:40 +05:30
Nabin Hait
11475487fb
fix: merge conflict
2021-07-16 15:58:50 +05:30
Nabin Hait
4e6f49209f
Merge branch 'version-13-pre-release' into version-13
2021-07-16 15:21:33 +05:30
