Commit Graph

32296 Commits

Author SHA1 Message Date
Mangesh-Khairnar
9305e7f1cc fix: remove mentions of display items in stock (#22963) 2020-08-10 15:48:33 +05:30
Shivam Mishra
d119db856b
Merge pull request #22937 from scmmishra/fix-item-configure-13-beta 2020-08-06 13:23:45 +00:00
Shivam Mishra
b110e5842f fix: unbound error in product configurator 2020-08-06 18:30:55 +05:30
marination
0702fbd206 fix: Show Add to Cart Button anyway
- add to cart wasnt visible if show price is disabled in shopping cart settings (product_info = null), creating confusion
2020-08-06 18:28:55 +05:30
marination
72fdc1302c fix: product action instead of info 2020-08-06 18:28:55 +05:30
Shivam Mishra
aa4f8cf4fc fix: handle product_info null 2020-08-06 18:28:55 +05:30
Saurabh
a91acb62df Merge branch 'version-13-beta-pre-release' into version-13-beta 2020-08-06 13:30:21 +05:30
Saurabh
5ad9c2a1a0 bumped to version 13.0.0-beta.4 2020-08-06 13:50:20 +05:50
Suraj Shetty
8d05514260
refactor: Format and sanitise user inputs to search queries. (#22922)
* refactor: Sanitize whitelisted method inputs

Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

* refactor: Format and sanitize tax_account_query inputs

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

* refactor: Validate and sanitize search inputs via decorator

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

* style: Minor formatting fix

* refactor: Validate and sanitize search inputs using decorator

* fix: Typo

* fix: Remove unwanted import statement

* refactor: Repalce validate_and_sanitize_search_inputs() with validate_and_sanitize_search_inputs

Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-08-05 20:07:30 +05:30
Suraj Shetty
1e67693c53
Merge pull request #22908 from marination/blanket-order-duplicate-method
fix: Remove Duplicate Blanket order method
2020-08-04 14:05:28 +05:30
marination
6823e8ed03 fix: Remove Duplicate Banket order method 2020-08-04 14:04:15 +05:30
Nabin Hait
a1d3537f2a
fix: Bank Clearance of POS purchase invoice (#22883) 2020-08-03 20:42:00 +05:30
Nabin Hait
5e548b4387
Dunning cleanup beta (#22899)
* fix: Dunning cleanup

* fix: Added dashboard for Dunning
2020-08-03 20:39:15 +05:30
Rucha Mahabal
cb665dc4d1
fix: Assessment Result child table not visible when accessed via dashboard (#22881) 2020-08-03 19:43:17 +05:30
Anupam Kumar
25ee4328d3
card company issue (#22900) 2020-08-03 19:39:55 +05:30
Prssanna Desai
b44ee186cd
fix: check if row['delay'] exists (#22892) 2020-08-03 15:18:35 +05:30
Marica
4e0989d0cb
fix: Misleading description in Warehouse (#22878) 2020-08-03 14:56:20 +05:30
Nabin Hait
1a64d1a4ab
Reset home page based on product settings (#22876) 2020-08-03 10:43:56 +05:30
Nabin Hait
826158c792
fix: Update modified timestamp in accounts settings (#22874) 2020-08-03 09:34:55 +05:30
Anurag Mishra
804426023f fix: minor payroll_dashboard fixes (#22832)
* fix: minor payroll_dashboard fixes

* Update erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.js

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2020-08-03 09:28:04 +05:30
Deepesh Garg
7a004615a7
Merge pull request #22855 from nabinhait/gl-balance-fix-pre--v13
fix: Ignore cancelled gl entries to get account balance
2020-07-30 22:15:46 +05:30
Nabin Hait
38d5c2e04f fix: Ignore cancelled gl entries to get account balance 2020-07-30 20:53:07 +05:30
Rucha Mahabal
b860d6af04
Merge pull request #22848 from prssanna/oldest-items-chart-fix-v13
fix: add range filters to oldest items chart
2020-07-29 18:16:26 +05:30
prssanna
60cdef7d57 fix: add range filters to oldest items chart 2020-07-29 18:06:54 +05:30
Nabin Hait
b7602d29f2
fix: POS patch fix (#22827) 2020-07-28 09:13:42 +05:30
Deepesh Garg
fa28e600b5
fix: Unable to submit backdated stock transactions for different items (#22822)
* fix: Unable to submit backdated stock transactions for different items

* fix: Test cases

* fix: Test Cases

* fix: Test Cases

* fix: Test for stock account JV

* fix: Journal Entry Test

* fix: Delete unwanted code
2020-07-28 08:49:21 +05:30
Nabin Hait
abc3227480 chore: Added change log 2020-07-24 21:02:15 +05:30
Mangesh-Khairnar
762f6297f6
fix(payment-request): do not set guest as administrator (#22804) 2020-07-24 18:05:13 +05:30
Nabin Hait
a8efe8eb5f Merge branch 'develop' into version-13-beta-pre-release 2020-07-24 11:15:13 +05:30
Rucha Mahabal
1010feefe0
feat: Patient Progress Page (#22474)
* feat: add patient progress page

* feat: patient progress sidebar

* feat: Patient Progress Charts

* feat: set up sidebar links

* feat: added heatmap chart for patient interactions

* fix: styles

* fix: add markers for max score in assessment charts

* fix(style): mobile view css

* fix: heatmap and percentage chart filters

* feat: add time span filters to line charts

* fix: make date fields mandatory in healthcare doctypes for better analytics

* fix: title and filter styles

* fix: handle null state for charts

* feat: add Patient Progress Page to desk

* feat: add date range filter to all charts

* fix: code clean-up

* fix: assign roles for Patient Progress Page

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-07-24 10:49:04 +05:30
Afshan
ecb1460440
fix: update the project after task deletion so that the % completed s… (#22591)
* fix: update the project after task deletion so that the % completed shows correct value

* fix: patch to correct % complete of previous projects

* fix: for version-13

* fix: removed patch from v13

Co-authored-by: Marica <maricadsouza221197@gmail.com>
Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-07-24 10:48:16 +05:30
Afshan
91fe10666e
fix: buying price for non stock item in gross profit report (#22616)
* fix: buying price for non stock item in gross profit report

* fix: refactor query
2020-07-24 09:49:17 +05:30
Nabin Hait
39969647ca
fix: Added missing project field in Purchase invoice (#22799) 2020-07-24 09:48:54 +05:30
Nabin Hait
6bbd4d0c14
fix: Other charges on income tax (#22797) 2020-07-24 09:20:48 +05:30
Deepesh Garg
7cb1613173
Merge pull request #22622 from AfshanKhan/add-age-range-in-stock-ageing
feat: added range for age in stock ageing
2020-07-23 21:56:45 +05:30
Afshan
73b86d241c fix: conversion to float 2020-07-23 21:09:27 +05:30
Rucha Mahabal
89f9346185
fix(Education): descriptions not copied while creating fees from fee structure (#22792)
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2020-07-23 20:59:56 +05:30
Deepesh Garg
9843e9f917
fix: Expnese claim outstanding while making payment entry (#22735) 2020-07-23 20:58:57 +05:30
Afshan
13d2a34548 Merge remote-tracking branch 'upstream' into add-age-range-in-stock-ageing
Merge remote-tracking branch 'upstream' into add-age-range-in-stock-ageing
2020-07-23 20:35:21 +05:30
Afshan
7965f655a2 Merge branch 'add-age-range-in-stock-ageing' of https://github.com/AfshanKhan/erpnext into add-age-range-in-stock-ageing
Merge branch 'add-age-range-in-stock-ageing' of https://github.com/AfshanKhan/erpnext into add-age-range-in-stock-ageing
2020-07-23 20:33:43 +05:30
Afshan
775fbe74c5 fix: fixed the logic 2020-07-23 20:33:07 +05:30
Sun Howwrongbum
9bd5f1e4b0
fix: incorrect available_qty being set (#22539)
* fix: incorrect available_qty being set

* style: descriptive variables
2020-07-23 20:06:26 +05:30
Afshan
aa94abf601
fix: asset dashboard report changes (#22759)
* fix: asset dashboard report changes

* fix: moved static filters to dynamic filters

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-07-23 19:12:38 +05:30
Abhishek Balam
cb45836cda
feat(CRM): Email Group Option In Email Campaign (#22731)
* new parent updating logic, made requested changes

* feat: adding Email Group option in Email Campaign

* fix: inv commas
2020-07-23 19:07:11 +05:30
Abhishek Balam
d05a98517d
Fix: Increase Length Of "In Words" and "In Words (Company Currency)" fields (#22732)
* new parent updating logic, made requested changes

* fix: Increase Length of In Words fields

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-07-23 19:01:31 +05:30
Deepesh Garg
718870f4a2
Merge pull request #22736 from Thunderbottom/set-homepage
fix: reset homepage to home after unchecking products page
2020-07-23 18:53:37 +05:30
Nabin Hait
9389b3625a
Merge branch 'develop' into add-age-range-in-stock-ageing 2020-07-23 18:53:00 +05:30
Saqib
a6f98d48bc
refactor: POS workflow (#20789)
* refactor: add pos invoice doctype replacing sales invoice in POS

* refactor: move pos.py to pos invoice

* feat: add pos invoice merge log doctype

* feat: ability to merge pos invoices into a sales invoice

* feat: [wip] new ui for point of sale

* fix: pos.py moved to pos_invoice

* feat: loyalty points for POS Invoice

* fix: loyalty points on merging

* feat: return against pos invoices

* Merge 'fork/serial-no-selector' into refactor-pos-invoice

* chore: status fix and set warehouse from pos profile

* fix: naming series

* feat: merge pos returns into credit notes

* feat: add pos list action for merging into sales invoices

* feat[UX]: add shortcuts & focus on search after customer selection

* feat: stock validation from previous pos transactions

* Merge 'fork/serial-no-selector' into refactor-pos-invoice

* chore: fix df not found for base_amount precision

* feat: serial no validation from previous pos transactions

* chore: move pos.py into pos page

* feat: pos opening voucher

* feat: link pos closing voucher with opening voucher

* chore: use map_doc instead of get_mapped_doc for better perf

* feat: enforce opening voucher on pos page

* feat: [ui] [wip] point of sale beta ui refactor

* fix: auto fetching serial nos with batch no

* feat: [ui] item details section for new pos ui

* feat: remove item from cart

* refactor: [ui] [wip] split point_of_sale into components
* new payment component
* new numberpad
* fix pos opening status
* move from flex to grids

* fix: search from item selector

* feat: loyalty points as payment method

* feat: pos invoice status
* fix a bug with invalid JSON

* fix: loyalty program ui fixes

* feat: past order list and past order summary

* feat: (minor) setting discount from item details

* fix: adding item before customer selection

* feat: post order submission summary
* save and open draft orders
* fix: item group filter

* fix:  item_det not defined while submitting sle

* fix: minor bugs

* fix: minor ux fixes

* feat: show opening time in pos ui

* feat: item and customer images

* feat: emailing and printing an invoice

* fix: item details field edit shows empty alert

* fix: (minor) ux fixes

* chore: rename pos opening voucher to pos opening entry

* chore: (minor) rename pos closing voucher and sub doctypes

* chore: add patch for renaming pos closing doctypes

* fix: negative stock not allowed in pos invoices* default is_pos in pos invoices* fix: transalation

* fix: invoices not getting fetched on pos closing

* fix: indentation

* feat: view / edit customer info

* fix: minor bugs

* fix: minor bug

* fix: patch

* fix: minor ux issues

* fix: remove uppercase status

* refactor: pos closing payment reconciliation

* fix: move pos invoice print formats to pos invoice doctype

* fix: ui issues

* feat: new child doctype to store pos payment mode details

* fix: add to patches.txt

* feat: search by serial no

* chore: [wip] code cleanup

* fix: item not selectable from cart

* chore: [wip] code cleanup

* fix: minor issues
* loyalty points transactions
* default payment mode

* fix: minor fixes
* set correct mop amount with loaylty points
* editing draft invoices from UI

* chore: pos invoice merge log tests

* fix: batch / serial validation in pos ui and on submission

* feat: use onscan js for barcode scan events

* fix: cart header with amount column

* fix: validate batch no and qty in pos transactions

* chore: do not fetch closing balances as opening balance

* feat: show available qty in item selector

* feat: shortcuts

* fix: onscan.js not found

* fix: onscan.js not found

* fix: cannot return partial items

* fix: neagtive stock indicator

* feat: invoice discount

* fix: change available stock on warehouse change

* chore: cleanup code

* fix: pos profile payment method table

* feat: adding same item with different uom

* fix: loyalty points deleted after consolidation

* fix: enter loyalty amount instead of loyalty points

* chore: return print format

* feat: custom fields in pos view

* chore: pos invoice test

* chore: remove offline pos

* fix: cyclic dependency

* fix: cyclic dependency

* patch: remove pos page and order fixes

* chore: little fixes

* fix: patch perf and plural naming

* chore: tidy up pos invoice validation

* chore: move pos closing to accounts

* fix: move pos doctypes to accounts

* fix: move pos doctypes to accounts

* fix: item description in cart

* fix: item description in cart

* chore: loyalty tests
* minor fixes

* chore: rename point of sale beta to point of sale

* chore: reset past order summary on filter change

* chore: add point of sale to accounting desk

* fix: payment reconciliation table in pos closing

* fix: travis

* Update accounting.json

* fix: test cases

* fix: tests
* patch loyalty point entries

* fix: remove test
* default mode of payment is mandatory for pos transaction

* chore: remove unused checks from pos profile

* fix: loyalty point entry patch

* fix: numpad reset and patches

* fix: minor bugs

* fix: travis

* fix: travis

* fix: travis

* fix: travis

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-07-23 18:51:26 +05:30
Nabin Hait
8712ac6d39
fix: Job offer is mandatory for employee onboarding (#22791) 2020-07-23 18:09:35 +05:30
Marica
3c8c346227
fix: Pick List empty table and Serial-Batch items handling (#22426)
* chore: Pick List empty table and serial-batch items handling

* fix: Remove console statement

* chore: Added tests for batched and batched-serialised item
2020-07-23 17:52:06 +05:30