Commit Graph

2544 Commits

Author SHA1 Message Date
Saqib Ansari
69ef766a93 feat: number pad in payment screen 2020-11-23 18:33:55 +05:30
Saqib Ansari
f719380a0d fix: discount and taxes spacing 2020-11-23 18:33:40 +05:30
Saqib Ansari
fada84cc47 fix: remove console and asset loading 2020-11-23 18:33:34 +05:30
Saqib Ansari
d0d6fc2e17 fix: cannot open past order summary 2020-11-23 18:33:29 +05:30
Saqib Ansari
b0b6aa9124 refactor: past order list and summary with new ui 2020-11-23 18:33:22 +05:30
Saqib Ansari
7202e9f658 refactor: pos payment with new ui 2020-11-23 18:33:05 +05:30
Saqib Ansari
fc3315a6d7 feat: pos item details with new ui 2020-11-23 18:32:58 +05:30
Saqib Ansari
cc208839cf feat: pos cart with new ui 2020-11-23 18:32:49 +05:30
Saqib Ansari
210baafad4 feat: pos customer selector new ui 2020-11-23 18:32:07 +05:30
Saqib Ansari
0fb2e02b56 feat: pos item selector new ui 2020-11-23 18:32:00 +05:30
Rucha Mahabal
14514f776b
fix: Enable Allow Auto Repeat for standard doctypes having auto_repeat field (#23776)
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
2020-11-19 08:17:16 +05:30
Rushabh Mehta
542bc01718 fix(minor): update routes 2020-11-18 15:00:34 +05:30
Saqib
d82b76fe0a
fix: pos item search includes non stock items (#23914)
* fix: pos item search includes non stock items

* chore: add validation for non stock items
2020-11-18 11:56:49 +05:30
Marica
23614b650e
fix: Don't copy terms and discount from SO to PO (#23903)
* fix: Dont copy terms, discount and required by from SO to PO

* fix: Let delivery date and required by date get mapped
2020-11-17 11:12:31 +05:30
Shivam Mishra
bed717b442 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-11-12 11:32:59 +05:30
Marica
63d1a0436c
Merge branch 'develop' into fix-po-no-fetching 2020-11-09 12:59:10 +05:30
Saqib
e0af8fe8e5
fix: auto fetch sr nos with modifed conversion factor (#23854) 2020-11-06 18:19:36 +05:30
Marica
c070f2ed57
Merge branch 'develop' into dialog-cleanup 2020-11-05 18:37:56 +05:30
marination
2b8aa91cf2 fix: Make sure row object has doctype so that read only property is applied to rows 2020-11-04 21:00:52 +05:30
Afshan
cdc17bb9f3 fix: added code for testing 2020-11-04 19:28:55 +05:30
marination
23b7591c91 fix: SO to PO Mapping Issue
- removed type: GET , which made the URL longer
- Added only relevant fields from Items table to Dialog table to reduce args load
- Made separate method to set table data in dialog
- Added freeze message
2020-11-04 18:23:00 +05:30
Marica
7b42e8e27c
Merge branch 'develop' into dialog-cleanup 2020-11-03 16:26:06 +05:30
Saqib
da878c43fc
fix: cannot save customer email & phone (#23797) 2020-11-03 10:51:09 +05:30
Saqib
c95dff7b7d
fix: cannot add items to cart (#23796)
* fix: _ is not defined

* fix: item image alt gets overflowed due to large text

* fix: available item qty in pos search

* fix: cash shortcuts overflow
2020-11-03 10:16:58 +05:30
marination
e14fdf4a3c chore: RFQ cleanup and Title case for 'Get Items From'
- Cleanup up RFQ Get Items From Dialogs
- Title cased 'Get items from' to 'Get Items From'
2020-10-30 17:06:00 +05:30
prssanna
71e5b60df1 refactor: refactor contextual print setting implementation 2020-10-29 14:19:34 +05:30
Saqib
b193731158
fix: pos profile has no attr 'show_only_available_items' (#23758) 2020-10-29 13:23:50 +05:30
rohitwaghchaure
4c688b71f3 fix: consumed qty logic for subcontracted raw materials (#23314)
* fix: consumed qty logic for subcontracted raw materials

* added test case

* fix: sales order workflow test case
2020-10-26 12:19:00 +05:30
Saqib
60212ff9b9
fix: multiple pos issues (#23347)
* fix: point of sale search

* fix: pos fetches expired serial nos

* fix: pos doesn't refresh on route change

* fix: opening balances not set in opening entry

* fix: remove debug statement

* fix: invalid query if no serial no is reserved by pos invoice

* chore: make new order btn primary

* chore: filter warehouse by company

* chore: add shortcuts for new order and email

* fix: cannot fetch serial no if no batch control

* chore: add shortcuts for menu items

* feat: standard keyboard shortcuts for pos page

* feat: display only items that are in stock

* fix: empty point of sale page if opening entry dialog is closed

* feat: conversion factor in pos item details

* fix: show all invalid mode of payments

* chore: show all items if allow negative stock is checked

* fix: -ve amount set when changing mode of payment

* fix: pos closing validations

* fix: test

* fix: non expired serial no fetching query

* fix: cannot dismiss pos opening creation dialog

* fix: transalation strings

* fix: msgprint to throw

* chore: use as_list in frappe.throw

* chore: clean up pos invoice.js & .py

* fix: codacy

* fix: transalation syntax

* fix: codacy

* fix: set_missing_values called twice from pos page

* fix: mode selector with double spaces

* fix: do not allow tables in pos additional fields

* fix: pos is not defined

* feat: set mode of payments for returns

* fix: remove naming series from pos profile

* fix: error message

* fix: minor bugs

* chore: re-arrange pos closing entry detail fields

* fix: sider & frappe linter

* fix: more translation strings

* fix: travis

* fix: more translation strings

* fix: sider

* fix: travis

* fix: unexpected end of string

* fix: travis

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-10-26 11:17:04 +05:30
rohitwaghchaure
58016b07e0
Merge branch 'develop' into opportunity-status 2020-10-24 19:09:38 +05:30
Marica
3ad9393ff8
fix: SO to PO flow improvement (#23357)
* fix: SO to PO flow improvement

* fix: Dont map shipping_address

- shipping_address is a text field in SO and link field in PO
- Drop shipping case handles its mapping
- normal case doesnt need to map

* fix: Hide/Add rows depending on Against Default Supplier

* fix: Removed Default Supplier Select field from popup

- removed Default Supplier Select field from popup
- only loop through suppliers of selected items if via default supplier
- only check for items in selected items

* fix: Sales Order Drop Shipping Test

* fix: (translation)Multi line to single line strings

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-10-23 19:40:55 +05:30
Deepesh Garg
c4be397954
Merge pull request #23439 from Mangesh-Khairnar/mpesa-integration
feat: M-pesa integration
2020-10-23 19:35:52 +05:30
Michelle Alva
b39c17dd55
fix: Typo/Grammatical fixes in Settings (#23612)
* fix(Stock Settings): Type/Grammatical fixes in Settings

* fix: grammatical fixes in manufacturing settings

* fix: typo fix in accounting settings

* fix: typo fixes in HR settings

* fix: typo fixes in buying settings

* fix: typo fixes in Selling Settings

* Update erpnext/accounts/doctype/accounts_settings/accounts_settings.json

Co-authored-by: Sagar Vora <sagar@resilient.tech>

* Apply suggestions from code review

Co-authored-by: Sagar Vora <sagar@resilient.tech>

* Apply suggestions from code review

Co-authored-by: Sagar Vora <sagar@resilient.tech>

* Update accounts_settings.json

Co-authored-by: Marica <maricadsouza221197@gmail.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Rushabh Mehta <rmehta@gmail.com>
Co-authored-by: Sagar Vora <sagar@resilient.tech>
2020-10-23 18:22:26 +05:30
Nabin Hait
ed1553ea81
Merge branch 'develop' into mpesa-integration 2020-10-22 21:45:03 +05:30
Marica
3b1be2b1de
fix: Add Taxes if missing via Update Items (#23702)
* fix: Add Taxes if missing via Update Items

* chore: PO Test for adding tax row via Update Items

* chore: SO Test for adding tax row via Update Items
2020-10-22 17:04:31 +05:30
Shivam Mishra
5e00ed926c feat: update icons 2020-10-21 12:30:22 +05:30
Shivam Mishra
9d468a8daf Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-10-21 11:38:31 +05:30
Mangesh-Khairnar
5c29eb08c4 Merge branch 'develop' of https://github.com/frappe/erpnext into mpesa-integration 2020-10-19 18:29:46 +05:30
Rohit Waghchaure
2ce67b0ef9 fix: not able to make material request from SO 2020-10-16 15:21:52 +05:30
Mangesh-Khairnar
c66fce4965 fix: reload current pos doc after updating the information via callback 2020-10-16 12:03:08 +05:30
Mangesh-Khairnar
cab5d22ef5 fix: add a realtime publish to refresh the dashboard content 2020-10-16 11:38:07 +05:30
Anupam
d8a002cd8e Merge branch 'opportunity-status' of https://github.com/anupamvs/erpnext into opportunity-status 2020-10-14 11:48:42 +05:30
Shivam Mishra
55f52e8135 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-10-13 20:09:22 +05:30
Anupam Kumar
67a7279d1f
Merge branch 'develop' into opportunity-status 2020-10-13 18:11:23 +05:30
Anupam
73d944da21 fix: review changes 2020-10-13 18:11:05 +05:30
rohitwaghchaure
a57ad47cb8
Merge pull request #23538 from kennethsequeira/spellcheck
chore: spell fixes for Condition
2020-10-12 15:25:23 +05:30
Marica
aeba75cd08
Merge branch 'develop' into mr-ux 2020-10-12 15:17:32 +05:30
rohitwaghchaure
5065f8ac83
Merge pull request #23545 from tundebabzy/develop
fix: pass self.flags.ignore_permissions to the ignore_permissions
2020-10-10 11:11:57 +05:30
Saqib
56fea7d243
fix: update items after submission ignores precision (#23491)
* fix: update items after submission ignores precision

* chore: add test
2020-10-09 21:19:25 +05:30
Tunde Akinyanmi
f2b12a3b9c Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2020-10-09 07:20:19 +01:00
michellealva
38aee6e3cb fix(Selling): Add missing reports on desk 2020-10-08 10:24:11 +05:30
Tunde Akinyanmi
4010196488 fix: pass self.flags.ignore_permissions to the ignore_permissions
argument of Address and Contact controller
2020-10-08 02:25:09 +01:00
Kenneth Sequeira
be0ebc5085 spell fixes for Condition 2020-10-07 20:47:12 +05:30
barredterra
242579b77c fix: use party name as title 2020-10-07 14:34:21 +02:00
Deepesh Garg
f183dd6d3a
Merge branch 'develop' into tax_fetch_quote 2020-10-06 13:27:28 +05:30
Mangesh-Khairnar
8d54d61c28 fix: handle payment completion via payment request 2020-10-05 22:37:31 +05:30
marination
e7af9ff999 fix: Show Project under Create button in SO 2020-10-05 12:24:43 +05:30
Mangesh-Khairnar
1bef6a530c fix: create payment entry against payment request 2020-10-04 13:01:11 +05:30
Deepesh Garg
287014a9a2 fix: Remove any taxes fetched due to unknown rules 2020-09-30 13:42:10 +05:30
Deepesh Garg
fc71e5b5b7 fix: Remove any taxes fetched due to unknown rules 2020-09-30 13:42:00 +05:30
Mangesh-Khairnar
98658603dd Merge branch 'develop' of https://github.com/frappe/erpnext into mpesa-integration 2020-09-28 02:10:53 +05:30
Shivam Mishra
9a4d603403 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-09-25 11:44:37 +05:30
Mangesh-Khairnar
4eb215badb fix: bind callback callback for realtime event 2020-09-23 15:55:21 +05:30
marination
90d9d80ef9 fix: More MR UX fixes 2020-09-19 00:43:53 +05:30
Saqib
7126e179c3 fix: button click event not working in POS custom fields (#23358) 2020-09-22 16:35:11 +05:30
Abhishek Balam
4e6733293f
fix(DocTypes): Reset "owner" values in DocTypes to Administrator (#23350)
* fix: reset owner values in doctype to Administrator

* fix: updated modified value

* fix: also fixed modified by

* fix: change modified_by to Administrator
2020-09-18 18:27:24 +05:30
Michelle Alva
cc6ca97dc5
fix: Item-wise Sales History Report Error (#23349)
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2020-09-18 15:50:29 +05:30
Saqib
c29ee691d4
fix: button click event not working in POS custom fields (#23358) 2020-09-18 15:27:17 +05:30
Anupam Kumar
699e853009
Merge branch 'develop' into sales-analytics 2020-09-15 13:24:02 +05:30
Anupam
bae2d5d485 fix: review changes 2020-09-15 12:12:31 +05:30
Saqib
61314248bb
feat: uom in update items for SO & PO (#22869)
* feat: uom in update items for SO & PO

* fix: supplied items doesn't updates on uom change

* chore: add uom and conv factor change test

* fix: test

* fix: purchase order updates are not tracked

* fix: fetch conversion factor on uom change

* fix: codacy

Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-09-15 11:14:31 +05:30
Anupam Kumar
8cb356bf30
Merge branch 'develop' into sales-analytics 2020-09-14 11:21:58 -07:00
Saqib
6db92fbb6a
feat: validate workflow before so/po update items (#23024)
* feat: validate workflow before so/po update items

* fix: incorrect workflow validation on so/po update items

Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-09-14 19:54:17 +05:30
Anupam K
ed08e593c3 feat: added project in Sales Analytics report 2020-09-11 14:03:31 +05:30
Saqib
cd89994b33
fix: multiple pos issues (#23297)
* fix: returns can be made against unconsolidated invoices

* fix: indentation

* fix: mode of payment not fetching for pos returns

* patch: default pos profile print format

* fix: tests

* chore: clean up retail desk page
2020-09-10 19:28:46 +05:30
Anupam Kumar
924618e1e3
Merge branch 'develop' into opportunity-status 2020-09-06 21:24:32 +05:30
Anupam Kumar
c3984691b3
fix: Sales funnel data is inconsistent (#23110)
* fix: Sales funnel data is inconsistent

* fix: data inconsistency

* fix: Converted Count

Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-09-02 20:01:14 +05:30
Marica
329292b9c3
Merge branch 'develop' into credit-limit-email 2020-09-01 16:18:12 +05:30
rohitwaghchaure
a3dd156a8a
Merge pull request #22796 from anupamvs/variance-report-fix
fix: Target variance report signs
2020-09-01 15:12:21 +05:30
Anupam Kumar
232cb37ebf
Merge branch 'develop' into variance-report-fix 2020-09-01 09:31:22 +05:30
Shivam Mishra
1c96befbaf
Merge branch 'develop' into feat-exotel-customer-link 2020-08-31 11:47:06 +05:30
Marica
d2d350ce14
Merge branch 'develop' into credit-limit-email 2020-08-31 11:45:15 +05:30
marination
e268d294b3 fix: Better error feedback on creating SO from Quotation 2020-08-30 21:01:34 +05:30
bhavesh95863
3e9f493f15
fix: change parseFloat to flt 2020-08-28 11:15:02 +05:30
bhavesh95863
33f984c7af
fix: can't multiply sequence by non-int of type 'float 2020-08-27 21:49:21 +05:30
Suraj Shetty
f39bb116cc Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-08-27 19:27:49 +05:30
Suraj Shetty
b6ebcd7559 refactor: Replace darkgray indicator with gray indicator 2020-08-27 18:57:18 +05:30
prssanna
744169833c fix: replace indicator color darkgrey with darkgray 2020-08-27 17:06:10 +05:30
Rucha Mahabal
1bd83e69ee
feat: added Installation Note and Warranty Claim links to Customer dashboard (#23183) 2020-08-27 13:06:52 +05:30
Rucha Mahabal
12f7aeb147 feat: add Maintenance Visit link in Sales Order dashboard 2020-08-25 19:03:35 +05:30
Rucha Mahabal
5bf0a51ed4 feat: add Maintenance Visit link in Customer dashboard 2020-08-25 18:22:06 +05:30
Shivam Mishra
de4ac0c905 chore: remove stray tabs 2020-08-25 17:10:05 +05:30
Suraj Shetty
6f9f40992c Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-08-23 16:33:50 +05:30
Rucha Mahabal
4061186429 fix: POS page link not visible on Desk 2020-08-20 18:01:20 +05:30
Rucha Mahabal
434bab8003 fix: Print Language for Customer not set for Print Receipt in POS 2020-08-19 01:00:59 +05:30
Marica
12c68d0450
Merge branch 'develop' into credit-limit-email 2020-08-18 13:39:03 +05:30
marination
205df14a48 fix: Credit Limit Email not working 2020-08-17 16:23:44 +05:30
michellealva
e69b2e0da1 fix: Remove dependency of Sales Order in Sales Analytics 2020-08-15 10:16:26 +05:30
Anupam Kumar
e447c79f9d
fix: Quotation lost reason options fix (#22814)
* adding patch and lost reason child tables

* fix: conflict resolved
2020-08-13 09:20:36 +05:30
Saqib
c7614174d0
fix: cannot change customer fields if credit exhausted (#22838)
* fix: cannot change customer fields if credit exhausted

* fix: order based on company

* fix: sort current limits w.r.t company before compare

* fix: CustomerCreditLimit Object is not subscriptable
2020-08-13 09:18:59 +05:30
Saqib Ansari
f1091534cd fix: [pos] minor bugs 2020-08-10 14:45:58 +05:30
Deepesh Garg
bc8a281f83
fix: Subscripition link in Customer dashboard (#22960)
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2020-08-10 11:00:08 +05:30
Mangesh-Khairnar
a53f15ca35
fix: remove mentions of display items in stock (#22963) 2020-08-09 13:12:47 +05:30
Anupam K
9d82953242 fix: Opportunity Status fix 2020-08-06 23:58:56 +05:30
Suraj Shetty
1923ef052c
refactor: Format and sanitise user inputs to search queries. (#22913)
* 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 19:42:25 +05:30
Prssanna Desai
1dfd9fd756
fix: check if row['delay'] exists (#22889) 2020-08-03 14:48:45 +05:30
Wolfram Schmidt
5e438cc853
Update lead_source.json (#22872)
Allow Lead Source to be renamed. This is usefull for cleaning up data at a later point and allow correcting spelling errors.

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2020-08-03 12:46:50 +05:30
Shivam Mishra
de80553d89 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-08-03 12:34:05 +05:30
Marica
cf00ee49ec
fix: PO/SO view title (#22858) 2020-07-31 15:14:50 +05:30
Shivam Mishra
11111cd9a9 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-07-30 21:29:02 +05:30
Anupam K
5d5f026a0d fix: Target variance report signs 2020-07-24 02:32:45 +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
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
Shivam Mishra
1358efe896 feat: update icons 2020-07-23 17:02:32 +05:30
Anupam Kumar
3e4b5e5496
fix: item-wise sales history report (#22783) 2020-07-22 18:17:58 +05:30
Anupam Kumar
93afbe143b
feat: Export Selling Dashboard (#22776)
* feat:Export Stock Dashboard

* Export Selling Dashboard

* Export Selling Dashboard
2020-07-22 18:07:39 +05:30
bhavesh95863
eb69859d3e
fix: Quotation list view blank if quotation_to field not set as a standard filter 2020-07-13 23:15:31 +05:30
Deepesh Garg
8cdf33f618
Merge pull request #22635 from deepeshgarg007/item_tax_test
fix(travis): Item Tax template test
2020-07-11 21:04:31 +05:30
Deepesh Garg
a9820cdcf6 fix: Remove every bit of randomness from this test 2020-07-11 19:38:51 +05:30
Michelle Alva
5d514fe4df
fix: grammatical fixes in module onboarding (#22580)
* fix: grammatical fixes in module onboarding

* fix: more grammatical changes for consistency

* fix: Reorder Stock Onboarding

* fix: update success message

* fix: change order of stock onboarding steps

Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-07-08 14:25:51 +05:30
Marica
4d5d706a4b
Merge branch 'develop' into error-message 2020-07-07 16:41:39 +05:30
Mitali Deshpande
f642be9727 fix: Changed error message in the Product Bundle 2020-07-07 16:14:01 +05:30
Marica
7860d9e699
Merge branch 'develop' into whitelist-query 2020-07-07 11:53:19 +05:30
Afshan
bfffd9b01b
made "Subscription Section", "Auto Repeat" and Hub Publishing" collapsible by default (#22521)
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-07-02 15:11:45 +05:30
Khushal Trivedi
49d04f449e
fix: no else condition required since we can decalre it by default (#22537)
* fix: removing unnecessary else condition on customer form

* fix: removing unnecessary else condition on customer form

* fix: no else condition required since we can decalre it by default

Co-authored-by: Khushal Trivedi <khushalt5@gmail.com>
2020-07-02 14:51:20 +05:30
Chinmay D. Pai
ed0bb20e6f
chore: add query functions to whitelist
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-07-02 12:35:41 +05:30
Marica
510436931b
fix: Added Missing Trends Reports to Buying/Selling Desk (#22502)
* fix: Added Missing Trends Reports to Buying/Selling Desk

* fix: Move Reports to Other Reports
2020-06-29 19:52:23 +05:30
Mangesh-Khairnar
73edba0e10
fix: handle nonetype issue for packed items (#22493) 2020-06-29 08:54:53 +05:30
Deepesh Garg
a4b9fc74aa
Merge branch 'develop' into feat_taxjar 2020-06-27 18:51:48 +05:30
Nabin Hait
0ff5af222a fix: Send email to credit controllers to increase credit limit 2020-06-26 12:46:42 +05:30
vishdha
d3ec1c1d89 feat: Taxjar Integration Added 2020-06-24 16:37:21 +05:30
rohitwaghchaure
c4382abc03
Merge pull request #22410 from kennethsequeira/item_report_date
fix: add error prompt for wrong date range
2020-06-24 10:49:21 +05:30
Kenneth Sequeira
f5b7bd9dcb fix: add error prompt for wrong date range 2020-06-23 16:55:35 +05:30
Marica
3dee5273d6
fix: Update Packed Items via Update Items in SO (#22392) 2020-06-23 10:33:47 +05:30
Anupam Kumar
71da90034d
fix: resetting lost reason in opportunity and quotation (#22378) 2020-06-22 18:27:14 +05:30
Afshan
84c6973742 fix: adding json for checked add total row 2020-06-21 17:48:44 +05:30
Afshan
3fbe6e9e4b fix: test case 2020-06-19 22:51:52 +05:30
Afshan
65f00cea15 fix: Skipping* 2020-06-19 18:19:06 +05:30
Afshan
fbd66574ad Skiping total row for tree-view reports 2020-06-19 18:17:01 +05:30
Marica
383807f72e
feat: Selling Desk, Dashboard and Onboarding (#22055)
* feat: Selling Desk, Dashboard and Onboarding

* chore: Selling Onboarding and fixes in Other onboardings

* chore: Dashboard and Number card Fixtures

* fix: Escape filters and Reposition Accounts Dashboard shortcut.

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-06-19 15:33:21 +05:30
rohitwaghchaure
ec2dec03cc
Merge pull request #22334 from kennethsequeira/item-sale-hist
fix: Customer Group label in Item-wise Sales History report
2020-06-19 10:53:09 +05:30
Kenneth Sequeira
766f978858 fix: Customer Group label in Itemwise Sales report 2020-06-18 23:23:54 +05:30
Deepesh Garg
bdb40553c3
Merge pull request #22323 from deepeshgarg007/item_tax_map
fix: Do not copy Item Tax template from SO to PO
2020-06-18 17:01:53 +05:30
Deepesh Garg
1ba7708b60 fix: Do not copy Item Tax template from SO to PO 2020-06-18 16:45:16 +05:30
rohitwaghchaure
b7a2f8731f
Merge pull request #22048 from nextchamp-saqib/update-items-permission-fix
fix: submitted sales order can be updated with no permission
2020-06-18 15:47:12 +05:30
Chinmay Pai
96100e9507
chore: add standard queries hooks to whitelist (#21939)
standard queries are used within the search widget, and now require to
be whitelisted before they can be executed through the search widget.

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>

Co-authored-by: sahil28297 <37302950+sahil28297@users.noreply.github.com>
2020-06-18 11:58:54 +05:30
Abhishek Balam
a4cd9e2389 use getdate() for comparing dates 2020-06-17 17:13:13 +05:30
marination
8d68ba37bb Merge branch 'update-items-permission-fix' of https://github.com/nextchamp-saqib/erpnext into update-items-permission-fix 2020-06-15 12:18:16 +05:30
marination
b7e94cc742 fix: Travis 2020-06-15 12:16:30 +05:30
Marica
7dd92f15fa
Merge branch 'develop' into update-items-permission-fix 2020-06-15 11:44:59 +05:30