Suraj Shetty
bbc6bfd3c3
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2021-01-19 09:34:06 +05:30
Anuja Pawar
e62ce4b172
fix: Add button PO, PI, SI, DN and, Quotation Dashboard ( #24187 )
2021-01-13 21:13:12 +05:30
Rushabh Mehta
37aa81526a
fix(minor): clear merge conflicts
2021-01-12 10:29:00 +05:30
Rushabh Mehta
7619d3d6d6
fix(merge): develop
2021-01-12 09:16:21 +05:30
rohitwaghchaure
c92da35997
Merge pull request #22944 from anupamvs/opportunity-status
...
fix: Opportunity Status fix
2021-01-11 17:34:06 +05:30
Marica
cffc489d57
Merge branch 'develop' into partially-submit-drop-ship-items-issue
2021-01-11 13:39:49 +05:30
Jannat Patel
5a579089c2
fix: indentation
2021-01-06 11:21:13 +05:30
Jannat Patel
16a809483b
fix: indentation
2021-01-05 12:28:45 +05:30
hasnain2808@gmail.com
46d5f4c7f1
refactor(analytics report): linting
2020-12-25 16:34:43 +05:30
Jannat Patel
29dd7e5fc4
Merge branch 'develop' into partially-submit-drop-ship-items-issue
2020-12-24 13:44:42 +05:30
Rushabh Mehta
ab1c2b7631
fix(minor): routing
2020-12-23 23:26:58 +05:30
Mohammad Hasnain Mohsin Rajan
61b92b312a
Merge branch 'develop' into fix-analytics-reports
2020-12-22 12:41:43 +05:30
Rucha Mahabal
5f53b140e2
fix: Auto Repeat Import ( #24157 )
2020-12-22 12:32:36 +05:30
Rucha Mahabal
7d848b1785
refactor: Auto Repeat next schedule date function params ( #23959 )
...
* refactor: Auto Repeat next schedule date function params
* refactor: Auto Repeat next schedule date function params
2020-12-22 12:32:36 +05:30
Nabin Hait
a77b8c9fcc
Repost item valuation ( #24031 )
...
* feat: Reposting logic for future finished/transferred item
* feat: added fields to identify needs to recalculate rate while reposting
* refactor: Set rate for outgoing and finished items
* refactor: Arranged fields in Stock Entry item table and added fields to identify finished and scrap item
* refactor: Arranged fields in Stock Entry item table and added fields to identify finished and scrap item
* refactor: Get outgoing rate for purchase return
* refactor: Get incoming rate for sales return
* test: Added tests for reposting valuation of transferred/finished/returned items
* feat: added incoming rate field in DN, SI and Packed Item table
* feat: get incoming rate for returned item
* fix: no error while getting valuation rate in stock entry
* fix: update stock ledger for DN and SI
* feat: update item valuation rate in PR and PI based on supplied items cost
* feat: SLE reposting logic for sales return and subcontracted item with test cases
* feat: update qty in future sle
* feat: repost future sle and gle via Repost Item Valuation
* fix: Skip unwanted function calling while reposting
* fix: repost sle for specific item and warehouse
* test: Modified tests for backdated stock reco
* fix: ignore cancelled sle in few methods
* feat: role allowed to do backdated entry
* feat: Show reposting status on stock valuation related reports
* fix: minor fixes
* fix: fixed sider issues
* fix: serial no fix related to immutable ledger
* fix: Test cases fixes related to perpetual inventory
* fix: Test cases fixed
* fix: Fixed reposting on cancel and test cases
* feat: Restart reposting item valuation
* refactor: Code cleanup using small functions and test case fixes
* fix: minor fixes
* fix: Raise on error while reposting item valuation
* fix: minor fix
* fix: Tests fixed
* fix: skip some validation ig gle made from reposting
* fix: test fixes
* fix: debugging stock and account validation
* fix: debugging stock and account validation
* fix: debugging travis for stock and account sync validation
* fix: debugging travis
* fix: debugging travis
* fix: debugging travis
2020-12-21 14:45:50 +05:30
Rushabh Mehta
2cd41bca06
fix(routes): desk to app
2020-12-18 13:17:58 +05:30
Rucha Mahabal
23d6afe43a
fix: Auto Repeat Import ( #24157 )
2020-12-16 18:21:08 +05:30
hasnain2808@gmail.com
2da0035a0f
Merge branch 'develop' into fix-analytics-reports
2020-12-16 16:14:23 +05:30
Rucha Mahabal
b184d43e75
refactor: Auto Repeat next schedule date function params ( #23959 )
...
* refactor: Auto Repeat next schedule date function params
* refactor: Auto Repeat next schedule date function params
2020-12-16 14:51:42 +05:30
hasnain2808@gmail.com
9962ba86d0
fix: charts not displaying when tree_type changed
2020-12-16 14:41:04 +05:30
Shivam Mishra
fd044b032f
Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into desk-enhancements
2020-12-16 13:21:10 +05:30
Suraj Shetty
f2511c84b5
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2020-12-14 09:05:48 +05:30
Deepesh Garg
f17ea2ccab
fix: Accounting for internal transfer invoices within same company ( #24021 )
...
* fix: Accounting for internal transfer invoices within same company
* fix: warehouse fetching
* fix: Linting issues
* fix: GL entry fixes and validation for intercompany account
* fix: Account naming changes and other fixes
* fix: Add test for internal transfer
* fix: Test Case
* fix: Add description for fields
* fix: Commonfied code
* fix: Map warehouse and serial no
2020-12-11 21:30:39 +05:30
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
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
Abhishek Balam
6c4a24a6c3
cleanup
2020-06-15 11:36:56 +05:30
Abhishek Balam
1a28227daa
fix merge conflict
2020-06-15 10:58:51 +05:30
Rohan Bansal
ccd03bc120
feat: notify credit controller role users with credit limit extension requests
2020-06-12 12:48:54 +05:30
Abhishek Balam
996b306cda
fix territory count
2020-06-12 11:38:07 +05:30
Abhishek Balam
72450d2af3
add revenue if within date range
2020-06-12 11:07:57 +05:30
Abhishek Balam
f596b5950e
indent to tabs
2020-06-12 11:07:28 +05:30
Marica
aeeadee8f8
Merge branch 'develop' into update-items-permission-fix
2020-06-10 15:19:33 +05:30
Shivam Mishra
b84dd9b5f5
fix: dashboard chart does not exist on selling page
2020-06-03 13:24:18 +05:30
Deepesh Garg
fecac677ec
Merge pull request #22075 from abhishekbalam/fix-customer-count
...
fix(Accounts): Customer Count in Customer Acq. Report wrong
2020-06-02 00:09:01 +05:30
Abhishek Balam
192d4c8810
indent to tabs instead of spaces
2020-06-01 23:58:05 +05:30
Abhishek Balam
732f5c1867
fixed customer count logic
2020-06-01 23:51:39 +05:30
Saqib Ansari
a655db6a79
fix: unexpected removal of print hide field
2020-05-29 22:44:59 +05:30
Saqib Ansari
d531a8ab8d
Merge branch 'develop' of https://github.com/frappe/erpnext into update-items-permission-fix
2020-05-29 22:37:13 +05:30
Saqib Ansari
2c3c8aaa2d
fix: submitted sales order can be updated with no permission
2020-05-29 21:55:38 +05:30
Shivam Mishra
6621e22c02
refactor: clean up desk pages ( #22004 )
...
* refactor: clean up desk pages
* refactor: update label for CRM
2020-05-28 14:48:50 +05:30
Abhishek Balam
18e7b60acc
feat(Selling): Gross Profit In Quotation ( #21795 )
...
* added valuation rate and gross_profit in quotation item table
* modified code to not fetch valuation_rate manually, used set_gross_profit from selling controller
2020-05-26 18:37:02 +05:30
Deepesh Garg
3949b51026
Merge pull request #21785 from anupamvs/sales-order-tax-fix
...
fix: tax id is not fetched when creating sales order from quotation
2020-05-19 21:49:11 +05:30
Anupam K
75e8b1b519
tax id is not fetched in when creating sales order from quoation
2020-05-19 21:39:56 +05:30
rohitwaghchaure
aa85e511da
feat: Production Planning Against Sales Order/Material Request/Work Order ( #21763 )
...
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-05-19 19:51:45 +05:30
Nabin Hait
b03072f83f
fix: merge conflict
2020-05-19 11:35:08 +05:30
Nabin Hait
9aae6f4793
feat: accounting dashboard + desk
2020-05-18 18:03:11 +05:30
Marica
c734db5d45
fix: Validate Filters in Sales Funnel. ( #21761 )
...
* fix: Validate Filters in Sales Funnel.
* fix: Style fixes
2020-05-18 14:38:57 +05:30
Himanshu
d94a38eb51
fix: make queries show searchfields ( #21685 )
...
* fix: make queries show searchfields
* Update erpnext/controllers/queries.py
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
* Update queries.py
* Update erpnext/controllers/queries.py
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
* Update erpnext/controllers/queries.py
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
* fix: make fields string for sql
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-05-18 14:26:26 +05:30
rohitwaghchaure
10e24d9249
Merge pull request #21600 from anupamvs/lead-customer-issue
...
fix: adding Email and Phone in Contact child table
2020-05-15 04:43:38 +05:30
Deepesh Garg
12a9328a63
Merge pull request #21668 from abhishekbalam/develop
...
feat(Selling): Territory Wise Treeview In 'Customer Acquisition and Loyalty' Report
2020-05-13 14:26:40 +05:30
Abhishek Balam
411b125906
new parent updating logic, made requested changes
2020-05-12 15:25:35 +05:30
Abhishek Balam
87776c335b
code improvements
2020-05-11 15:18:40 +05:30
Abhishek Balam
500dff63e7
fix: adjusted width of colums to see full column names, also fixes #21556
2020-05-10 14:53:59 +05:30
Abhishek Balam
5ec5584319
In treeview, bold only for root territory, looks cleaner
2020-05-10 00:24:43 +05:30
Abhishek Balam
7cbc902d90
removed validation for root node in territory, codacy recommended changed
2020-05-09 22:35:28 +05:30
Abhishek Balam
b59f2780eb
fix: renamed view types, added default
2020-05-09 22:09:02 +05:30
Abhishek Balam
d543830a59
feat(Selling): Added Territory wise treeview to 'Customer Acquistion and Loyalty' report
2020-05-09 21:56:53 +05:30
Anupam K
be6eb201b7
Appending Email and Phone in Child Table
2020-05-08 17:33:21 +05:30
Deepesh Garg
88e6f72cad
Merge branch 'develop' into sales-report-total-row
2020-05-06 10:48:21 +05:30
Anupam K
d097eaef63
Appending Email and Phone in Child Table
2020-05-05 15:57:49 +05:30
Saqib Ansari
52cc6ad456
fix: test
2020-05-04 20:24:00 +05:30
Deepesh Garg
6df581f78b
Merge pull request #21375 from marination/commonify-warehouse-autofill
...
chore: Commonify auto-filling warehouses in child tables
2020-05-03 20:33:45 +05:30
Saqib Ansari
ab9bb08c4b
fix: test
2020-05-03 14:53:13 +05:30
Saqib Ansari
826b39559d
fix: review fixes
2020-05-02 19:50:45 +05:30
Saqib Ansari
971170c590
fix: incorrect total in sales analytics for customer/item group
2020-05-02 19:39:03 +05:30
Saqib Ansari
dfa60e0ed8
chore: calculate total row month-wise in sales analytics
2020-04-30 20:06:30 +05:30
Saqib Ansari
10d9974e77
chore: add total row in sales analytics report
2020-04-30 16:28:52 +05:30
Deepesh Garg
2a9c5badc6
feat: Immutable ledger ( #18740 )
...
* fix: Reverse GL entry on cancellation of document
* fix: Removed set posting time field for multiple docs
* fix: Stop future reposting and reverse entry for purchase receipt and delivery note
* fix: Change is_cancelled field from select to check
* Revert "fix: Removed set posting time field for multiple docs"
This reverts commit 81fb808db7da69ab1e58ba226c0cd0b77e5b90c8.
* fix: Multiple fixes in GL Entry
* fix: Remove future reporting from doctypes
* fix: Canceled entry filters in Stock Ledger and General Ledger Report
* fix: Remove print statement
* fix: Validation for back dated entries
* fix: Codacy fixes
* fix: Add ignore links to multiple doctypes
* fix: Codacy Fixes
* fix: Ignore GL Entry and Stock Ledger entry while cancel
* fix: Test case fixes
* fix: Patch
* fix: Codacy
* fix: Budget Test Cases
* fix: Patch
* fix: Patch
* fix: Multiple test cases
* fix: changes in make_reverse_entry function
* fix: Update patch
* fix: Test Cases
* fix: Test Case fixes
* fix: Move patch upward in patches.txt
* fix: Budget Test Cases
* fix: Test Case and codacy
* fix: Patch
* fix: Minor label and UX fixes
* fix: Move freezing date check
* fix: Test Cases
* fix: Test cases
* fix: Test Cases
* fix: Test Case
* fix: Remove update_gl_entries_after function
* fix: Remove update_gl_entries_after function
* fix: Test Cases
* fix: Fiscal Year wise backdated entry
* fix: Update entries only for current SLE
* fix: Remove is_cancelled
* fix: Test Cases
* fix: Test cases
* fix: Test Cases
* fix: Uncomment account and stock balance sync logic
* fix: Stock balance and Account balance out of sync fixes
* fix: Test Cases
* fix: Test cases for POS, Stock Reco and Purchase Receipt
* fix: Stock Reco tests
* fix: Test stock reco precision
* fix: Test stock reco for fifo precision
* fix: Test stock reco for fifo precision
* fix: Stock Entry test case
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-04-30 10:38:58 +05:30
Deepesh Garg
8113294d6e
fix: Remove print
2020-04-29 22:16:47 +05:30
Deepesh Garg
0a6450115f
fix: get_period_list API change fixes
2020-04-29 22:14:45 +05:30
Raffael Meyer
49bb8ccd2e
feat: add Bank Account to dashboards
2020-04-28 18:56:47 +02:00
Marica
299e217668
fix: Blanket Order in SO/PO child tables ( #21442 )
2020-04-28 13:00:04 +05:30
Deepesh Garg
24b6055d89
Merge pull request #21427 from ruchamahabal/fix-desk-pages
...
fix(Desk Page): Number of Open Leads not visible on Shortcut Card
2020-04-27 08:41:14 +05:30
rohitwaghchaure
4d754eadc8
Merge branch 'develop' into quo-status-fix
2020-04-27 00:22:43 +05:30
Rucha Mahabal
e34ec70d44
fix(Desk Page): Number of Open Leads not visible on Shortcut Card
2020-04-26 23:40:37 +05:30
rohitwaghchaure
77403abadd
Merge branch 'develop' into social-media-integration-feat
2020-04-25 17:37:24 +05:30
Saqib
8952ac1ab4
fix: custom buttons are hidden if order type of SO is customised ( #21397 )
2020-04-25 09:44:21 +05:30
Saqib
63084c6292
Merge branch 'develop' into quo-status-fix
2020-04-23 15:30:31 +05:30
Saqib Ansari
1e4c28e99d
fix: quotation have expired status even if sales order exists
2020-04-23 15:28:47 +05:30
marination
8a30cb2565
chore: Commonify autofilling warehouses in child tables
2020-04-23 00:18:21 +05:30
Shivam Mishra
55baccd63a
fix: specify column width
2020-04-22 11:50:06 +05:30
Deepesh Garg
3cec5cbb0f
fix: Total amount field ordering in transactions ( #21313 )
2020-04-18 22:13:48 +05:30
Anupam K
790b9ee8d0
Merge branch 'develop' of https://github.com/frappe/erpnext into social-media-integration-feat
2020-04-18 01:51:47 +05:30
Anupam K
22318b2eb6
Linkedin, Twitter Integration
2020-04-18 01:46:38 +05:30
Deepesh Garg
3c6795a52d
Merge pull request #21305 from deepeshgarg007/partial_loan_repayment_fixes
...
fix: Loan Repayment code clean up and other fixes
2020-04-17 11:16:38 +05:30
Deepesh Garg
bf78ed6947
fix: Loan Repayment code clean up and other fixes
2020-04-16 22:53:47 +05:30
Saqib
14cdb24290
fix: serial and batch selection from delivery note bug fix ( #21291 )
2020-04-16 16:21:35 +05:30
Rohan Bansal
a1b747c3f3
fix: show stock UOM in POS
2020-04-14 14:28:56 +05:30
Marica
8636914e9a
fix: Lead Contact with blank first name via Customer ( #21247 )
2020-04-14 11:53:09 +05:30
Shivam Mishra
ebcc46d837
feat: updated desk pages ( #21138 )
2020-04-10 18:52:05 +05:30
Marica
048de30cb5
Merge branch 'develop' into pick-list-enhance
2020-04-07 14:05:05 +05:30
Marica
f55c9c8d8c
Merge branch 'develop' into po_supplier_skip
2020-04-03 18:35:48 +05:30
Deepesh Garg
0f25a40421
Merge branch 'develop' of https://github.com/frappe/erpnext into quotation_blanket_order
2020-04-02 21:30:53 +05:30
Marica
5d14af52a5
Merge branch 'develop' into po_supplier_skip
2020-04-02 21:17:52 +05:30
rohitwaghchaure
e4fecd725d
Merge pull request #21144 from anupamvs/year-sum-fix
...
Sum of years not needed.
2020-04-02 12:01:17 +05:30
Anupam K
b20dbff726
Sum of years not needed.
2020-04-02 11:37:44 +05:30
Anupam K
e48bcb30e7
Sum of years not needed.
2020-04-02 01:04:01 +05:30
Poranut Chollavorn
48aa2dd94b
fix(pos): fix pos display item instock
2020-03-31 18:13:55 +05:30
rohitwaghchaure
98a91f489d
Merge pull request #21015 from marination/so-mr-mapping-uom
...
fix: UOM fixes in Sales Order,Material Request & Production Plan
2020-03-31 16:24:37 +05:30
Deepesh Garg
242a079bcb
Merge branch 'develop' of https://github.com/frappe/erpnext into quotation_blanket_order
2020-03-31 14:18:30 +05:30
prafful1234
3fa03df1e3
fix(transaction): Add comment-by from frappe session ( #20867 )
...
Co-authored-by: prafful1234 <prafful@mntechnique.com>
2020-03-31 10:40:42 +05:30
Deepesh Garg
c33412b6ae
feat: Link blanket order and quotation
2020-03-30 22:44:13 +05:30
Deepesh Garg
f144b8b205
Merge branch 'develop' into po_supplier_skip
2020-03-30 13:07:03 +05:30
rohitwaghchaure
2d5addafa7
Merge pull request #21099 from anupamvs/item-wise-sales-history-billed-amount-bug
...
bug: Item-wise Sales History - Billed amount
2020-03-28 15:05:41 +05:30
Anupam K
85aae7de0b
bug: Item-wise Sales History - Billed amount
2020-03-28 14:13:58 +05:30
Saqib
74864b3b61
fix: currency not fetched on quotation creation ( #20996 )
2020-03-26 13:20:31 +05:30
Saqib
faea85451f
feat: auto set batch no on serial no selection ( #20757 )
...
* feat: auto set batch no on serial no selection
* fix: dialog not shown if set warehouse selected
* fix: typo
* fix: merge conflict
* fix: callback no getting called after serial no selected
* fix: available batch qty not fetched without set_warehouse selected
* fix: item batch not synced with dialog batch table
2020-03-26 13:18:57 +05:30
marination
73c8d23a79
fix: UOM fixes in Sales Order,Material Request & Production Plan
2020-03-20 17:52:28 +05:30
Marica
508ed1e121
fix: Missing if condition in Customer Default Bank Account Validation. ( #20969 )
2020-03-18 11:28:04 +05:30
marination
e1f499ae1b
fix: Pick List Enhancements
2020-03-17 11:47:11 +05:30
Deepesh Garg
eeb1922e37
fix: Add check to skip SO and DN in customer master
2020-03-17 11:43:34 +05:30
Saqib
1306f5005b
fix: is_pos gets reset on making s_inv from s_ord ( #20886 )
...
* s_inv has is_pos default set as 1
2020-03-16 17:51:00 +05:30
Shivam Mishra
451382e08e
feat: update desk pages
2020-03-12 16:34:34 +05:30
Shivam Mishra
1fd1852c6a
Merge branch 'develop' into yet-another-desk
2020-03-10 18:20:27 +05:30
Saqib
b978d79573
fix: show uom in print formats instead of stock uom ( #20843 )
...
Co-authored-by: Saqib Ansari <saqibansari@Saqibs-MacBook-Pro.local>
2020-03-06 11:03:46 +05:30
Shivam Mishra
0310366d5a
fix (cleanup): remove incomplete dependencies data
2020-03-05 11:28:40 +05:30
Deepesh Garg
6d604a151b
fix: Validation message
2020-03-04 11:55:10 +05:30
Lokesh Waingankar
d398c73bc5
fix: Removed html tags in pop up message ( #20603 )
2020-03-03 19:07:51 +05:30
Shivam Mishra
1f151c1032
refactor: update restrict to domain data
2020-03-02 19:37:12 +05:30
Lokesh Waingankar
38242bc21f
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
2020-03-02 17:45:59 +05:30
Shivam Mishra
3f59af3ef1
feat: added base config for domains
2020-03-02 17:25:18 +05:30
Shivam Mishra
8a8e8d6c5c
feat: added base pages for desk
2020-03-02 16:56:31 +05:30
Marica
ed25ec7ee5
chore: Item Price and Product Bundle Form cleanup ( #20772 )
...
* chore: Item Price and Product Bundle Form cleanup
* fix: Trailing comma
2020-03-02 15:51:14 +05:30
Lokesh Waingankar
efb6482ef6
fix: user is not able to do 'Set as Lost' for Quotation ( #20689 )
2020-02-27 19:08:58 +05:30
Rucha Mahabal
6071313965
fix: document creation via onboarding slide ( #20644 )
...
* fix: defaults not set in doc created via Onboarding Slide
* fix: default company not set in Supplier
2020-02-20 12:57:21 +05:30
Deepesh Garg
15ff6a594b
feat: Inter warehouse stock transfer on valuation rate with taxation ( #20083 )
...
* fix: Validation for target warehouse
* feat: Get items on valuation rate in delivery note on Internal transfers
* fix: Create Inter company purchase receipt from delivery note
* feat: Inter company stock transfer on valuation rate with taxation
* fix: Add from warehouse in purchase invoice
* fix: Use get_value instead of get_cached_value
* fix: Get incoming rate instead of valuation rate
* fix: GL entry for from warehouse in purchase receipt
* fix: GL Entries fixes in purchase invoice
* fix: Address and tax fetching fixes
* fix: Add test case for stock transfer via purchase receipt
* fix: Code cleanup, added validations and test cases
* fix: Validation for supplier warehouse
* fix: Test Cases
* fix: Change validation condition
* fix: Address fixes while creating Purchase Receipt from delivery note
* fix: Set taxes while creating Purchase Receipt from Delivery Note
* fix: Update set_missing_value function
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-02-18 12:28:41 +05:30
Deepesh Garg
cf8e2732c9
Merge pull request #20428 from 0Pranav/territory-sales-pipeline
...
feat: add territory wise sales report
2020-02-06 13:11:07 +05:30
Deepesh Garg
da406d74ef
fix: Remove debug param
2020-02-06 12:55:21 +05:30
Deepesh Garg
a4928f6f5b
fix: Add report link in module view and fix date filter
2020-02-06 12:50:25 +05:30
0Pranav
9d9a3d85d8
fix: filters after rename
2020-02-05 14:17:21 +05:30
Deepesh Garg
9e1fbaf59e
fix: Label and UX fixes while creating payment entry against customer ( #20465 )
...
* fix: Label and UX fixes while creating payment entry against customer
* fix: filter
2020-02-03 15:58:50 +05:30
0Pranav
9c4399e1f2
fix: better syntax for checking empty arrays
2020-02-03 14:57:42 +05:30
0Pranav
b1473c3de0
fix: return empty array
2020-01-31 10:43:00 +05:30
0Pranav
75adb808e5
various fixes from review
...
- Rename the report to title case
- Added company filter
- fixed checks in filter and += operator for total
2020-01-31 10:35:47 +05:30
Suraj Shetty
2f67647f7b
Merge branch 'develop' of https://github.com/frappe/erpnext into fix-incorrect-translations
2020-01-29 15:06:50 +05:30
Suraj Shetty
48e9bc3fc9
fix: Incorrect translation syntax
2020-01-29 15:06:18 +05:30
Himanshu Warekar
e169d2964c
fix: change fieldtype to Text
2020-01-24 17:40:29 +05:30
KanchanChauhan
a7d1985b5f
fix: Set Quotation expired if not Ordered or Lost ( #20354 )
...
Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
2020-01-21 12:35:11 +05:30
Himanshu
e3afe8a73c
fix: don't hide primary_address_and_contact_detail ( #20322 )
2020-01-16 13:39:29 +05:30
0Pranav
6280609c25
enhancement: add territory wise sales report
2020-01-14 15:53:35 +05:30
Rohit Waghchaure
ecdfc1a15c
fix: allow on submit for the delivery date field
2020-01-13 12:43:26 +05:30
Pranav Nachnekar
1612432f45
fix: parent item should not appear in raw material request dialog ( #20216 )
2020-01-09 13:32:15 +05:30
Pranav Nachnekar
971458043d
fix: add new delivery note button in Sales Order ( #20199 )
...
* fix: add new delivery note button in Sales Order
* fix: removed debugger
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-01-07 11:29:35 +05:30
Deepesh Garg
ef0d26c161
feat: Validity for Item taxes ( #20135 )
...
* feat: Validity for Item taxes
* fix: Trigger for gst hsn code
* fix: Sort taxes based on validity
* fix: Validation for item tax template and filters based on validity
* fix: Add missing semicolon
* fix: Validate tax template only if item code available
* fix: Do not validate or filter item tax template if no item taxes applied
* fix: Consider item group for validating taxes
* fix: Test cases for item tax validation
* fix: Item tax template filtering fixes
* fix: Add missing semicolon
* fix: Remove unnecessary query
2020-01-06 15:34:15 +05:30
Rucha Mahabal
2d293c585e
fix(Subscription): pass start_date while computing next_schedu… ( #20159 )
2019-12-31 19:15:37 +05:30
Javier Wong
5cc7648e9c
[Fix] Allow Print Before Pay in POS ( #20151 )
...
Print Button does not show even when Print Before Pay is enabled in the POS Profile.
2019-12-31 17:07:37 +05:30
Saqib
71649fe141
fix: customer credit limit label ( #20152 )
2019-12-31 17:05:34 +05:30
Marica
5483f1a27e
fix: Field 'other_charges_calculation' column type changed. ( #20141 )
2019-12-30 22:20:02 +05:30
thefalconx33
2073eeb8fa
fix: don't allow deletion of items which has work order assigned to it
2019-12-27 16:26:03 +05:30
deepeshgarg007
bd1da65098
fix: Update modified date
2019-12-26 18:26:13 +05:30
deepeshgarg007
0b9a98ad43
fix: Add against blanket order field in sales order
2019-12-26 18:15:13 +05:30
Saqib
7519436260
Merge pull request #19876 from rohitwaghchaure/provision_to_select_custom_fields_in_pos
...
feat: provision to select the custom fields in the online POS
2019-12-26 13:40:43 +05:30
Rohit Waghchaure
682273a00b
feat: provision to select the custom fields in the online POS
2019-12-26 11:59:19 +05:30
Saqib
0ad7449ae3
feat: allow adding & deleting of items in submitted SO & PO ( #19911 )
...
* feat: allow adding of items after quotation submission
* feat: allow deletion of items from submitted SO & PO
* fix: case when items are added and deleted at once
* fix: add test cases
* For deletion of items while Updating Items after submitting PO & SO
2019-12-24 16:42:30 +05:30
Don-Leopardo
5557b16260
fix: order_type validation restriction ( #18096 )
2019-12-24 16:39:34 +05:30
Deepesh Garg
a02bb5170b
Merge pull request #19913 from nextchamp-saqib/cart-address-fix
...
fix: enable adding of address without enabling checkout feature
2019-12-24 14:08:19 +05:30
Rucha Mahabal
0e83a5754b
fix: remove illustrations from onboarding slides ( #19872 )
...
* fix: remove illustrations from onboarding slides
* fix: change Welcome slide's description
* fix: justify text in slide
2019-12-23 08:24:46 +05:30
Deepesh Garg
57f9b758b7
Merge pull request #19983 from 0Pranav/mapped-doc-for-customer-quotation
...
fix: use open_mapped_doc instead of create_new_doc
2019-12-19 11:59:50 +05:30
deepeshgarg007
aba58ba50e
fix: Spacing after commas
2019-12-19 11:02:37 +05:30
0Pranav
0db86204cf
fix : only set price list if it exists for customer
2019-12-18 16:03:40 +05:30
0Pranav
5150c69ee6
use open_mapped_doc instead of create_new_doc
2019-12-18 12:16:49 +05:30
thefalconx33
e9c9cbd2fe
fix: display serial no selection on adding items to cart
2019-12-16 14:55:16 +05:30
thefalconx33
107989316c
fix: additional notes from Quotations not saved in SO
2019-12-11 18:15:54 +05:30
rohitwaghchaure
c58495dcee
fix: Item-wise Sales History report not working ( #19889 )
2019-12-10 21:34:03 +05:30
Deepesh Garg
6e2c13f4c8
feat(regional): Auto state wise taxation for GST India ( #19469 )
...
* feat(regional): Auto state wise taxation for GST India
* fix: Update gst category on addition of GSTIN
* fix: Codacy and travis fixes
* fix: Travis
* fix(test): Update GST category only if GSTIN field available
* fix: Test Cases
* fix: Do not skip accounts if place of supply is not present
* fix: Auto GST taxation for SEZ Party types
* fix: Automatic taxation for multi state
* fix: Codacy and travis fixes
* fix: Auto GST template selection in Sales Order
* fix: Move inter state check and source state to tax category
* fix: Remove unique check from tax template
* fix: Remove unique check from tax template
* fix: Address fetching logic in Sales
* fix: fecth tax template on company address change
* fix: fetch company gstin on address change
* fix: company_gstin set value fix
* fix: Mutiple fixes and code refactor
* fix: Add missing semicolon
* fix: Company address fetching in sales invoice
* fix: Remove print statement
* fix: Import functools
* fix: Naming fixes and code cleanup
* fix: Iteritems compatibility for python 3
2019-12-10 15:55:05 +05:30
Saqib
7e958da6d6
fix: sales order reqd only checks for stock items ( #19865 )
2019-12-09 17:23:19 +05:30
Deepesh Garg
babc2d1ea4
fix: Consistency in button positions in Sales Order and Purchase Order ( #19833 )
2019-12-09 13:04:44 +05:30
Rucha Mahabal
690068142b
feat: Continue Slide and New Illustrations for Onboarding Wizard ( #19813 )
...
* feat: added illustrations for onboarding
* refactor: change help label for supplier
* refactor (breaking): rename Setup Wizard slide to Onboarding Slide
* chore: code cleanup for the old doctype Setup Wizard Slide
* fix: added a 'Continue' type slide
* fix: change text in continue slide
* fix: change text for continue slide
2019-12-06 20:58:26 +05:30
ronelvcabrera
370cdc0170
feat(Sales/Purchase Order): optional to reference a Blanket Order ( #19612 )
2019-12-04 16:07:11 +05:30
Saqib
d635bda29b
fix selling setting label for sales order reqd ( #19775 )
2019-12-03 17:05:06 +05:30
Deepesh Garg
b4b90eaaf7
Merge pull request #19762 from Mangesh-Khairnar/fix-pr-creation
...
fix(sales-order): allow payment request creation for so that are not billed
2019-12-03 10:42:01 +05:30
deepeshgarg007
f89b172202
fix: Available stock for packing item report
2019-12-01 21:53:32 +05:30
Mangesh-Khairnar
92b9d7383d
fix: show create payment request for so that are not billed
2019-11-29 14:22:52 +05:30
Marica
bcd02069ea
fix: Validation for Suppliers in SO to PO ( #19686 )
...
- Check if there is a Supplier against atleast one item in Sales Order
- Validation message earlier was vague
2019-11-28 18:23:45 +05:30
Shivam Mishra
30245a0673
Merge pull request #19677 from ruchamahabal/setup_wizard
...
feat: Slides for Onboading Wizard in ERPNext
2019-11-28 14:35:10 +05:30
Marica
f0e87f7fdd
fix: get_batch_qty_and_serial_no() requires argument 'stock_qty' ( #19693 )
2019-11-27 15:49:41 +05:30
Rucha Mahabal
58928e8eae
Merge branch 'develop' into setup_wizard
2019-11-27 11:55:53 +05:30
Rucha Mahabal
e2bb82872c
fix: moved slide json files to respective modules
2019-11-26 18:46:17 +05:30
Rucha Mahabal
3f8c460584
feat: moved slide action functions from onboarding utils to doctypes
2019-11-26 15:22:45 +05:30
Deepesh Garg
5558ee8597
Merge pull request #19591 from 0Pranav/FR-ISS-152101
...
fix: add status "expired" to doctype quotation
2019-11-26 09:08:30 +05:30
deepeshgarg007
53a66ee386
fix: Method name in hooks, test case code clean up
2019-11-25 21:58:15 +05:30
0Pranav
565d3efcdf
fetch updated document in test_quotation
2019-11-25 17:11:12 +05:30
0Pranav
cf3a2f6579
set transaction date to yesterday
2019-11-25 16:26:04 +05:30
0Pranav
032baeac5b
don't submit quotation
2019-11-25 15:15:00 +05:30
0Pranav
754c43f6c3
fix set_expired_status method
2019-11-25 14:27:43 +05:30
0Pranav
e0c9f3c282
fix valid date
2019-11-25 14:14:51 +05:30
0Pranav
a9ff7df2e6
add sql query to set valid_till
2019-11-25 12:55:27 +05:30
Pranav Nachnekar
04e3a506e4
fix: Primary address not being fetched for customer ( #19667 )
...
* fix: priamry address not being fetched
* add doctype to filter for customer_primary_address
* remove get_customer_primary_address_method
2019-11-25 12:04:00 +05:30
0Pranav
a077795581
fix tests
2019-11-25 12:01:00 +05:30
0Pranav
eefc492ff4
call commit after sql query for schedular job
2019-11-25 10:51:27 +05:30
0Pranav
6c368e2dfb
submit quotation in test
2019-11-22 13:22:12 +05:30
0Pranav
b3354198f1
Fix sql query in set_expired_status
2019-11-22 12:38:43 +05:30
0Pranav
f5112905dc
import make_item method in tests
2019-11-21 13:19:44 +05:30
0Pranav
4a28144941
add tests
2019-11-20 15:53:19 +05:30
0Pranav
5717a265b7
remove: unused imports
2019-11-20 15:31:13 +05:30
rohitwaghchaure
238521c2bd
Merge pull request #19501 from Mangesh-Khairnar/multiple-pos-profile
...
feat: multiple company pos profile
2019-11-19 18:39:06 +05:30
Mangesh-Khairnar
c436d93303
fix: reset pos profile when default doesn't exists
2019-11-19 18:21:53 +05:30
Pranav Nachnekar
e13b769813
use nowdate
instead of date.today()
...
Co-Authored-By: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2019-11-19 12:04:30 +00:00
0Pranav
b9460ed22c
switched ORM methods for single SQL query
2019-11-19 10:46:07 +05:30
Mangesh-Khairnar
f69b9a8c47
fix: fetch default pos profile user for the company
2019-11-15 16:54:26 +05:30
0Pranav
53b65ab8ed
Add status expired to doctype quotation
2019-11-15 16:42:32 +05:30
rohitwaghchaure
6424416886
fix: sales order item shwoing incorrect produced qty ( #19584 )
2019-11-15 14:18:45 +05:30
0Pranav
f75ea952e3
Added expired status to quotation
2019-11-13 11:03:53 +05:30
Mangesh-Khairnar
2f44480d69
enhancement: Item-wise sales history report ( #19500 )
...
* refactor(item-wise-sales-history): convert query report to script report
* refactor: add columns, fetch data
* refactor: shift company set func to utils
* fix: add filters
* fix: minor changes
* fix: fetch all the descendants
2019-11-11 10:54:12 +05:30
Diksha
7091a2102c
fix(sales order): rename delivery to delivery note on sales order make button
2019-11-04 12:03:35 +05:30
Mangesh-Khairnar
e3bc213262
feat: multiple company pos profile
2019-11-01 22:35:08 +05:30
Rohan
8728e94dbd
Merge branch 'develop' into develop-company-address-label
2019-10-29 11:26:00 +05:30
Suraj Shetty
83b58352ce
fix: Overwrite default cost center if item has default cost center set. ( #19405 )
2019-10-28 12:05:30 +05:30
Rohan
962f4eb96c
Merge branch 'develop' into develop-company-address-label
2019-10-23 15:57:26 +05:30
Nabin Hait
bd6b1806cd
fix: fixed asset register report and made skip-dn field hidden
2019-10-22 14:28:37 +05:30
Deepesh Garg
6208755d54
fix: Unable to add details in quotation and opportunity ( #19354 )
2019-10-21 13:29:44 +05:30
deepeshgarg007
737ec6b26e
fix: Travis
2019-10-20 17:36:36 +05:30
Rohan Bansal
83740de636
fix(selling): Add missing label to company address field
2019-10-16 15:16:00 +05:30
Rohit Waghchaure
66072fec5a
fixed conflicts
2019-10-15 14:18:59 +05:30
ashish-greycube
74dc3c99de
feat: coupon_code and referral_sales_partner functionality
2019-10-15 11:44:45 +05:30
deepeshgarg007
683a89a415
fix: Chart fix in Analytics report
2019-10-12 23:02:53 +05:30
Mangesh-Khairnar
4ed9b45fb8
feat(Sales Order): Allow to skip delivery note creation ( #19222 )
...
* feat(sales-order): add option to skip delivery note creation for order type maintenance
* fix(sales-order): hide delivery date on setting skip delivery note creation
* fix: allow skipping delivery note for all order types
* fix: bypass delivery note creation on setting skip delivery note creation
* fix: show skip delivery note in list view
* fix: check for duplicate project name after submitting prompt
* fix: toggle delivery note reqd for skip delivery note
* fix: update status based on skip delivery note
2019-10-12 19:33:11 +05:30
Himanshu
eba3a8e802
fix: get contact details ( #19281 )
2019-10-11 10:43:24 +05:30
Saqib
d5067b4d73
chore: label changes in retail and stock ( #19243 )
2019-10-04 16:24:26 +05:30
Rucha Mahabal
34326470b8
fix: produced_qty field hidden and not updated in sales order item ( #19037 )
...
* fix: produced_qty field hidden and not updated in sales order item
* fix: added patch for old sales orders
* fix: produced_qty for sales order item linked to multiple work orders
* fix: comment
* fix: function for updating produced_qty in SO Item
* fix: remove frappe.db.commit
2019-09-30 12:15:39 +05:30
Himanshu
25ab1e41df
fix(Contact): mobile_no re-introduced and travis fixes ( #19009 )
...
* fix: mobile_no re-introduced
* fix: test cases
* fix: set email as primary
* fix: add primary email and phone
* fix: utils for contact creation
* chore: remove = from dict
2019-09-30 10:08:15 +05:30
Saqib
451d1a1744
fix: Bypass credit limit and Project Template field not visible( #19162 )
...
* Fix: Allow Project Template in Quick Entry
* Fix: Label Changes
2019-09-24 19:10:59 +05:30
Deepesh Garg
d9e9d562f8
fix: Travis (develop) ( #19140 )
...
* fix: Travis
* fix: Syntax Error
2019-09-24 11:44:52 +05:30
Mangesh-Khairnar
5dcf2c669f
chore: remove unlinked letter head references ( #19138 )
2019-09-24 09:53:06 +05:30
rohitwaghchaure
e18f7b91c3
Merge pull request #19127 from rohitwaghchaure/removed_mandatory_property_for_address_field_in_quick_entry_develop
...
fix: removed mandatory property for address field in quick entry
2019-09-23 14:48:27 +05:30
Rohit Waghchaure
1f9a84f165
fix: removed mandatory property for address field in quick entry
2019-09-20 12:18:23 +05:30
Anurag Mishra
c16fb9eb9d
fix: dashboard button not working ( #19094 )
2019-09-19 18:12:39 +05:30
rohitwaghchaure
6bbc834f8f
Merge pull request #19112 from rohitwaghchaure/fixed_get_bin_details_and_serial_nos_arugument_passing_issue
...
fix: get_bin_details_and_serial_nos() takes at least 3 arguments (4 g…
2019-09-19 18:01:03 +05:30
Rohit Waghchaure
6daab3ca89
fix: get_bin_details_and_serial_nos() takes at least 3 arguments (4 given)
2019-09-19 17:01:49 +05:30
Marica
d793e39b6d
fix: Customer Credit Balance Report query fix ( #19104 )
2019-09-18 19:59:31 +05:30
Himanshu
d51f7af9ab
fix: add contact phone to sales order ( #19012 )
2019-09-12 19:19:17 +05:30
Nabin Hait
4ce38059ac
feat: Company wise credit limit
2019-09-06 14:33:10 +05:30
Nabin Hait
b847731482
Merge branch 'feat-customer-credit-limit' of https://github.com/Mangesh-Khairnar/erpnext into Mangesh-Khairnar-feat-customer-credit-limit
2019-09-05 16:47:08 +05:30
Deepesh Garg
cffe577028
fix: Add UOM in anlytics report when viewing based on item ( #18902 )
2019-09-05 16:03:15 +05:30
Anurag Mishra
867ac10ffd
fix: handle for product bundle ( #18420 )
...
* fix: handle for product bundle
* fix: Requested changes and some general fixes
2019-09-05 15:13:21 +05:30
Andy Zhu
91596f2467
Change the field name for Payment Entry ( #18874 )
...
In the Payment Entry Form, the field name for customer name is 'party' instead of 'party_name'.
Need to change the customer_dashboard file accordingly.
2019-09-05 15:01:38 +05:30
Nabin Hait
b03fa8a441
Merge branch 'develop' into feat-customer-credit-limit
2019-09-05 12:34:34 +05:30
Nabin Hait
f4fde51bba
Update customer.py
2019-09-05 12:33:29 +05:30
Nabin Hait
c78c86663d
Update customer_credit_balance.py
2019-09-05 12:24:37 +05:30
Nabin Hait
1ab75db0ac
refactor: Accounts Receivable / Payable report ( #18906 )
2019-09-03 16:07:46 +05:30
Mangesh-Khairnar
4bcc221ee3
Merge branch 'develop' of https://github.com/frappe/erpnext into feat-customer-credit-limit
2019-09-02 23:18:56 +05:30
Mangesh-Khairnar
cf901da25d
test: create customer credit limit on change
2019-09-02 23:18:36 +05:30
Himanshu
fffdb6f575
feat(Contacts): Multiple Emails in a Contact ( #18675 )
...
* feat: render multiple addresses
* feat: move to newer contacts structure
* fix: iterate over valid variable
* fix: use primary label instead of bold letters
* fix: call popup get contact name from number
* fix: make contact structure call popup compatible
* fix: query
* fix: add city, state and country
* fix: display address
* fix: get address in single line
* fix: review fixes
* fix: translation strings
* fix: fix query for contacts
* fix: remove references of mobile_no
2019-09-02 15:57:45 +05:30
Mangesh-Khairnar
bb3cec1556
test: fetch data from customer credit limit
2019-08-31 14:32:07 +05:30
Mangesh-Khairnar
dbc69da409
fix: minor fixes
2019-08-31 14:28:02 +05:30
Mangesh-Khairnar
e3bb247868
fix: check column in credit limit
2019-08-31 13:16:14 +05:30
Mangesh-Khairnar
f856b3b559
fix: fetch customer group of the customer
2019-08-31 01:40:58 +05:30
Mangesh-Khairnar
89433b4bea
fix: get credit limit
2019-08-30 22:57:51 +05:30
Mangesh-Khairnar
b3e5d11e1d
fix: multiple fixes
2019-08-30 18:18:48 +05:30
Mangesh-Khairnar
c059bc3e36
fix: grid view of customer credit limit
2019-08-29 20:51:31 +05:30
Mangesh-Khairnar
5755d2d32f
fix: customer credit limit report
2019-08-29 19:51:38 +05:30
Mangesh-Khairnar
79525327f0
feat: bypass credit limit check
2019-08-29 19:50:23 +05:30
Mangesh-Khairnar
36b30911a8
feat: customer credit limit
2019-08-29 18:06:23 +05:30
Suraj Shetty
55a2699f4c
fix: Update dashboard of doctypes that are linked with pick list
2019-08-29 09:14:27 +05:30
Suraj Shetty
f455c92d02
fix: Remove Pick List Reference Item use Item locations table instead
2019-08-28 17:44:22 +05:30
Suraj Shetty
8de8a78235
Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list
2019-08-26 10:51:12 +05:30
Suraj Shetty
2b9e256002
fix: Rename method name
2019-08-26 10:05:01 +05:30
Nabin Hait
d8c262fd5c
fix: Translations of strings ( #18825 )
2019-08-23 16:32:58 +05:30
Suraj Shetty
8b4d604cfd
fix: Use purpose field and remove item_base_on field
2019-08-23 11:57:16 +05:30
Deepesh Garg
f3d78dd29c
fix: Duplicate items check in Sales Invoice ( #18660 )
...
* fix: Duplicate items check in sales Invoice
* fix: Commonified function for duplicate items check in selling controller
* fix: Set valuation rate and transaction date in child tabel
2019-08-23 11:42:35 +05:30
Suraj Shetty
da2a623e38
Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list
2019-08-21 11:48:27 +05:30
Sahil Khan
5f2c030ddc
Merge branch 'version-12-hotfix' into merge_v12_hotfix_1
2019-08-20 16:22:49 +05:30
Suraj Shetty
1a090432d9
fix: Quantity while creating pick list from work order
...
- Fix get_mapped_doc config to filter items
- Fix erroneous condition in get_mapped_doc used for creation of pick_list
in sales order
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2019-08-20 12:04:07 +05:30
Suraj Shetty
182f4def00
fix: Delivery note creation from pick list
...
- Changes in serial no and batch no seletion
- Changes in warehouse overrwite logic
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2019-08-16 08:16:22 +05:30
Suraj Shetty
e047de854b
Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list
2019-08-09 11:14:14 +05:30
Suraj Shetty
4b3b358ac6
fix: Show correct label instead of showing undefined ( #18559 )
2019-08-02 21:46:38 +05:30
Suraj Shetty
e45102b913
fix: Show correct label instead of showing undefined ( #18560 )
2019-08-02 21:46:28 +05:30
Rohan
fc04d334da
Merge branch 'develop' into develop-customer-item-price-report
2019-08-01 17:51:03 +05:30
Suraj Shetty
e06f486aee
fix: Rename methods
2019-08-01 12:54:33 +05:30
Suraj Shetty
fbcc56536b
fix: Rename Pick TIcket -> Pick List
2019-08-01 12:05:20 +05:30
Suraj Shetty
fa9111ebe2
fix: Add and rename some fields
...
- Add ability to create delivery note from pick ticket
- Minor fix related to create button
2019-08-01 11:07:14 +05:30
Rohit Waghchaure
40e35048b8
fix: can't compare datetime.date to unicode
2019-07-29 17:14:39 +05:30
Suraj Shetty
64f174fcaa
feat: Get item location from reference items
...
- Add option to get items from multiple sales order
- Add some required fiels to Pick TIcket Reference Item
2019-07-26 13:22:05 +05:30
Suraj Shetty
0576ad5ef9
fix: Move pick list creation code to picklist.py file
2019-07-24 15:16:03 +05:30
Suraj Shetty
778b4926bf
fix: Fetch warehouse location from Bin
2019-07-24 11:27:32 +05:30
Rucha Mahabal
d23a95c06e
fix: removed unnecessary fields from Campaign DocType and other fixes in Email Campaign
2019-07-22 12:26:52 +05:30
Rucha Mahabal
a566b4e24a
Merge branch 'develop' into email-campaign
2019-07-19 15:07:56 +05:30
Rohit Waghchaure
9fe6e00a4e
fix: not able to make material request for bundle items from the sales order
2019-07-19 07:54:08 +05:30
Suraj Shetty
06b56adc71
Merge branch 'develop' into develop-customer-item-price-report
2019-07-17 17:29:42 +05:30
Rucha Mahabal
65a627cb5b
fix: module changes for Auto Repeat from Desk to Automation ( #18356 )
2019-07-17 13:50:32 +05:30
Deepesh Garg
902e5ab744
Merge branch 'develop' into ac_dim_usability_fixes
2019-07-16 16:17:07 +05:30
deepeshgarg007
8cbc22062b
fix: Remove cost center filter from customer credit balance report
2019-07-15 18:35:19 +05:30
deepeshgarg007
ad4c111d91
fix: Remove cost center filter from customer credit balance report
2019-07-15 18:32:10 +05:30
Nabin Hait
868766ddf0
refactor: Refactored over delivery/receipt/billing fields ( #17788 )
...
* refact: Refactored over delivery/receipt/billing fields
* fix: test case
2019-07-15 18:02:58 +05:30
Rucha Mahabal
bbb22ad082
fix: child table naming
2019-07-15 17:52:50 +05:30
sahil28297
7697066cc2
fix(sales_order_list): compare type as well ( #18331 )
...
* fix(sales_order_list): compare type as well
* fix(sales_order_list): compare type as well
2019-07-15 11:25:06 +00:00
deepeshgarg007
f7395916c8
fix: Accounting Dimensions in Customer Credit Balance report
2019-07-14 18:44:32 +05:30
deepeshgarg007
a85db66146
fix: Usability fixes in accounting dimensions
2019-07-14 18:15:19 +05:30
Deepesh Garg
f9e4391998
Merge pull request #18038 from fproldan/sales_analytics_with_order_type_develop
...
feat: "Order Type" tree type for Sales Analytics report (develop)
2019-07-12 14:28:16 +05:30
Rucha Mahabal
9e35bff55c
feat: Email Campaign
2019-07-12 13:56:36 +05:30
Suraj Shetty
bc2ff785f1
fix: Restore "allow delivery" condition checks ( #18246 )
...
* fix: Remove `allow_delivery` flag
- User was not able to create delivery note
because allow_delivery flag was false and
it never used to get updated
* fix: Restore allow_delivery condition checks
2019-07-11 10:43:40 +05:30
Mangesh-Khairnar
d749f20f63
fix: installation note ( #18232 )
2019-07-10 19:29:39 +05:30
Don-Leopardo
93fbba4f40
Merge branch 'develop' into sales_analytics_with_order_type_develop
2019-07-10 10:52:55 -03:00
Himanshu
e7bb54ed76
feat(Issue): Settings to stop SLA tracking ( #18112 )
...
* fix: fix msgprint when creating new issues
* fix: use getdate
* fix: do not self save
* fix: test case
* fix: error due to comparing date and str
* fix: creation time for replicated issue
* feat: sla in support settings
* fix: remove sla settings
* feat: enable check in sla
* fix: throw if sla is disabled
* fix: enable sla
2019-07-10 17:15:59 +05:30
Nabin Hait
59c5c3c347
fix: Make material request against SO only for pending qty ( #18216 )
2019-07-10 17:05:49 +05:30
Rushabh Mehta
8309fcfbbc
BREAKING CHANGE: Remove anti-pattern "Project Task" ( #18059 )
...
* BREAKING CHANGE: Remove anti-pattern "Project Task"
* fix(tests): remove `tasks` from project/test_records.json
* fix(tests)
* fix(test): test_employee_onboarding.py
* fix(tests): test_expense_claim.py
* fix(refactor): cleanup project.py validate/update
* fix(refactor): cleanup project.py validate/update
* fix(test): test_expense_claim
* fix(test): test_expense_claim
* fix(test): test_expense_claim, try Test Company 4
* Update project.py
2019-07-08 10:39:30 +05:30
rohitwaghchaure
6b2075a115
Merge pull request #18161 from deepeshgarg007/additional_discount
...
fix: Additonal discount not getting set in sales transactions
2019-07-05 18:13:23 +05:30
karthikeyan5
7fc6021ca5
feat(setup): adding selling buying filter in terms and conditions
2019-07-04 22:46:16 +05:30
deepeshgarg007
a9ea49c976
fix: Additonal discount not get set in sales transactions
2019-07-04 15:56:34 +05:30
Anurag Mishra
bdec7fea82
feat: purchase order against sales order ( #17975 )
...
* feat: purchase order against sales order
* fix: remove unwanted checks
* fix:Related tests
2019-07-04 12:28:01 +05:30
Nabin Hait
34c551d9a5
fix: Missing commits from hotfix branch ( #17997 )
...
* fix: merge conflict
* fix: restored missing set_gst_state_and_state_number function
* fix: style linting as per codacy
* fix: Fixes related to customer/lead merging
* fix: merge conflict
* fix: Fixes related to customer/lead merging
* fix: Assign isue/opportunity to user
* fix: Assign isue/opportunity to user
* fix: Replaced Invoice type by GST Category
* fix: merge conflict
* fix: merge conflict
* fix: test cases
* fix: test cases
2019-07-03 10:34:31 +05:30
Deepesh Garg
fb29ffc90c
fix: Usability fixes to Serial No and batch selector ( #18071 )
...
* fix: Usability fixes to Serial No and batch selector
* fix: Codacy
* Update sales_common.js
2019-06-28 14:08:08 +05:30
Don-Leopardo
a01d0a5311
Merge branch 'develop' into sales_analytics_with_order_type_develop
2019-06-27 18:09:09 -03:00
Deepesh Garg
ea0574679f
fix: Removed submitted status from Quotation ( #18055 )
...
* fix: Change in list view and status updater
* fix: Change status in doctype
* fix: Patch for submitted status
2019-06-26 11:05:51 +05:30
Nabin Hait
40d25f4010
fix: Show close button if per_ordered is less than 99.999999 ( #18067 )
2019-06-26 10:57:45 +05:30
Aditya Hase
2caaa1b03d
fix(sales-funnel): Remove duplicate code
2019-06-25 17:17:38 +05:30
Aditya Hase
10562b67fc
fix(sales-funnel): Use frappe.Chart() instead of Chart()
2019-06-25 17:07:41 +05:30
Don-Leopardo
54b9fd5bef
Merge branch 'develop' into sales_analytics_with_order_type_develop
2019-06-24 11:29:23 -03:00
NahuelOperto
42fe68d065
feat: order type in trr type filter
2019-06-24 08:29:14 -03:00
Rohit Waghchaure
1777e60dc2
fix: test case for payment terms in quotation
2019-06-24 14:11:06 +05:30
Rushabh Mehta
41721fe1c3
Merge pull request #17390 from ashish-greycube/develop_copy_payment_schedule_from_quot_to_SO
...
fix: copy_payment_schedule_from_quot_to_SO
2019-06-21 09:19:20 +05:30
Deepesh Garg
23deb6f79b
fix: Default cost center fix for delivery note item ( #17990 )
2019-06-20 19:11:58 +05:30
Rohit Waghchaure
7efeffa66a
fix: allow edit is enabled in the pos profile still user not able to edit the rates
2019-06-17 16:20:32 +05:30
Rohan Bansal
0426636a32
fix(customer): Improve performance by reducing queries
2019-06-17 12:16:12 +05:30
Rohan Bansal
e3a3306b30
feat(customer): Add report to show item prices per Customer
2019-06-13 14:53:33 +05:30
Rohan Bansal
250734dd24
fix(selling): Remove Totals row for tree-based Sales Analytics
2019-05-30 17:30:50 +05:30
Nabin Hait
275185438a
Merge branch 'develop' into develop_copy_payment_schedule_from_quot_to_SO
2019-05-27 14:00:43 +05:30
Rushabh Mehta
04e89ce808
refactor: deprecate old API
2019-05-22 16:52:36 +05:30
Rushabh Mehta
a02ab2d3d7
Merge pull request #17635 from nabinhait/add-multiple-items-dev
...
feat: Added 'Add Multiple' options in all sales / purchase transactions
2019-05-16 14:57:03 +05:30
Nabin Hait
3fccfaa7ce
feat: Added 'Add Multiple' options in all sales / purchase transactions
2019-05-16 14:54:05 +05:30
Deepesh Garg
0ae1c293d3
fix: Status updater fixes in PO and SO and test coverage for return ( #17491 )
...
* fix: Status updator fixes in sales and purchase cycle
* fix: Test cases for return in so and po
* fix: Resolve conflicts
2019-05-15 12:23:24 +05:30
Himanshu Warekar
24442af9ae
fix: use list comprehension
2019-05-04 22:35:52 +05:30
Himanshu Warekar
fbed6a12d5
fix: calculate percentage only if sales team exist
2019-05-04 22:35:52 +05:30
Himanshu Warekar
40b99e3347
fix: sales percentage equal to 100
2019-05-04 22:35:52 +05:30
Himanshu Warekar
5ca977a41c
fix: python side validation
2019-05-04 22:35:52 +05:30
Himanshu Warekar
76eddcc29f
fix: validate percentage total
2019-05-04 22:35:52 +05:30
Nabin Hait
3d64a5da5e
Merge pull request #17416 from asbasawaraj/add_status_field_in_campaign
...
feat: Additional fields in campaign
2019-05-02 03:18:22 +05:30
Nabin Hait
c0fdb80486
Merge branch 'develop' into develop_copy_payment_schedule_from_quot_to_SO
2019-05-02 01:00:12 +05:30
Nabin Hait
d539def25d
Update campaign.json
2019-05-02 00:44:29 +05:30
Nabin Hait
9ccdf594c3
Merge pull request #17445 from rmehta/refactor-child-tables
...
fix(item-tables): add missing "item_tax_template" in purchase order detail and reorganize sequence of all child table
2019-05-01 19:31:00 +05:30
Rushabh Mehta
c3aecb1fbd
fix(item-tables): add missing "item_tax_template" in purchase order detail and reorganize sequence of all child table
2019-05-01 18:04:22 +05:30
Nabin Hait
b8103ac077
Merge branch 'develop' into item-discount
2019-05-01 12:23:30 +05:30
Faris Ansari
4b21225cf4
fix: Map item_code to title ( #17403 )
...
When making Project from Sales Order, description was mapped
with Task title which can exceed 140 characters easily.
Description should be mapped with description as it is html field.
2019-04-29 22:41:48 +05:30
Basawaraj Savalagi
d4585efc6a
feat: Additional fields in campaign
2019-04-29 22:12:50 +05:30
ashish-greycube
4707ad2029
fix: copy_payment_schedule_from_quot_to_SO
2019-04-26 12:14:40 +05:30
deepeshgarg007
4a4ce12eb4
fix: Commonfied code for inter-company-transaction
2019-04-25 14:28:19 +05:30
Nabin Hait
593242fa5c
fix: Calculate rate based on discount on server side only if not rate or pricing rule applied
2019-04-23 13:22:38 +05:30
deepeshgarg007
555f425da1
fix: Test case and styling fixes
2019-04-22 20:24:31 +05:30
deepeshgarg007
c841bd486a
feat: Added validations and mapper to create inter company mapper
2019-04-18 20:10:31 +05:30
deepeshgarg007
90262f84af
feat: Added custom button to make inter company order
2019-04-18 20:09:07 +05:30
deepeshgarg007
100bd29dfd
feat: Updated doctypes for sales and purchase order
2019-04-18 20:08:20 +05:30
Nabin Hait
3a2d6a4043
Merge pull request #17169 from rohitwaghchaure/production_plan_multiple_enhancements
...
feat: Production plan enhancements
2019-04-17 17:31:14 +05:30
Rohit Waghchaure
38238b0cfd
fixed test cases
2019-04-17 15:56:00 +05:30
Rohit Waghchaure
00d73cda50
fix: POS not working if user has access of multiple company
2019-04-16 18:43:16 +05:30
Rohit Waghchaure
34ee41a35e
fix: Pending SO Items For Purchase Request not showing the so quantity correctly if so has duplicate items
2019-04-16 18:26:11 +05:30
Nabin Hait
fa8f13dc98
Merge pull request #17213 from rohitwaghchaure/optimized_code_to_get_items_for_pos
...
fix: POS takes lot of time to load the items data
2019-04-15 10:11:31 +05:30
Rushabh Mehta
4f49ce4124
feat: auto assign lead/opportunity to lead owner, customer account manager
2019-04-12 09:04:17 +05:30
Rohit Waghchaure
2454d89068
Optimized the code to fix slow loading of items in the POS
2019-04-11 19:52:00 +05:30
Mangesh-Khairnar
3ab2a18088
Merge branch 'develop' into so-on-hold
2019-04-11 15:49:06 +05:30
Nabin Hait
65cca62ef9
fixed merge conflict
2019-04-11 12:32:43 +05:30
Nabin Hait
89206e74d0
fixed merge conflict
2019-04-11 12:31:14 +05:30
rohitwaghchaure
4898d1936b
Merge pull request #17200 from Anurag810/pos_running
...
fix: order by idx(v11)
2019-04-11 10:57:05 +05:30
rohitwaghchaure
6cd114b467
Merge pull request #17198 from rohitwaghchaure/fix_auto_assign_payment_entry_to_invoice
...
fix: don't assign the advance payment entries if Allocate Advances Automatically is disabled
2019-04-11 09:57:45 +05:30
Anurag Mishra
9a2ae67f86
fix: order by idx
2019-04-10 17:57:23 +05:30
Anurag Mishra
5ab5f77fd4
fix: order by idx
2019-04-10 17:53:45 +05:30
Rohit Waghchaure
b286fc99b8
fix: don't assign the advance payment entries if Allocate Advances Automatically is disabled
2019-04-10 16:16:30 +05:30
Mangesh-Khairnar
63cf56f406
style: change function call to anonymous function call
2019-04-09 17:47:25 +05:30
Mangesh-Khairnar
b70b048fa2
style: change type comparison for boolean expression
2019-04-09 12:26:52 +05:30
Mangesh-Khairnar
16c4fd6733
Merge branch 'develop' of https://github.com/frappe/erpnext into so-on-hold
2019-04-09 12:13:45 +05:30
rohitwaghchaure
bc02ee23e0
Merge pull request #17078 from rohitwaghchaure/unlinked_advance_payment_on_cancellation_of_order
...
feat: provision to unlink advance payment entry on cancelation of order
2019-04-06 12:30:05 +05:30
Rohit Waghchaure
9835c89e17
Added test cases
2019-04-06 12:29:05 +05:30
rohitwaghchaure
fc471ed63b
Merge pull request #17142 from rohitwaghchaure/incorrect_pos_profile_selected_develop
...
fix: incorrect POS profile selected
2019-04-05 09:59:16 +05:30
Rohit Waghchaure
c2ed03f77a
always set the company from the POS Profile
2019-04-05 09:58:04 +05:30
Rohit Waghchaure
4324f43a06
always set the company from the POS Profile
2019-04-05 09:54:55 +05:30
Rohit Waghchaure
0a4aee0206
fix: POS search items not works properly if item group filter has applied
2019-04-04 16:02:15 +05:30
Rohit Waghchaure
6f3f2185ab
fix: pos takes more time to add an item in the cart
2019-04-01 16:45:47 +05:30
Rohit Waghchaure
e994494e3e
fix: POS qty decrement freezing the screen
2019-04-01 14:29:55 +05:30
Rohit Waghchaure
5fa9a7a1b4
feat: unlink advance payment entry on cancelation of order
2019-04-01 00:40:38 +05:30
Rohit Waghchaure
e540534e42
fix: Pricing rule not working for POS
2019-03-31 17:13:18 +05:30
Rohit Waghchaure
b00c16470d
fix: POS items not loading
2019-03-29 13:47:45 +05:30
Rohit Waghchaure
c7b916ac46
fix: test cases
2019-03-26 12:52:32 +05:30
Rohit Waghchaure
4389cf0c48
feat: provision to make Maintenance Schedule from sales invoice
2019-03-26 12:52:32 +05:30