CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-23 05:04:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
40,943 Commits 424 Branches 1,724 Tags
2a615af00a754162c202d10f77e1c1d36a6d48cd
Commit Graph

40943 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rucha Mahabal
3888488b36 fix: precision for expected values in payment entry test 2021-07-08 23:21:48 +05:30
marination
9920747a26 fix: Discount Filtes & Filter behaviour 
- Client: Maintain state where listing is re-rendered due filter trigger
- Client: Handle binding/restoring discount filters separately on filter trigger
- Client: Placeholder Image for search results
- If any filter is checked, query and display items from page 1
- Query Engine: Smaller functions and handle discount filter properly
- Added index on item group and brand for Website item
 2021-07-08 19:34:07 +05:30
Rucha Mahabal
06fc9e7847 fix: sibling group expansion not working for root nodes 2021-07-08 18:44:53 +05:30
Alan
257cbd3b92 fix: track changes on batch (#26382) 2021-07-08 18:44:30 +05:30
Anurag Mishra
a82e9e42e1 fix: query for training Event 2021-07-08 17:27:21 +05:30
Rucha Mahabal
09c24c7949 fix: exclude active node while fetching sibling group 2021-07-08 17:05:40 +05:30
Rucha Mahabal
05ffc0d3e0 feat: use icon for connections on mobile view 2021-07-08 16:55:42 +05:30
marination
f39c6db08a fix: Rename Wishlist Item, Use Website Item Name in Wishlist Cards 
- Renamed Wishlist Items to Wishlist Item
- Use Website Item Name in Wishlist
- Add Website Item Name field in Wishlist Item
- Remove accidental extra `font-size` attribute
 2021-07-08 13:58:56 +05:30
Jannat Patel
cf28950327 Merge pull request #26349 from Anurag810/salary-slip-fix--hotfix 
fix: payroll-entry minor fix
 2021-07-08 13:43:55 +05:30
Anurag Mishra
8f945a9852 fix: Removed un-used flag 2021-07-08 13:06:04 +05:30
marination
c844f3a612 fix: Sync Website Items on Item Change, Short Website Description 
- Added Short Description in Website Item for List View
- Update Website Item on Item info change
- Un-publish Web Item if Item is disabled
- Removed unnecessary dependency on Item from query engine
- Rearranged item detail fields in Website Item
- Added Link to Website Item on Item Dashboard
 2021-07-08 12:52:57 +05:30
Rucha Mahabal
48018b8d8c fix: do not sort by number of connections 2021-07-08 11:23:50 +05:30
marination
2107883301 Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into e-commerce-refactor 2021-07-08 11:12:14 +05:30
marination
66a7924d97 feat: Guest Display Settings 
- Re-arranged Settings checkboxes
- Deleted `show_availability_status` from E Commerce Settings
- Added `Hide Price for Guest` functionality
- Added Custom Redirection for Guest Actions in  E Commerce Settings
- Minor cleanups
 2021-07-08 10:57:01 +05:30
Rucha Mahabal
df3bb9ea8c perf: Optimise Rendering 
- optimise get_children function

- use promises instead of callbacks

- optimise selectors

- use const wherever possible

- use pure js instead of jquery for connectors for faster rendering
 2021-07-08 09:53:31 +05:30
Mohammad Hasnain Mohsin Rajan
00f90c50c0 chore: add product listing link in settings (#26026) 
* chore: add product listing link in settings

* chore: add icon in workspace card

Co-authored-by: Ankush <ankush@iwebnotes.com>
 2021-07-07 18:21:12 +05:30
marination
bcaea4932d fix: Filters state, Search input clearing, Paging buttons 
- Fixed repetitive calls on checking filter checkbox
- Query count of items after offset for accurate Paging button display
- Order items by ranking in query
- Search results get empty on clearing input
 2021-07-07 16:30:56 +05:30
Rucha Mahabal
6eec251273 feat: handle multiple root / orphan nodes 2021-07-07 12:05:50 +05:30
Sagar Vora
ea2470d174 Merge pull request #26361 from ankush/backport/version-13-pre-release/pr-26354 
fix: stock_rbnb not defined (#26354)
 2021-07-07 11:59:37 +05:30
Noah Jacob
a01264dae7 fix: stock_rbnb not defined (#26354) 2021-07-07 11:07:19 +05:30
Deepesh Garg
cc57be51be Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into gstr_1_cdnr_unregistered_json 2021-07-07 10:17:59 +05:30
Rucha Mahabal
6d5ee25bba fix: unnecessary variables 2021-07-07 09:43:28 +05:30
rohitwaghchaure
f130f8385e Merge pull request #26332 from rohitwaghchaure/fixed-bom-stock-report-not-working 
fix: bom stock report not working
 2021-07-07 00:22:03 +05:30
rohitwaghchaure
2bdc0e8993 Merge pull request #26350 from rohitwaghchaure/fixed-putaway-fixing-for-material-receipt 
fix: stock entry with putaway rule not working
 2021-07-07 00:15:26 +05:30
Rohit Waghchaure
0bd190b885 fix: stock entry with putaway rule not working 2021-07-07 00:14:51 +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
67c7067778 Merge pull request #26300 from AfshanKhan/fix-account-selection-gst-settings-v13 
fix: only "Tax" type accounts should be shown for selection in GST Settings
 2021-07-06 20:33:41 +05:30
Saqib
422325bb74 test: fetching of previous sle (#26352) 2021-07-06 18:37:12 +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
Rucha Mahabal
ad06603392 fix: removing orphaned connectors 2021-07-06 18:16:49 +05:30
Noah Jacob
5e99aa7f65 fix: stock_rbnb not defined (#26354) 2021-07-06 18:00:35 +05:30
Deepesh Garg
7f794cc0ea fix: Purchase Invoice advance test case 2021-07-06 17:58:44 +05:30
Afshan
c8eca8a448 fix: remove cancelled entries in consolidated financial statements (#26331) 2021-07-06 14:37:57 +05:30
Anurag Mishra
f0b62f70d5 fix: payroll-entry minor fix 2021-07-06 13:40:22 +05:30
Mohammed Yusuf Shaikh
842674ce79 fix: Added a message to enable appontment booking if disabled (#26334) 2021-07-06 13:34:32 +05:30
Marica
dfe11aca6a Merge pull request #26284 from marination/order-by-weightage-for-web-items 
fix: Order Items by weightage in the web items query
 2021-07-06 13:20:08 +05:30
Deepesh Garg
05b93063aa Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into gstr_1_cdnr_unregistered_json 2021-07-06 11:27:18 +05:30
rohitwaghchaure
7b781b1498 Merge pull request #26158 from marination/stock-reco-repost_qty 
fix: Include Stock Reco logic in `update_qty_in_future_sle`
 2021-07-06 11:22:26 +05:30
marination
57d06a86f8 chore: Test to block backdated reco causing future scarcity 2021-07-05 21:56:57 +05:30
Marica
4f51b56928 Merge branch 'version-13-hotfix' into stock-reco-repost_qty 2021-07-05 20:26:01 +05:30
marination
fa9e67502c chore: Test for backdated reco qty reposting 2021-07-05 20:23:00 +05:30
Deepesh Garg
9b6d9a41f4 fix: Test Cases 2021-07-05 17:08:27 +05:30
Deepesh Garg
15b336df28 fix: Test cases 2021-07-05 14:45:33 +05:30
marination
c69bc54297 fix: Validate LCV for Invoices without Update Stock 2021-07-05 14:24:38 +05:30
Rohit Waghchaure
5638fbb1aa fix: bom stock report not working 2021-07-05 13:54:05 +05:30
Deepesh Garg
db682d9e4c fix: Create mode of payment if doesn't exists 2021-07-05 13:46:03 +05:30
Richard Case
75fdf79376 fix: incorrect bom no. added for non-variant items on variant boms (#26320) 2021-07-05 10:56:34 +05:30
Deepesh Garg
a0599e5ac2 fix: Test cases for M-pesa 2021-07-05 10:09:42 +05:30
rohitwaghchaure
22c2d4f118 Merge pull request #26312 from rohitwaghchaure/fixed-employee-issue-in-job-card 
fix: allow to make job card without employee
 2021-07-04 22:58:50 +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