Suraj Shetty
dc13d4b0fc
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2020-12-11 12:57:04 +05:30
Jannat Patel
79fe7758d4
Merge branch 'develop' into partially-submit-drop-ship-items-issue
2020-12-11 11:57:09 +05:30
pateljannat
06961a261e
fix: conflicts
2020-12-11 11:46:43 +05:30
pateljannat
fa72671929
fix: partial order for drop ship
2020-12-11 11:16:54 +05:30
Saqib
7acb42d6df
feat(POS): hide images & auto add item checkbox ( #24102 )
2020-12-10 16:22:01 +05:30
Rushabh Mehta
fec8dba16c
fix(merge): merge develop
2020-12-08 16:23:09 +05:30
Rucha Mahabal
db0bbfac97
feat(reports): get item details from Item doctype instead of the Transaction
2020-12-08 12:20:07 +05:30
Jannat Patel
797f0cfa61
fix: sales invoice add button from sales order dashboard ( #24077 )
...
Co-authored-by: pateljannat <jannatpatel@MacBook-Air.local>
2020-12-08 09:33:13 +05:30
pateljannat
71b1a0ca7d
fix: cancelling both test po created
2020-12-07 19:09:29 +05:30
pateljannat
32e77d73cf
fix: added supplier to second item in test
2020-12-07 17:39:37 +05:30
pateljannat
89624ad622
fix: sider issue fixed
2020-12-07 16:50:03 +05:30
pateljannat
5597e386b4
fix: added test for drop ship partial order
2020-12-07 15:53:45 +05:30
pateljannat
7fef622b13
fix: drop ship partial order fixed
2020-12-04 19:18:36 +05:30
Saqib Ansari
f4d645f87a
perf: async pos app start
2020-12-03 19:30:12 +05:30
Saqib Ansari
a6a37b7c81
fix: scroll elements
2020-12-03 19:24:07 +05:30
Shivam Mishra
2fa3cac814
feat: update workspace folders
2020-12-03 15:48:57 +05:30
Shivam Mishra
2895645f86
feat: rename desk page to workspace
2020-12-03 15:39:53 +05:30
Shivam Mishra
9aaca25edb
feat: update desk page json
2020-12-01 13:39:54 +05:30
Shivam Mishra
de68f74b4c
chore: update all desk pages
2020-12-01 12:51:38 +05:30
Saqib Ansari
188e0ecbcb
fix: submit order summary center alignment
2020-11-30 17:53:57 +05:30
Saqib Ansari
02d1491e39
fix: order summary qty alignment
2020-11-30 17:42:51 +05:30
Shivam Mishra
27e7c264f2
fix: link type
2020-11-30 14:58:16 +05:30
Shivam Mishra
61388d412b
feat: update desk pages
2020-11-30 14:58:00 +05:30
Marica
1466ed4579
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-30 14:58:00 +05:30
Mohammad Hasnain Mohsin Rajan
90e33e53fd
refactor: Format translation strings ( #24004 )
...
* fix: translation strings
* fix: linting
2020-11-25 15:37:54 +05:30
Mohammad Hasnain Mohsin Rajan
e15b6a91de
Filters for tax templates ( #23998 )
...
* feat: add company filter to tax templates
* fix: remove filer from PO because it is from tran
* fix: linting
* fix: solve translation string issues
* fix: remove doctype name
2020-11-25 15:36:41 +05:30
Saqib Ansari
ac164c66ed
perf: get recent transaction only when component is visible
2020-11-24 16:09:11 +05:30
Saqib Ansari
96feae608d
refactor: build point of sale min js
2020-11-23 18:39:56 +05:30
Saqib Ansari
937dc467a0
fix: no transactions placeholder
2020-11-23 18:34:08 +05:30
Saqib Ansari
eeee7e9427
fix: post submission invoice recipt screen
2020-11-23 18:34:03 +05:30
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