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

30730 Commits

Author SHA1 Message Date
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
marination
9fb61efba8 chore: Fix imports and formatting (linter) & Sider (unused import) 2022-02-01 00:54:54 +05:30
marination
b2b827f50f chore: Adjust to ESbuild and missing imports 
- update erpnext web bundle and tweak to fit new build system
- change page id in scss due to change in v14 router
- add missing imports
 2022-02-01 00:03:08 +05:30
Deepesh Garg
dcd99a82cb
Merge pull request #29536 from nabinhait/cost-center-allocation 
feat: Cost Center Allocation
 2022-01-31 21:27:15 +05:30
Nabin Hait
5b0ec6437b fix: sider issues 2022-01-31 18:41:42 +05:30
Nabin Hait
6099af5d00 fix: Fixed test case and sider issues 2022-01-31 17:43:37 +05:30
Ankush Menat
bba31a37f4 fix: missing validate_item_group_defaults function 2022-01-31 17:15:17 +05:30
Ankush Menat
6cd7c47409 Merge branch 'develop' into e-commerce-refactor-develop 2022-01-31 17:14:36 +05:30
Nabin Hait
3dadfc9048 patch: Removed files and code related to old distributed cost center feature 2022-01-31 15:58:40 +05:30
rohitwaghchaure
f026ec6bad
Merge pull request #29522 from ankush/drop_bom_level 
refactor!: dynamically compute bom_level
 2022-01-31 15:58:25 +05:30
Ankush Menat
a254201696
chore: revert manual handling of stock level section (#29537) 2022-01-31 15:37:19 +05:30
Rucha Mahabal
1361f88f67 fix: do not hide Loan Repayment Entry field in salary slip 2022-01-31 14:53:13 +05:30
Ankush Menat
5aa1b6bc38
Merge pull request #29519 from ankush/unique_bin 
fix: bin uniqueness
 2022-01-31 14:29:22 +05:30
Ankush Menat
0a15334464 fix: update reserved qty for production/ s/c 2022-01-31 14:10:42 +05:30
Nabin Hait
c09d5a613e fix: Delete old fields from cost center related to distributed cost center 2022-01-31 13:26:09 +05:30
Nabin Hait
ce49e6ccf7 fix: Resolved conflicts in patches 2022-01-31 13:25:44 +05:30
Nabin Hait
174104c0d4 feat: Workspace link for Cost Center Allocation 2022-01-31 13:24:18 +05:30
Nabin Hait
004c1ed094 feat: Split Gl Entry based on cost center allocation 2022-01-31 13:24:18 +05:30
Nabin Hait
ac2e19103f Cost Center Allocation doctype, validations and test cases 2022-01-31 13:24:18 +05:30
Nabin Hait
d71d3e3b3e fix: Minor issues in existing patches 2022-01-31 13:24:18 +05:30
Subin Tom
05bbb69d0e
fix: Validation for invalid serial nos at POS invoice level (#29447) 2022-01-31 13:08:19 +05:30
Anupam Kumar
896adc3759
fix: not able to declare opportunity lost without competitors (#29531) 2022-01-31 12:09:54 +05:30
Saqib Ansari
6b377703b3
Merge pull request #29454 from nextchamp-saqib/fix-dn-mapping 
fix(sales order): incorrect no. of items fetched while creating dn
 2022-01-31 11:38:57 +05:30
Saqib Ansari
1170bee951
Merge pull request #29480 from nextchamp-saqib/revert-drop-einvoicing 
revert: "refactor!: drop e-invoicing integration from erpnext"
 2022-01-31 11:35:48 +05:30
Himanshu
319322228a
fix: fetch image form item (#29523) 2022-01-31 10:56:00 +05:30
Ankush Menat
d38fd8635c fix(ux): sort multi-production item plans correctly 2022-01-30 22:58:30 +05:30
Ankush Menat
157b4b33fe refactor!: dynamically compute bom_level 2022-01-30 22:06:24 +05:30
aaronmenezes
0f7c2a19de
fix: cost of poor quality report time filters not working (#28958) 
* fix: cost of poor quality report time filters not working

* chore:update cost of poor quality report to use query builder

* fix: linter warnings

* chore: updated report query

* chore: added test filters

* fix : cleared linter warnings

* chore: formatting

* refactor: query generation

- optionally apply date filters
- join instead of expensive sub-query
- return as dictionary

* test: simplify test

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-01-30 20:22:39 +05:30
Ankush Menat
c2ecc7a2d1 refactor: patch for fixing broken bins 
fix(patch): delete fully broken bins

if bin doesn't have item_code or warehouse then it's not recoverable.
 2022-01-30 18:43:02 +05:30
Sagar Sharma
7ff3ca25e5 fix(patch): patch duplicate bins 2022-01-30 18:43:02 +05:30
Ankush Menat
a1e7771cdd fix: ignore None item/wh whie updating reservation 2022-01-30 18:43:02 +05:30
Ankush Menat
08810dbcce fix: add unique constraint on bin at db level 2022-01-30 18:42:59 +05:30
smehata
b818b93568
Update sales_invoice.js (#29491) 
undefined issue
 2022-01-30 17:27:20 +05:30
Deepesh Garg
d41f71acb7
Merge pull request #29499 from deepeshgarg007/overseas_gst_tax 
fix(India): Tax calculation for overseas suppliers
 2022-01-30 11:36:54 +05:30
Anupam Kumar
925eca0e4a
fix: multiple CRM fixes (#29507) 
* fix: multiple CRM fixes
 2022-01-29 22:32:03 +05:30
Rucha Mahabal
0d5993d288
Merge branch 'develop' into fix-interview-ratings 2022-01-29 21:24:46 +05:30
Rucha Mahabal
d98290bfb9 test: get interview details for applicant dashboard 
- rectify tests as per new rating field changes (fractional and configurable)
 2022-01-29 21:15:49 +05:30
Rucha Mahabal
d96f4bf628 fix: move average calculation to interview controller 2022-01-29 20:27:15 +05:30
Rucha Mahabal
69eb3a0ac9 fix: interview ratings on job applicant dashboard 2022-01-29 20:05:07 +05:30
Rucha Mahabal
5d85c5a660 fix: designation mapping from job applicant to job offer 
- group create buttons
 2022-01-29 20:04:40 +05:30
Deepesh Garg
92416d80e6
Merge branch 'develop' into overseas_gst_tax 2022-01-29 18:48:23 +05:30
Saqib Ansari
b8802a3315 fix: patch order 2022-01-29 18:31:55 +05:30
Deepesh Garg
eba06212e8
Merge pull request #29350 from deepeshgarg007/asset_split 
feat: Splitting group assets
 2022-01-29 16:12:04 +05:30
Rucha Mahabal
36882f3734
fix: Employee Onboarding and Separation UX (#29504) 2022-01-29 15:27:36 +05:30
Ankush Menat
43bd88e741 fix: work order serial no allows storing whitespace 2022-01-29 14:01:21 +05:30
Ankush Menat
e177c5277f fix: extend sr_no cleanup to packed items too 2022-01-29 14:01:21 +05:30
Ankush Menat
b20df3745e refactor: reusable clean_serial_nos 2022-01-29 14:01:21 +05:30
Ankush Menat
14e3e163ae fix: ignore alternate item while checking pending qty 2022-01-29 13:59:25 +05:30
Deepesh Garg
2bf405d44c fix:Add shipping charges to taxes only if applicable 
(cherry picked from commit e8bc4f12a734ff286a008e6b31dffa9c6c946365)
 2022-01-29 07:27:21 +00:00
Deepesh Garg
4d87465698
Merge branch 'develop' into asset_split 2022-01-29 12:54:44 +05:30
Saqib Ansari
452a809ef4
Merge pull request #28877 from nextchamp-saqib/multiple-pricing-rule-fix 
fix: qty filter not working if apply_multiple_pricing_rules is enabled
 2022-01-29 12:43:41 +05:30
Saqib Ansari
4c8408a572
Merge branch 'develop' into fix-dn-mapping 2022-01-29 12:42:19 +05:30
Saqib Ansari
04a28df170 fix: remove invalid patch 2022-01-29 12:40:25 +05:30
Deepesh Garg
5090959dc1 Merge branch 'develop' of https://github.com/frappe/erpnext into asset_split 2022-01-29 12:12:52 +05:30
marination
2f4d266ee1 refactor: Price fetching and updation logic 
- fetch price from price list, use item master valuation rate as fallback fo0r packed item
- use a item code, item row name map to maintain cumulative price
- reset table if item in a row is replaced
- loop over items table only to set price, lesser iterations than packed items table
 2022-01-28 19:03:40 +05:30
Saqib Ansari
a1f3dc4e9e chore: remove unnecessary imports 2022-01-28 16:58:13 +05:30
Deepesh Garg
e45c38337c fix(India) Tax calculation for overseas suppliers 2022-01-28 16:10:30 +05:30
Saqib Ansari
2c100a5313
Merge branch 'develop' into revert-drop-einvoicing 2022-01-28 14:34:29 +05:30
Ankush Menat
28994c0e76 test: delete data after running test 2022-01-28 13:50:57 +05:30
marination
2c14ab0439 chore: Break updation logic into smaller functions 
- Smaller functions for updation
- All calls visible from parent function to avoid context switching due to nested calls
 2022-01-28 13:25:55 +05:30
Ankush Menat
e4c220053f fix(patch): update BOMs to have correct transfer_material_against 2022-01-28 13:22:47 +05:30
Ankush Menat
86efa0dbfd fix: ensure correct-ish transfer against 2022-01-28 13:22:47 +05:30
Saqib Ansari
02af32dde6 fix: incorrect patch path 2022-01-28 10:17:16 +05:30
Saqib
139d5e17a9 fix: do not get password if client_secret is not set (#28547) 2022-01-27 20:24:05 +05:30
Saqib
c98887d39d fix(e-invoicing): totals validation of e-invoices (#28418) 2022-01-27 20:23:46 +05:30
mergify[bot]
0dafa8a12a
fix: stock ledger rendering glitch 
undefined Issue

(cherry picked from commit f38004219518e901eb736780b181c19fe88ce823)

Co-authored-by: smehata <53169014+smehata@users.noreply.github.com>
 2022-01-27 20:23:24 +05:30
Saqib
eb057b6bfe fix(e-invoicing): link to error log list 2022-01-27 20:19:56 +05:30
Saqib
0b626816d0 feat(e-invoicing): dispatch address (#28084) 2022-01-27 20:19:37 +05:30
Saqib
b262f48553 fix: 'NoneType' has no attribute 'name' (#27375) 2022-01-27 20:19:22 +05:30
Saqib Ansari
1076e96b87 Revert "refactor!: remove e_invoice utils (#27167)" 
This reverts commit 8ed6338336.
 2022-01-27 20:10:18 +05:30
Saqib Ansari
c5782b0e71 revert: "refactor!: drop e-invoicing integration from erpnext (#26940)" 
This reverts commit c335962827.
 2022-01-27 20:09:56 +05:30
Ankush Menat
b05287dea0
fix: drop six code (#29479) 2022-01-27 20:08:05 +05:30
rohitwaghchaure
b75b00fefc
feat: provision to exclude exploded items in the BOM (#29450) 2022-01-27 12:44:01 +05:30
Suraj Shetty
0cb965f223
Merge pull request #29471 from frappe/fix-sorting 2022-01-27 11:15:57 +05:30
Suraj Shetty
29c7947db0 fix: Further sort sales_order_analysis to get consistent response 
Since the data was sorted by `transaction_date`, report sorting order used to be inconsistent everytime if there were lots of records with same transaction date. This used to create problems while exporting report as "Excel" with filters.
 2022-01-27 11:11:37 +05:30
Rucha Mahabal
6c1c85be0c
feat: additional doctypes access for ESS user (#29317) 2022-01-27 00:51:29 +05:30
Ankush Menat
7eab945d8c
refactor: move existing patches to post migration (#28940) 
Also remove duplicates :')
 2022-01-26 12:40:21 +05:30
marination
4c677eafe9 fix: Linter and minor code refactor 
- Create an indexed map of stale packed items table to avoid loops to check if packed item row exists
- Reset packed items if row deletion takes place
- Renamed functions to self-explain them
- Split long function
- Reduce function calls inside function (makes it harder to follow through)
 2022-01-26 01:10:24 +05:30