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

40399 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rucha Mahabal
da7494c208
fix: Program Enrollment tests (#29592) 2022-02-02 17:30:29 +05:30
marination
4b62d2d7fe fix: (Linter) Write queries using QB/ORM and other minor lines for semgrep to skip 2022-02-02 12:58:31 +05:30
Marica
780e29b42e
Merge branch 'develop' into e-commerce-refactor-develop 2022-02-02 10:45:14 +05:30
marination
8c90c505c0 fix: (minor) build issues on cart and item page 
- Move `cart.js` to public/js directory
- Reorder import sequence in erpnext web bundle
- Removed unused script block
 2022-02-02 10:40:45 +05:30
Nabin Hait
bf3caab63c fix: future recurring period calculation 2022-02-01 23:42:50 +05:30
Nabin Hait
008b331f49 Merge branch 'cc-allocation' into develop 2022-02-01 22:27:23 +05:30
Nabin Hait
81d1ad6059 fix: Allocation percentage fieldtype changed to percent 2022-02-01 22:26:39 +05:30
Nabin Hait
364856b7c5 fix: patch for migrating cost center allocations 2022-02-01 22:26:03 +05:30
Nabin Hait
5f03292aba
fix: Future recurring period calculation for addl salary (#29578) 2022-02-01 21:47:15 +05:30
Rucha Mahabal
1710aef0a9
fix: employee reminders fixes (#29548) 2022-02-01 19:46:39 +05:30
Ankush Menat
a3a05c0c23
fix: don't show "create" on cancelled BOMs (#29570) 2022-02-01 17:40:06 +05:30
Saqib Ansari
4055cc76a7
Merge pull request #29556 from nextchamp-saqib/nemesis189-pos-service-items 
feat: Allowing non stock items in POS
 2022-02-01 16:36:10 +05:30
Rucha Mahabal
0dde0ece10
fix: leave application tests (#29539) 2022-02-01 16:00:02 +05:30
Saqib Ansari
bf70feb7c9 fix: flaky test 2022-02-01 15:26:33 +05:30
Deepesh Garg
528c71382f
feat: Provisional accounting for expenses (#29451) 
* feat: Provisonal accounting for expenses

* fix: Method for provisional accounting entry

* chore: Add test case

* fix: Remove test case

* fix: Use company doctype

* fix: Add provisional expense account field in Purchase Receipt Item

* fix: Test case

* fix: Move provisional expense account to parent

* fix: Patch
 2022-02-01 14:42:55 +05:30
Saqib Ansari
4e4159ec06 chore: remove unused import 2022-02-01 14:02:52 +05:30
Saqib Ansari
2aca54eb38 chore: remove useless rollback 2022-02-01 13:17:01 +05:30
Saqib Ansari
650d44a714 test: point of sale search 2022-02-01 13:14:28 +05:30
Saqib Ansari
4557b6a150
Merge branch 'develop' into pos-service-items 2022-02-01 12:25:25 +05:30
Deepesh Garg
cb3754a102
Merge pull request #29535 from ruchamahabal/fix-loan-repayment 
fix: do not hide Loan Repayment Entry field in salary slip
 2022-02-01 12:18:47 +05:30
marination
9eeddc28b0 fix: Merge conflict inconsistency due to https://github.com/frappe/erpnext/pull/27931 2022-02-01 12:15:48 +05:30
marination
2933cf243a fix: Failing test, sider and linter 
- Remove unused imports
- fix test `test_product_list_attribute_filter_builder`
 2022-02-01 12:08:33 +05:30
rohitwaghchaure
62e5aa7d72
Merge pull request #29359 from KrithiRamani/foc_item 
fix: bypass selling price validation for free item
 2022-02-01 11:54:01 +05:30
Deepesh Garg
fa2b3eb414
Merge branch 'develop' into fix-loan-repayment 2022-02-01 11:12:39 +05:30
marination
1d7f313b92 debug: CI 2022-02-01 11:12:05 +05:30
marination
00752ca01d fix: Wrong variable name breaks Cart Items rendering 2022-02-01 11:11:58 +05:30
marination
143ff715e7 fix: (test) set user for price test 2022-02-01 11:11:38 +05:30
marination
606f23b667 fix: Sider and Linter 2022-02-01 11:11:29 +05:30
marination
4f7ec25bbe tests: Variant without web item price fetch and add to cart 
- Also, optionally get image from template web item for cart if variant has no image
 2022-02-01 11:11:18 +05:30
marination
47c8ad0b94 fix: Cart Logic of Item variant without Website Item 2022-02-01 11:11:11 +05:30
marination
f2fbe9049f fix: Server Side test - teardown correctly 2022-02-01 11:10:04 +05:30
marination
2623046ba7 test: Variant Selector - Fetch next valid Attribute values fetching after selection of one 2022-02-01 11:09:46 +05:30
marination
5a462db207 test: Variant Selector - Attribute Value fetching 2022-02-01 11:09:35 +05:30
marination
6c7b3026c9 fix: Behaviour if Item Variants Cache generation 
- Revert to old behaviour where variant doesnt need to be published
- Delete unused functions
 2022-02-01 11:08:30 +05:30
marination
20c71edc84 fix: Exclude unpublished items while fetching items from other item groups 2022-02-01 11:07:53 +05:30
Devin Slauenwhite
28e0c1acdc fix(ux): tripple digit cart qty 2022-02-01 11:07:33 +05:30
Devin Slauenwhite
49cdf9b7b0 fix(e-commerce): shopping cart total quantity (#29076) 
* fix: shopping cart total quantity

* fix: linter error
 2022-02-01 11:06:33 +05:30
marination
45fadb5235 fix: Faulty 'continue' not setting value in db 2022-02-01 11:03:12 +05:30
marination
091a07c6df fix: Code cleanup 2022-02-01 11:03:05 +05:30
marination
31a2485bcd fix: Sider 2022-02-01 11:02:59 +05:30
marination
456f27724c fix: Convert Item links to Website Item links in Item Card Group template data 
- Changed link option to Website Item in Item card group template
- patch to convert pre-existing data
 2022-02-01 11:02:48 +05:30
Devin Slauenwhite
262fcbd9fb fix(test): e-commerce fetch logged-in user item price. 2022-02-01 11:00:37 +05:30
Devin Slauenwhite
18e70e8229 test: e-commerce customer pricing rule 2022-02-01 11:00:28 +05:30
Devin Slauenwhite
282fbf4b07 fix: fetch correct selling price. 2022-02-01 10:59:57 +05:30
Dany Robert
d4c74b546d fix: no module named 'redisearch' (#28818) 
* chore: rename file to avoid the overriding

* fix: rename ref #1

* fix: rename ref in e_commerce_settings

* fix: rename ref in product_search.py

* chore: rename rsearch.py to redisearch_utils.py

* chore: rename rsearch to redisearch_utils in product_search
 2022-02-01 10:58:18 +05:30
marination
02d92070be fix: search_box_id instead of search_box_class 2022-02-01 10:55:37 +05:30
marination
6583a83dd3 fix: Sider (missing semicolon) 2022-02-01 10:55:27 +05:30
marination
f63f250630 feat: Allow addition of custom search box 
- allow passing custom search box class to bind search actions on
- this allows users to inject and get a custom search box running on any page
 2022-02-01 10:55:05 +05:30
marination
7bc087ed44 fix: Merge conflicts, Linter and Server Test 
- Resolve inconsistency due to conflict with https://github.com/frappe/erpnext/pull/27050
- Resolve Linter issues (imports and spaces)
- Include customer_reviews.js in bundle, move it to /public/js
 2022-02-01 10:51:50 +05:30
Marica
19e5dfbb7c
Merge branch 'develop' into e-commerce-refactor-develop 2022-02-01 00:56:11 +05:30