nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-07 23:31:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
37,563 Commits 459 Branches 1,746 Tags
7aaecbcac9befd13242ea05df8513804fa4faabf
Commit Graph

37563 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
8a64a84d1a fix: GST Reports timeout issue 2021-07-21 13:25:53 +05:30
rohitwaghchaure
f60cba28ab Merge pull request #26506 from 18alantom/bp-fix-ig-portal-field-filter 
fix: check if field_filters is None
 2021-07-21 11:28: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
Rohit Waghchaure
c14aa45720 fix: incorrect valuation rate calculation in gross profit report 2021-07-20 18:19:15 +05:30
Rucha Mahabal
0222ee0358 fix: sider 2021-07-20 12:19:44 +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
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
Subin Tom
ff9d631f15 fix:Ignore mandatory fields while creating payment reconciliation Journal Entry 2021-07-19 20:28:34 +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
Deepesh Garg
cad1170782 fix: Add missing cess amount in GSTR-3B report 2021-07-19 14:36:54 +05:30
marination
7ef2af203f test: Website Item basic test & removed product configurator tests 
- Sider fixes: missing semicolons
- Added two basic tests for Website Item
- Commented Product Configurator tests, needs to re-written fully
 2021-07-19 13:27:17 +05:30
marination
ece4f391ac fix: Remove Website Item from Item Dashboard 
- Install breaks on CI, will add later
 2021-07-19 13:26:08 +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
Marica
ea96afca62 Merge branch 'version-13-hotfix' into e-commerce-refactor 2021-07-16 15:17:37 +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
Rucha Mahabal
2c3866a53e ci(cypress): use env variable for key 
documentation ref: https://docs.cypress.io/guides/guides/command-line\#cypress-run
 2021-07-16 10:32:38 +05:30
GangaManoj
56cdcebbf4 fix: Sider issues 2021-07-16 02:23:55 +05:30
marination
401cbc01a9 Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into e-commerce-refactor 2021-07-15 21:03:01 +05:30
marination
bb60523fa7 feat: Cart minor UI/UX Refresh 
- Added Setting to show or hide price if checkout is disabled
- Show Web Item name in cart instead of Desk Item name
- Cart minor UI Refresh: added images in cart
- Cart minor UI Refresh: repositioned remove button and redesigned
- Cart minor UI Refresh: Payment Summary section
- Cart minor UI Refresh: Disable input on free item
- Cart minor UI Refresh: Add address button in cards
- New file for cart payment summary UI with coupon code (old)
 2021-07-15 20:09:02 +05:30
Rucha Mahabal
8961a267f6 fix: sider 2021-07-15 19:32:15 +05:30
Ankush
b164070a4f ci: make semgrep ignore existing errors (bp #26516) 2021-07-15 19:31:59 +05:30
Rucha Mahabal
ee7eaf9c70 test: UI tests for org chart mobile 
fix(mobile): detach node before emptying hierarchy

fix(mobile): sibling group not rendering for first level
 2021-07-15 19:19:09 +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
Deepesh Garg
dfadae6a92 fix: Report and JSON generation for Advances received 2021-07-15 15:36:54 +05:30
rohitwaghchaure
4d444559ff Merge pull request #26508 from rohitwaghchaure/fixed-fg-items-not-added-for-batch-item 
fix: FG item not fetched in manufacture entry
 2021-07-15 15:32:05 +05:30
Rohit Waghchaure
74b97b5ec9 fix: FG item not fetched in manufacture entry 2021-07-15 14:52:21 +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
18alantom
12f7befa13 fix: check if field_filters is None 2021-07-15 12:09:33 +05:30
Rucha Mahabal
f004b404d1 test: UI tests for org chart desktop 2021-07-14 23:50:54 +05:30
Marica
4aebb64165 Merge pull request #26498 from marination/paging-btns-htofix 
fix: Paging buttons not working on item group portal page
 2021-07-14 21:21:20 +05:30