marination
03b88bd7b8
fix: Items Query, Sub categories, Review Button
...
- Include Item Variant table in query only if attributes are involved
- Render sub categories of they exist, even without items
- 'Write a Review' provision only if user is a customer
2021-11-16 16:36:29 +05:30
marination
499fb56c0f
fix: Move get_product_filtrs_data to website item file
2021-11-16 16:36:15 +05:30
marination
423d7516b4
fix: Empty states and miscellanous fixes
...
- Added Wishlist and Product Listing empty states
- Hide ‘Write Review’ button f user is not Customer
- Fixed grid view title (missing arg)
- Render empty state if no items form server side
- Removed unused function
- Guest user redirected to login on clicking Wishlist button
- Fixed ‘Notes’ field clearing issue
2021-11-16 16:35:43 +05:30
marination
d29b94f46e
fix: Patch fix for fresh installs
...
- minor sider fix
- patch fix for fresh installs
2021-11-16 16:35:22 +05:30
marination
8c20f66905
fix: Sider and Patches
...
- Sider fixes
- Deleted patches that worked as per old schema
- Cleared instances of web fields linked to Item master
2021-11-16 16:34:24 +05:30
marination
897c08c8e7
feat: Product View toggling
...
- Added fully functional list and grid view toggling
- Added ProductGrid and ProductList controllers
- Moved html snippets, rendered via JS now
- Item Group page also rendered via common controller
- Paging section rendered via JS
- Minor style changes
2021-11-16 16:14:59 +05:30
marination
48b3ce82b9
feat: (wip) Toggle Views
...
- Auto Height on Cards
- Title with ellipses on length exceed
- Changed namepaces
- Moved product card rendering to JS
- Added Image and List View Toggling buttons
- Kept basic filters rendering just as before
2021-11-16 16:11:09 +05:30
marination
f9929ed8a6
Merge branch 'develop' of https://github.com/frappe/erpnext into e-commerce-refactor-develop
2021-11-16 16:06:07 +05:30
Ahmed Shareef
952fc87c99
refactor: fix help section background in dark mode ( #28406 )
2021-11-16 14:30:13 +05:30
rohitwaghchaure
aaf0e4e709
Merge pull request #28398 from rohitwaghchaure/fix-pricing-rule-creation-against-promotional-scheme
...
fix: Pricing Rule not created against the Promotional Scheme
2021-11-16 13:54:26 +05:30
Kenneth Sequeira
f786a596f8
chore: add docker pull count to readme ( #28405 )
2021-11-16 12:01:26 +05:30
Rohit Waghchaure
d82910b08a
fix: Pricing Rule not created against the Promotional Scheme
2021-11-16 10:27:59 +05:30
Ankush Menat
ed99aca36f
test: basic test for serialize reco cancel
2021-11-16 10:00:18 +05:30
Ankush Menat
8c85012a70
fix: can not cancel stock reconciliation with sr no
2021-11-16 10:00:18 +05:30
Rohan
043e3255d6
fix: remove item-item group name validation ( #28392 )
2021-11-15 19:41:17 +05:30
Deepesh Garg
ce06aaa0ae
Merge pull request #27735 from GangaManoj/fix-so-cancellation-message
...
fix: Sales Order cancellation message
2021-11-15 18:51:30 +05:30
Ankush Menat
54184e54ed
fix: patch for naming series property setter
2021-11-15 18:18:22 +05:30
Ankush Menat
7fcaeca403
fix: don't make naming series mandatory for items
...
Item variants are an exception, hence this needs to be checked
conditionally.
2021-11-15 18:18:22 +05:30
Sagar Sharma
2eccb7a1ca
fix: Work order creation from sales order ( #28388 )
...
* fix: Work order creation from sales order
* chore: formatting
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
2021-11-15 16:08:15 +05:30
Conor
03370c63c5
chore: minor typo correction in CONTRIBUTING ( #28386 )
2021-11-14 09:46:31 +05:30
Ankush Menat
c0f06bc8e3
fix: validate hmac unconditionally ( #28372 )
2021-11-12 14:45:51 +05:30
Sagar Vora
6d3e9bce5f
fix(M-Pesa): validate type before executing get_doc
( #28369 )
2021-11-12 14:24:33 +05:30
Sagar Vora
24b048925b
fix(WooCommerce): always expect signature in webhook requests ( #28367 )
2021-11-12 14:08:02 +05:30
Sagar Sharma
a424310581
fix: Collapse Scrap Items in Job Card ( #28362 )
2021-11-12 13:50:30 +05:30
Deepesh Garg
829f92f10a
Merge pull request #28363 from deepeshgarg007/default_party_account
...
fix: Default party account getting overriden in invoices
2021-11-12 13:04:21 +05:30
Deepesh Garg
88648570d7
fix: Default party account getting overriden in invoices
2021-11-12 12:39:30 +05:30
Sagar Sharma
944bf8da71
fix: Unable to edit supplier scorecard criteria name once created ( #28348 )
2021-11-11 19:49:41 +05:30
rohitwaghchaure
0157da57b5
Merge pull request #28308 from rohitwaghchaure/commision-rate-not-fetch-from-sales-person
...
fix: commission rate not fetch from sales person
2021-11-11 19:11:31 +05:30
Saqib
ecbe4b16b8
perf(minor): general ledger report ( #27987 )
2021-11-11 13:55:21 +05:30
Deepesh Garg
fdb8e1855d
Merge pull request #28334 from deepeshgarg007/gstr_1_duplicate_items
...
fix(India): Sales Invoice with duplicate items not showing correct taxable value
2021-11-11 11:38:58 +05:30
Deepesh Garg
0dca97eb9f
fix(India): Sales Invoice with duplicate items not showing correct taxable value
2021-11-10 21:07:48 +05:30
Ankush Menat
c96b5492db
fix: reload doctype forcefully
2021-11-10 19:41:55 +05:30
Ankush Menat
b728597ef4
fix: use hotfix branches for patch tests
2021-11-10 19:41:55 +05:30
Saqib
6d05bb5274
fix(pos): get mode of payments query ( #28321 )
2021-11-10 13:06:55 +05:30
Ankush Menat
12e81df2b7
fix: default value for allow neg stock in repost_item_valuation
...
Negative stock can be toggled back after queuing transactions, this
causes failure when repost is executed.
Now allow_negative_stock stock is set at time of queuing the repost job.
This means setting changes done afterwards won't affect already
submitted reposts.
2021-11-10 13:05:14 +05:30
Anuja Pawar
2f004693c3
fix(Bank Reconciliation): get credit amount for bank account of type liability
2021-11-10 12:36:54 +05:30
Ankush Menat
e498389b00
fix: ignore cancelled entries in incorrect balance qty report
2021-11-10 12:09:51 +05:30
Rohit Waghchaure
4d4bfa2333
fix: commision rate not fetch from sales person
2021-11-10 00:00:38 +05:30
Anupam Kumar
6954dd6329
feat: Competitor Tagging in Opportunity and Quotation ( #28050 )
...
* feat: Competitor Tagging in Opportunity and Quotation
* fix: review changes
* fix: linter issue
* fix: section label
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-11-09 19:36:27 +05:30
Ankush Menat
ccf84ae88a
fix: patch to update job card status
2021-11-09 18:04:50 +05:30
Ankush Menat
fdfa39c231
fix: avoid mutating iterator while iterating over it
2021-11-09 18:04:50 +05:30
Ankush Menat
37799fe3dd
fix: use completion qty instead of transfer quantity for JC status
2021-11-09 18:04:50 +05:30
Wolfram Schmidt
6907ad8adb
fix: add Email option to contact email field ( #28296 )
...
* Update warranty_claim.json
Added the Email in option field of Contact Email so you are able to create a notification mapping to this field as reciever.
* Update warranty_claim.json
2021-11-09 17:32:57 +05:30
Deepesh Garg
20bc613b81
Merge pull request #28294 from ruchamahabal/fix-hr-patch-breaking
...
fix(India setup): setup company independent fixtures for patch
2021-11-09 17:27:13 +05:30
Deepesh Garg
8a253ed1f3
Merge pull request #28238 from nextchamp-saqib/perf-financial-statements
...
perf: improve financial statement loading time
2021-11-09 16:29:58 +05:30
Rucha Mahabal
88b5bda34b
fix(India setup): setup company independent fixtures for patch
2021-11-09 16:04:52 +05:30
Sagar Vora
da22744e0f
fix: specify fields to be set in Lead ( #28288 )
2021-11-09 15:49:32 +05:30
rohitwaghchaure
f57538bd2a
Merge pull request #28150 from anupamvs/manufacturing-work-order-stop
...
feat: provision to close the Work Order
2021-11-09 15:45:53 +05:30
Jannat Patel
17acb08545
fix: sum of components in salary register ( #28237 )
...
* fix: sum of components in salary register
* fix: sum of deduction components
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-11-09 15:21:51 +05:30
Saqib
4a3cef6436
fix: update 'current_invoice_end' after processing invoice ( #28278 )
2021-11-09 14:16:38 +05:30