Ganga Manoj
b4a8bc8e4c
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-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
99cb89f449
fix: Switch debit and credit for ledger entries for discount applied on taxes for Purchase Invoice
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
d6f409addc
fix: Sider issues
2021-07-21 14:23:52 +05:30
GangaManoj
38327fc177
fix: Make additional GL Entries for discount applied on taxes
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
ee025b501f
fix: Filter options for Default Discount Account
2021-07-21 14:21:16 +05:30
GangaManoj
546c8d125c
fix: Move Default Discount Account field to Item Defaults
2021-07-21 14:21:16 +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
cdfefa261e
feat: Assign Item's Default Discount Account if present
2021-07-21 14:20:06 +05:30
GangaManoj
acb9e207ec
feat: Add Default Discount Account field
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
Rucha Mahabal
57514f7b1d
feat(Non Profit): API Endpoint to update halted Razorpay subscriptions ( #26427 ) ( #26564 )
...
* feat: Update Subscription Activated field to Subscription Status to accomodate Halted status
* feat: API Endpoint to halt Razorpay subscription
* fix: sider
* fix: validation message
* test: halted razorpay subscription
2021-07-21 00:46:34 +05:30
Ganga Manoj
41705acbd9
fix: delete child docs when parent doc is deleted ( #26518 )
...
* fix: Make code more readable
* fix: Delete child table info when parent doc is deleted
* fix: Sider issues
* fix: Remove trailing whitespace
2021-07-20 20:48:57 +05:30
Subin Tom
2d225e621f
fix: Price list rate not fetched for return sales invoice fixed ( #26560 )
...
Co-authored-by: Subin Tom <subin-home@Subins-MacBook-Air.local>
2021-07-20 20:41:04 +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
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
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
Deepesh Garg
ce79faa738
Merge pull request #26539 from dj12djdjs/fix-req-argument
...
fix: missing parameter 'country'
2021-07-18 17:48:22 +05:30
Devin Slauenwhite
d5ff636159
fix: missing parameter 'country'
2021-07-17 14:42:38 -04:00
Ankush
d8ed9dfcf4
chore: update CODEOWNERS ( #26536 ) ( #26537 )
2021-07-17 12:49:56 +05:30
Nabin Hait
9ddf33715e
Merge pull request #26513 from rohitwaghchaure/patch-to-fix-missing-fg-item
...
fix: added patch to fix missing FG item
2021-07-16 15:05:23 +05:30
Noah Jacob
3362c080b6
fix: validation check when no conversion_factor ( #26527 )
2021-07-16 15:00:08 +05:30
Rohit Waghchaure
13e9aa5956
fix: added patch to fix missing FG item
2021-07-16 14:34:24 +05:30
Ankush
627a8a8cfd
chore: disable semgrep on push events (bp #26523 )
2021-07-16 13:03:18 +05:30
Ankush
b164070a4f
ci: make semgrep ignore existing errors (bp #26516 )
2021-07-15 19:31:59 +05:30
Afshan
9b9b18c286
fix: improving ux for additional discount field ( #26502 )
2021-07-15 18:11:22 +05:30
Noah Jacob
26a9d38547
fix: WIP needs to be set before submit on skip_transfer ( #26500 )
2021-07-15 16:50:41 +05:30
Noah Jacob
d319e10883
fix: set default operation time to 0 ( #26511 )
2021-07-15 16:49:55 +05:30
