Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
33,011 Commits 3 Branches 0 Tags 1 GiB
13f4b3fc17
Commit Graph

23994 Commits

Author SHA1 Message Date
rohitwaghchaure
d65e050f4b
Update profit_and_loss_statement.py 2020-09-30 18:17:21 +05:30
Rohit Waghchaure
b428e4c493 fix: currency symbol in profit and loss report 2020-09-30 17:44:35 +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
Deepesh Garg
23313538df
Merge pull request #23465 from abhishekbalam/currency_in_trial_balance 
fix(Accounts): Add Currency filter in Trial Balance report
 2020-09-30 13:16:16 +05:30
Marica
8fbd960f66
Merge branch 'develop' into update-items-perm 2020-09-30 12:51:35 +05:30
Shivam Mishra
b04b53c613
Merge branch 'develop' into better-logging-for-membership 2020-09-30 12:01:54 +05:30
Shivam Mishra
86171a3fda
fix: translate error log 2020-09-30 12:01:35 +05:30
Shivam Mishra
3ec67077a9
chore: use .format for message 
Co-authored-by: Sagar Vora <sagar@resilient.tech>
 2020-09-30 12:00:46 +05:30
Abhishek Balam
001e7e9df9 fix: remove default value 2020-09-30 10:39:26 +05:30
Abhishek Balam
42d8db59f0 fix: add currency select to Trial Balance 2020-09-30 01:32:42 +05:30
Deepesh Garg
bc44bc64cc fix: Add test 2020-09-29 18:39:45 +05:30
marination
661bf64bba fix: Check only Read and Write Permission in Update Items 2020-09-29 18:16:45 +05:30
Deepesh Garg
2b38361ff5 Merge branch 'develop' of https://github.com/frappe/erpnext into tax_fetch_quote 2020-09-29 17:26:48 +05:30
Deepesh Garg
c33fbd7e52
Merge pull request #23416 from anupamvs/quotation-portal 
feat: provision to draft quotation from portal
 2020-09-29 17:08:05 +05:30
barredterra
81ad90c1d4 feat: validate sales invoice for germany 2020-09-29 11:54:57 +02:00
Marica
25f4c1636e
Merge branch 'develop' into account-add-rename 2020-09-29 13:18:54 +05:30
Marica
3b610bd07d
Merge branch 'develop' into dialog-filters 2020-09-29 13:16:33 +05:30
michellealva
3aedeb642f fix: Change Error Message in Work Order 2020-09-29 12:54:55 +05:30
marination
65fc48da25 fix: Email Template and Codacy 
- Email Preview works well with email template
- Codacy for docstrings
 2020-09-29 12:46:19 +05:30
Marica
e5a60f1cec
Merge branch 'develop' into rfq-email 2020-09-29 11:56:44 +05:30
Marica
818522bd45
Merge branch 'develop' into dialog-filters 2020-09-28 21:18:23 +05:30
marination
629fa57f9d fix: Remove unneccessary div 2020-09-28 21:17:49 +05:30
marination
a6ea86432e fix: Skip Update Password in Preview 
- dont show update password button in preview, its for the suppliers mail only
- modified docstrings
- update supplier row contact only if None
 2020-09-28 21:05:11 +05:30
marination
f911228871 fix: UX and code cleanup 
- Added a small note in muted text at bottom of Dialog
- Dont call 'update_supplier_contact' at the time of preview, its a dummy view anyway
- Renamed `update_contact_of_supplier` to `link_supplier_contact`
- On sending mail, new users and contacts that were created get updated in RFQ doc
- Added docstrings to functions
 2020-09-28 20:21:44 +05:30
Anupam
77cf53201a feat: open lead status on next contact date 2020-09-28 18:38:41 +05:30
marination
056c86033d fix: Reuse function to render email preview 
- Reused `supplier_rfq_mail` to render preview
- Print hid Salutation and Subject
- Completely dynamic greeting
 2020-09-28 17:42:22 +05:30
madar2020
ce39323a0a
feat: Allow rich text edit for questions (#23402) 
* rich text

* Update question.json

As to make sense for rich text

* Update quiz_question.json

* Update question.json

* Update quiz_question.json

* Update macros.html

fix: cards in second row of homepage section overlapps the row before.

* Revert "Update macros.html"

This reverts commit b649b507e5d546b5b4a78fbf68053493a71c7af2.

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2020-09-28 17:36:25 +05:30
marination
bd36f2b94d feat: Supplier Email Preview in RFQ 2020-09-28 15:59:03 +05:30
Raffael Meyer
21266fe4a4
Merge branch 'develop' into website_theme_scss 2020-09-28 10:15:55 +02:00
rohitwaghchaure
7b2f141d0d
Merge pull request #23441 from anupamvs/lead-contact-detail 
fix: flushing contact details, generates assignment rule issues
 2020-09-28 13:30:09 +05:30
Anupam
519a00ce44 fix: flushing contact details, generating assignment rule issues 2020-09-28 13:10:06 +05:30
Anupam Kumar
5b3af82e75
Update item_add_to_cart.html 2020-09-28 10:59:43 +05:30
Sagar Vora
382676d875
Merge branch 'develop' into mr-stock-uom-v13 2020-09-27 20:09:00 +05:30
Anupam Kumar
6e0c1eeb68
Merge branch 'develop' into quotation-portal 2020-09-25 20:04:43 +05:30
prssanna
fec4ea5643 fix: set stock uom in tem while creating material request from stock entry 2020-09-25 18:01:12 +05:30
rohitwaghchaure
7512565184
fix: Patient Appointment not able to save (#23434) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2020-09-25 12:45:47 +05:30
Anupam
dd2f547c3b fix: Ui fixes 2020-09-24 16:37:08 +05:30
Anupam
5a72022289 Merge branch 'develop' of https://github.com/frappe/erpnext into quotation-portal 2020-09-24 16:18:47 +05:30
Anupam
78ee75d744 fix: review changes 2020-09-24 16:17:02 +05:30
Saqib
2fa2a40b3f
chore: make asset movement transaction date match with purchase date & time (#23423) 2020-09-24 15:07:29 +05:30
Rucha Mahabal
9ed208364d
Merge branch 'develop' into enrollment-fixes 2020-09-24 14:31:23 +05:30
Anupam
a4df105813 fix: UI fixes 2020-09-24 13:21:54 +05:30
marination
4f395cce54 chore: Add Filter Group to dialogs 2020-09-24 12:43:41 +05:30
marination
8370d9b997 fix: Check Company in Payment Entry before selecting values 2020-09-24 11:51:03 +05:30
Anupam
09775bbdaa feat: showing UOM even item price is hidden 2020-09-24 11:19:32 +05:30
Shivam Mishra
0bd8719035
Merge branch 'develop' into better-logging-for-membership 2020-09-24 10:32:41 +05:30
Shivam Mishra
cee891aa92 refactor: better logging for membership 2020-09-24 10:31:36 +05:30
Anupam
c077fac2a6 feat: provision to draft quotation from portal 2020-09-23 22:02:31 +05:30
Marica
d5e6eb75cf
Merge branch 'develop' into supplier-quotn-comparison 2020-09-23 21:06:18 +05:30
Deepesh Garg
cfc5e29127
fix: Post cancellation accounting entry on posting date instaed of current (#23361) 2020-09-23 17:19:11 +05:30
Prssanna Desai
fd42af5b91
fix: ignore permission while creating supplier scorecard period in supplier scorecard (#23406) 2020-09-23 17:14:37 +05:30
Rucha Mahabal
46d4180381
refactor: Issue form cleaned up and renamed Minutes to First Response field (#23066) 
* refactor: re-order fields in Issue DocType

* refactor: rename Mins to First Response to First Response Time

* refactor: First Response Time Reports for Issue and Opportunity

* fix: added patch for renamed fields and setting durations

* chore: update CRM and Support Desk Pages for Response Time reports

* fix: first response time for opportunity report

* fix: patch

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
 2020-09-23 16:53:16 +05:30
Marica
f804eacfb5
Merge branch 'develop' into fix-report-gp 2020-09-23 15:36:23 +05:30
Michelle Alva
879a8ef26b
fix: Change button label in Item (#23410) 2020-09-23 15:36:07 +05:30
Raffael Meyer
8b78bf19bd
Merge branch 'develop' into website_theme_scss 2020-09-23 11:38:59 +02:00
Afshan
8be51e22c4 fix: escape apostrophe in cost centre and project if exist 2020-09-23 14:52:36 +05:30
marination
fd155408e5 fix: Check if account exists in parent company on rename 
- Check if child company is dependent on parent company
- Check if account-to-be-renamed exists in parent, if yes, block
- Revised Test basd on the same
 2020-09-23 14:42:10 +05:30
Saqib
1831893b77
fix: failed workflow condition error message in update items (#23393) 2020-09-23 13:01:49 +05:30
Marica
dd10c54baa
Merge branch 'develop' into supplier-quotn-comparison 2020-09-23 12:58:35 +05:30
Deepesh Garg
2bf4245334 fix: Conversion factor fixes in Stock Entry 2020-09-23 12:50:06 +05:30
gavin
639542c81d
Merge pull request #22867 from marination/youtube-analytics 
feat: Youtube interactions via Video
 2020-09-22 18:02:31 +05:30
marination
6087fcaa9b chore: Added video settings to List View Menu 2020-09-22 17:48:04 +05:30
rohitwaghchaure
27bccd7f81
Merge pull request #23397 from deepeshgarg007/search_field_batch_query 
feat: Show searchfields in batch query
 2020-09-22 16:59:24 +05:30
gavin
d935b2753f
Merge branch 'develop' into youtube-analytics 2020-09-22 15:36:00 +05:30
Anupam
c39b65a5f5 fix: quality procedure parent 2020-09-22 14:23:54 +05:30
Deepesh Garg
a0d192eae4 feat: Show searchfields in batch query 2020-09-22 13:54:07 +05:30
Shivam Mishra
2b53b98c1d
fix: reload dashboard (#23380) 2020-09-22 12:18:12 +05:30
rohitwaghchaure
9e6d377eea
Merge pull request #23370 from prssanna/account-user-permission 
fix: apply user permissions in tax accounts query
 2020-09-22 10:34:35 +05:30
rohitwaghchaure
7230b0f9a0
Merge pull request #23360 from anupamvs/batch-wise 
fix: Batch-Wise Balance History filter validation
 2020-09-22 10:32:51 +05:30
Marica
cbac025a5f
Merge branch 'develop' into supplier-quotn-comparison 2020-09-21 22:08:38 +05:30
Mangesh-Khairnar
e3c6128638
fix(plaid): do not send null list in account ids (#23376) 2020-09-21 18:50:22 +05:30
Saurabh
30dbfc31e2
Merge pull request #23369 from abhishekbalam/breadcrumbs_for_maintenance 
Fix(Maintenance): Breadcrumbs for Maintenance Visit and Schedule
 2020-09-21 17:03:46 +05:30
Saurabh
324cbe89f8
Merge pull request #23359 from abhishekbalam/activation 
fix(activation): Added New DocTypes in get_level()
 2020-09-21 15:38:45 +05:30
prssanna
de7a2bc4be fix: apply user permissions in tax accounts query 2020-09-21 13:57:04 +05:30
Rohan
e42f08085b
fix: use Plaid's new API (develop) (#23318) 
Co-authored-by: Mangesh-Khairnar <mkhairnar10@gmail.com>
 2020-09-21 13:14:07 +05:30
Abhishek Balam
97f61d233e fix: breadcrumbs for maintenance visit and schedule under support 2020-09-21 13:00:43 +05:30
Deepesh Garg
44c692ed40
Merge pull request #23278 from barry86m/patch-3 
fix: sql error on saving sales invoice without a sales order
 2020-09-20 20:40:16 +05:30
Deepesh Garg
c152b92ef4
Update erpnext/controllers/selling_controller.py 
Co-authored-by: Sagar Vora <sagar@resilient.tech>
 2020-09-20 20:04:10 +05:30
Deepesh Garg
5c8dd6a0ed
Merge pull request #23355 from Anurag810/accounts_recievable 
fix: Cost Center filter in accounts receivable and payable report
 2020-09-20 19:36:30 +05:30
Saqib
f2ea3877c8
fix: depreciation start date ux fixes (#23339) 2020-09-20 19:31:18 +05:30
Saqib
4b25eb4db4
fix: mode of payment not fetched if no account is set (#23334) 
Co-authored-by: Sagar Vora <sagar@resilient.tech>
 2020-09-19 19:33:21 +05:30
Deepesh Garg
6bcfffda1d
Merge branch 'develop' into barredterra-patch-1 2020-09-19 18:33:14 +05:30
Deepesh Garg
c646a56d68
fix: Update modified timestamp 2020-09-19 18:28:20 +05:30
Deepesh Garg
e3ee63f677
Merge pull request #23346 from AfshanKhan/stock-entry-warehouse-address-filter 
fix: warehouse address filtered based on warehouse
 2020-09-19 18:17:08 +05:30
Deepesh Garg
095161ff60
Merge pull request #23328 from rohitwaghchaure/fixed-set-taxes-missing-error 
fix: set_taxes() missing 1 required positional argument: 'company'
 2020-09-19 18:07:08 +05:30
Deepesh Garg
0aff6d83af
Update erpnext/public/js/utils/party.js 
Co-authored-by: Sagar Vora <sagar@resilient.tech>
 2020-09-19 18:05:58 +05:30
marination
b782d2a99d fix: Added back accidentally deleted field 2020-09-19 01:04:28 +05:30
marination
90d9d80ef9 fix: More MR UX fixes 2020-09-19 00:43:53 +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
Anupam
bf166736b0 fix: Batch-Wise Balance History filter validation 2020-09-18 17:15:49 +05:30
Abhishek Balam
123eaea1a6 fix: added new doctypes in get_level 2020-09-18 16:35:59 +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
Marica
2cfaf71d59
Merge branch 'develop' into supplier-quotn-comparison 2020-09-18 15:22:59 +05:30
Anurag Mishra
170ecdc76e fix: No handlefor Cost centers in Accounts Receivable 2020-09-18 13:26:46 +05:30
SDLyu
68672af8ab
Fix missing tax autoload when frm.doc.taxes is [] 2020-09-18 13:58:23 +08:00
Deepesh Garg
6f3d93e5a0 fix: Taxes not getting fetched from Opportunity to Quotation 2020-09-18 11:23:35 +05:30
Afshan
d5710b4d6f style: removed extra spaces 2020-09-17 13:01:47 +05:30
Afshan
e813684433 fix: warehouse address filtered based on warehouse 2020-09-17 12:57:26 +05:30
Deepesh Garg
2aea184f6f
Merge pull request #23309 from anupamvs/sales-analytics 
feat: added project in Sales Analytics report
 2020-09-17 12:37:14 +05:30
Rucha Mahabal
c78ca36ee5 fix(Non Profit): Hide Address and Contact section for unsaved docs 2020-09-16 23:47:33 +05:30
Anupam Kumar
11649efc41
Merge branch 'develop' into sales-analytics 2020-09-16 21:45:57 +05:30
Deepesh Garg
5c04b2eea4
Merge pull request #23235 from Anurag810/custom_remark 
feat: added option to add custom remarks in payment entry
 2020-09-16 13:38:04 +05:30
Deepesh Garg
15f698251b
Merge pull request #23079 from marination/item-tax-update-items 
fix: Item Tax Updating via `Update Items` in SO/PO
 2020-09-15 20:47:20 +05:30
Deepesh Garg
db52cfe05a
Merge pull request #22849 from alyf-de/datev_refactor 
refactor: move datev-specific stuff to utils
 2020-09-15 19:50:00 +05:30
Rucha Mahabal
8193582645 fix: codacy issue 2020-09-15 18:53:38 +05:30
Marica
9ce5c77a21
Merge branch 'develop' into supplier-quotn-comparison 2020-09-15 18:50:34 +05:30
Rucha Mahabal
253936c8df fix: create Course Enrollment only for courses added in Program Enrollment 2020-09-15 18:16:42 +05:30
Rucha Mahabal
42d7acf522 fix: academic term and year date validations 2020-09-15 17:52:47 +05:30
Marica
f63b6719e3
Merge branch 'develop' into item-tax-update-items 2020-09-15 17:45:05 +05:30
marination
f995f517c9 fix: Test 2020-09-15 17:06:27 +05:30
Rucha Mahabal
f5eb45bf23 fix: validate academic term while checking for enrollment duplication 2020-09-15 17:01:00 +05:30
Rucha Mahabal
68a07eda72 fix: program enrollment date not considered during course enrollment 2020-09-15 16:55:35 +05:30
Deepesh Garg
2f50cb3e58 fix: Supplier trigger onload 2020-09-15 15:00:32 +05:30
Rohit Waghchaure
4f3b7da9ba fix: set_taxes() missing 1 required positional argument: 'company' 2020-09-15 14:47:36 +05:30
Anupam Kumar
699e853009
Merge branch 'develop' into sales-analytics 2020-09-15 13:24:02 +05:30
Anurag Mishra
9397b7f58b fix: requested changes 2020-09-15 12:36:01 +05:30
Anupam
bae2d5d485 fix: review changes 2020-09-15 12:12:31 +05:30
marination
665c27af58 fix: Merge conflict missing line 2020-09-15 12:04:38 +05:30
Marica
baedc627ee
Merge branch 'develop' into item-tax-update-items 2020-09-15 11:30:22 +05:30
marination
4bb8d0c193 chore: Test for PO 2020-09-15 11:18:02 +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
Marica
65c2c4f85f
Merge branch 'develop' into item-tax-update-items 2020-09-15 09:49:06 +05:30
Deepesh Garg
36bc0577a2
fix: Item GL entries for purchase invoice (#23027) 2020-09-15 09:44:46 +05:30
marination
b7cd84196d fix: Revert tax calculation changes 2020-09-15 09:42:51 +05:30
Anupam Kumar
8cb356bf30
Merge branch 'develop' into sales-analytics 2020-09-14 11:21:58 -07:00
Rucha Mahabal
fcb6ba6ec7
fix: get_transaction_entries function arguments in Bank Statement Transaction Entry (#23051) 2020-09-14 21:12:36 +05:30
Marica
a544e10778
Merge branch 'develop' into supplier-quotn-comparison 2020-09-14 20:17:59 +05:30
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
Deepesh Garg
93d7c2f1da
Merge pull request #23283 from ruchamahabal/fix-student-email-id 
fix: Set student email id mandatory only if skip user creation is disabled
 2020-09-14 19:34:10 +05:30
marination
59239172a1 feat: Supplier Quotation Comparison - v3 2020-09-14 17:34:21 +05:30
Rucha Mahabal
026cf2d3cc
Merge branch 'develop' into refactor-lab-module 2020-09-14 14:45:19 +05:30
Marica
c4a8c9eb26
Merge branch 'develop' into pr-dn-get-items 2020-09-14 11:09:32 +05:30
marination
9205101ecf fix: Make Reference fields mandatory in Quality Inspection 2020-09-12 16:17:13 +05:30
marination
0a688005be fix: Make sure Supplier/Customer is selected before fetching Items. 2020-09-12 15:39:27 +05:30
barredterra
16f1435d63 fix: codacy 2020-09-11 18:57:58 +02:00
barredterra
41978ac882 Merge branch 'develop' into datev_refactor 2020-09-11 17:54:50 +02:00
barredterra
8e41fdfee4 Merge branch 'develop' into website_theme_scss 2020-09-11 16:05:49 +02:00
barredterra
60bfbbc5af fix: use path istead of hook 2020-09-11 16:05:10 +02:00
marination
02c550c07d fix: Redundant imports 2020-09-11 16:22:54 +05:30
Marica
1807437fe0
Merge branch 'develop' into youtube-analytics 2020-09-11 16:18:23 +05:30
marination
9533318832 chore: Tests for Rename and Add child Account 2020-09-11 16:09:27 +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
marination
37b99d202d fix: Separate function to get bulk and single youtube stats 2020-09-10 18:27:20 +05:30
Rucha Mahabal
a29436dc91 fix: codacy 2020-09-10 17:45:17 +05:30
Rucha Mahabal
c0f9d1b65a test: Lab Module 2020-09-10 17:33:52 +05:30
marination
799d663398 fix: Make set_youtube_statistics reusable and job logic fix 
- Make sure job runs only once every hour
- set_youtube_statistics should be usable in and outside class
 2020-09-10 16:42:20 +05:30
Gavin D'souza
71ac399369 fix: Commonified function and updated scheduler events 
Co-authored-by: marination <maricadsouza221197@gmail.com>
 2020-09-10 13:58:48 +05:30
Gavin D'souza
0a0e258d8b feat: Add Desk Page for Utilities for Video group 2020-09-10 13:12:35 +05:30
Rucha Mahabal
42bff3289d
Merge branch 'develop' into refactor-lab-module 2020-09-10 12:36:29 +05:30
Rucha Mahabal
2388199347
Merge branch 'develop' into fix-student-email-id 2020-09-10 12:16:16 +05:30
Rucha Mahabal
1915a60834 fix: education settings check 2020-09-10 12:13:58 +05:30
Marica
6520655d59
Merge branch 'develop' into youtube-analytics 2020-09-10 10:16:02 +05:30
marination
53cd60c217 fix: Patch reload doctype 2020-09-09 20:57:10 +05:30
Saqib
ec6a97fb6a
fix: cannot delete pos page if linked with desk page (#22993) 
* fix: cannot delete pos page if linked with desk page

* fix: replace pos page links with point-of-sale page

Co-authored-by: gavin <gavin18d@gmail.com>
 2020-09-09 10:54:14 +05:30
Deepesh Garg
dc84633860
Merge pull request #23301 from deepeshgarg007/closed_loan_amount 
fix: Amount for closed loans
 2020-09-08 21:32:54 +05:30
Deepesh Garg
846e6d4803 fix: Add test 2020-09-08 21:32:06 +05:30
Deepesh Garg
f247686ace fix: Amount for closed states 2020-09-08 21:26:06 +05:30
Saqib
8f43cf2c9a
fix: asset movement date for backdated asset entry (#23298) 2020-09-08 17:44:47 +05:30
rohitwaghchaure
93dccd2eaa
Merge pull request #23132 from anupamvs/item-group-filter-portal 
fix: [Portal] added filter show in website
 2020-09-08 17:03:54 +05:30
rohitwaghchaure
1d555f35a7
Merge pull request #23282 from deepeshgarg007/tds_bug 
fix: Apply TDS on Purchase Invoice creation from Purchase Order and Purchase Receipt
 2020-09-08 16:59:29 +05:30
Anupam Kumar
09e2cb5f87
Merge branch 'develop' into item-group-filter-portal 2020-09-08 14:54:31 +05:30
Deepesh Garg
f7731b0715 fix: TDS applicable on creating PI from get items button 2020-09-08 13:41:04 +05:30
Afshan
12ab8ebc95 fix: removed ignore permission flag 2020-09-08 12:55:42 +05:30
Marica
c8eca9d5f3
Merge branch 'develop' into handle-irs 2020-09-08 12:03:45 +05:30
Rucha Mahabal
f7619df8b2
fix: Lock row in subquery while setting delivered qty (#23100) 2020-09-08 11:57:45 +05:30
Afshan
9691422fb7
feat: added report for mismatch in serial nos and stock quantity in warehouse (#22669) 
* feat: added report for mismatch in serial nos and stock quantity in warehouse

* style: removed print statement

* fix: rename of reports and refactor of code

* fix: handled null condition for actual qty and added report link in stock desk page

* style: breaking code in multiple lines
 2020-09-08 11:57:15 +05:30
rohitwaghchaure
31fd90136d
Merge pull request #23243 from Anurag810/overlap_for_additional_salary 
feat: Overlap validation additional salary
 2020-09-08 10:18:41 +05:30
rohitwaghchaure
7d7fa79efa
Update additional_salary.py 2020-09-08 10:18:18 +05:30
rohitwaghchaure
900d0e3ae2
Merge pull request #23245 from Anurag810/attendance_calendar_map 
fix: Attendance calendar map fix
 2020-09-08 10:14:37 +05:30
rohitwaghchaure
842cb6d1d6
Update shift_assignment.py 2020-09-08 10:14:04 +05:30
Anupam Kumar
7131024bf9
Merge branch 'develop' into item-group-filter-portal 2020-09-08 10:04:51 +05:30
rohitwaghchaure
0cb805308f
Merge pull request #23256 from Mangesh-Khairnar/fix-adv-payment-payment-order 
fix: capture advance payments in payment order
 2020-09-08 09:59:47 +05:30
barry86m
5b381ac5b7
fix: consolidated financial statement sums values into wrong parent 
fix proposed by Andriesvn in bug report

closes #22180
 2020-09-08 00:27:57 +01:00
Deepesh Garg
b828e2fcf4
Merge pull request #23287 from deepeshgarg007/lsu_api_fix 
fix: Only submitted Loan security pledges should be approved
 2020-09-07 23:23:55 +05:30
Deepesh Garg
03b0ad4f98 fix: Only submitted Loan security pledges should be approved 2020-09-07 23:22:21 +05:30
Anupam Kumar
22bd03e63c
Merge branch 'develop' into item-group-filter-portal 2020-09-07 20:20:42 +05:30
Rucha Mahabal
4673bed67e fix: codacy issues 2020-09-07 20:12:29 +05:30
Rucha Mahabal
06f89a1b94 fix: Set student email id mandatory only if skip user creation is disabled 2020-09-07 19:46:53 +05:30
marination
f18dd05c00 fix: Missing import and typo 2020-09-07 18:59:57 +05:30
Marica
54ab426c1c
Merge branch 'develop' into youtube-analytics 2020-09-07 18:54:11 +05:30
marination
06ee0ea00b feat: Added Scheduler Job to auto update statistics 
- Added frequency in Video Settings
- Cron job to check half hourly job
- Hourly job to run job based on frequency
- Patch to set youtube id in video for ease in computing
 2020-09-07 18:49:06 +05:30
Deepesh Garg
74ab1084b3 fix: Apply TDS on Purchase Invoice creation from Purchase Order and Purchase Receipt 2020-09-07 17:55:10 +05:30
Deepesh Garg
af1c4ba443
Merge pull request #23279 from deepeshgarg007/loan_closure_interest 
fix: Pending loan interest accrual on loan closure
 2020-09-07 15:01:33 +05:30
Deepesh Garg
afefa878b0 fix: Pending loan interest accrual on loan closure 2020-09-07 14:57:44 +05:30
Deepesh Garg
da6074a84c fix: Pending loan interest accrual on loan closure 2020-09-07 14:55:04 +05:30
marination
9ce38de439 chore: Key Validation and restructure 
- Added API Key validation in Video Settings
- Moved Statistics section above description in Video
- Moved id retrieving from URL to py side
- Removed js side calls, added section toggling in js
- Restructured Code
 2020-09-07 13:27:17 +05:30
Mangesh-Khairnar
06130ee56b
fix: leave ledger patch (#23182) 2020-09-07 11:53:50 +05:30
Anupam Kumar
209f7c76c9
feat: added transaction_type in leave ledger enter (#23258) 2020-09-07 11:50:24 +05:30
barry86m
fa98e81f0b
fix: sql error on saving sales invoice without a sales order 2020-09-07 01:36:15 +01:00
Anupam Kumar
ffd30beeca
Merge branch 'develop' into item-group-filter-portal 2020-09-06 21:48:16 +05:30
rohitwaghchaure
937b63433d
Merge pull request #23270 from kasgel/patch-1 
fix(utils): pass stock_qty to get_pricing_rule_for_item
 2020-09-06 20:46:15 +05:30
Deepesh Garg
5158d0fbba fix: Repayment Method not visible correctly 2020-09-05 21:16:57 +05:30
kasgel
a59f8640d1
fix: pass stock_qty to get_pricing_rule_for_item 
get_pricing_rule_for_item uses the "stock_qty" and "qty" arguments to filter pricing rules.
Not passing stock_qty prevents for example the shopping cart from filtering pricing rules appropriately based on Quantity.
 2020-09-05 12:15:49 +02:00
Deepesh Garg
1b4ed454d2 fix: Add reference no and descripiton field in Loan Security Pledge and Unpledge 2020-09-04 22:42:41 +05:30
Deepesh Garg
e4c38e5fe5 fix: Remove print statement 2020-09-04 22:30:13 +05:30
Deepesh Garg
4d636fde3a fix: API changes in loan security unpledge utility 2020-09-04 22:23:30 +05:30
Mangesh-Khairnar
7456ffca0f fix: teardown created payment order 2020-09-04 19:59:01 +05:30
Mangesh-Khairnar
a76bf4d7af fix: remove unused imports 2020-09-04 19:08:08 +05:30
Mangesh-Khairnar
d9e4883392 test: check payment order creation against payment entry 2020-09-04 18:55:14 +05:30
rohitwaghchaure
515d8b9e50
Merge pull request #23259 from anupamvs/se-quntity 
fix: SE quantity data type issue
 2020-09-04 16:07:13 +05:30
rohitwaghchaure
c9a5afaa1c
Merge pull request #23263 from Semiranis/uom_after_qty 
feat: Option to print UOM after quantity
 2020-09-04 16:06:46 +05:30
Shivam Mishra
4a238a2093 feat: don't allow guests 2020-09-04 15:18:16 +05:30
Anupam K
faebef21b7 fix: SE quantity data type issue 2020-09-04 15:09:16 +05:30
Mangesh-Khairnar
e1889d0c1b fix(payment entry): update payment order status 2020-09-04 14:45:19 +05:30
Mangesh-Khairnar
8d8af94182 fix: capture advance payments in payment order 2020-09-04 12:17:56 +05:30
Frappe ERPnext
2e8e06c350 Merge branch 'develop' of https://github.com/frappe/erpnext into uom_after_qty 2020-09-03 18:08:02 +02:00
Frappe ERPnext
9355641c49 refactor: logic moved to standard template 
Previously print_settings.py controller decided which template to use.
Now standard template decides what to print according to settings.
 2020-09-03 17:31:21 +02:00
Frappe ERPnext
a5d5e70bf4 Revert "feat: Option to print UOM after quantity" 
This reverts commit a787882a8f.
 2020-09-03 17:30:25 +02:00
Marica
8d6b2d016f
Merge branch 'develop' into leaderboard-supplier 2020-09-03 20:08:37 +05:30
marination
2a56000460 fix: Supplier Leaderboard fix 2020-09-03 19:45:04 +05:30
Deepesh Garg
b306fa355d
Merge pull request #23248 from deepeshgarg007/pda_account_filter 
fix: Account filter in Process Deferred Accounting doctype
 2020-09-03 19:22:56 +05:30
Deepesh Garg
9b681770d0 fix: Account filter in Process Deferred Accounting doctype 2020-09-03 18:09:02 +05:30
Anurag Mishra
e5b7cb0c15 fix: data was not properly maped 2020-09-03 16:59:21 +05:30
gavin
f20b6360de
Merge branch 'develop' into overlap_for_additional_salary 2020-09-03 15:27:58 +05:30
Anurag Mishra
7952f89596 feat: Overlap validation additional salary 2020-09-03 15:21:35 +05:30
Rohit Waghchaure
68b0108301 fix: incorrect qty after transaction in stock ledger entry 2020-09-03 15:10:07 +05:30
rohitwaghchaure
d00bc3f422
Merge branch 'develop' into item-group-filter-portal 2020-09-03 15:04:04 +05:30
rohitwaghchaure
4b59043266
Merge pull request #23241 from Anurag810/hiding_regional_reports 
feat: removed roles for some regional report and added via setup
 2020-09-03 15:01:07 +05:30
rohitwaghchaure
6ffe809c66
Merge pull request #23233 from ruchamahabal/fix-rfq-conv-factor 
fix: set conversion factor while creating RFQ from Opportunity
 2020-09-03 14:45:01 +05:30
Anurag Mishra
54cd194b41 feat: removed roles for some reginal report and added via setup 2020-09-03 13:52:40 +05:30
Rucha Mahabal
979ad180fa fix: update rfq item in postprocess 2020-09-03 11:03:22 +05:30
michellealva
0857e6d669 fix: Add "Bank Clearance" and "Bank Reconciliation" in desk 2020-09-03 10:37:43 +05:30
Frappe ERPnext
f28bef868d feat: Checkbox for activation of printing UOM after quantity 
Checkbox will be added to Frappe after installation of ERPNext.
(Print Settings docType is part of frappe app, not erpnext app)
 2020-09-02 21:42:52 +02:00
Frappe ERPnext
be3b8a1c96 Merge branch 'develop' of https://github.com/frappe/erpnext into uom_after_qty 2020-09-02 21:31:31 +02:00
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
Anurag Mishra
41f421d400 feat: added option to add custom remarks in payment entry 2020-09-02 13:47:18 +05:30
Rucha Mahabal
a1b5d57076 test: make rfq from opportunity 2020-09-02 13:14:01 +05:30
rohitwaghchaure
3312956890
Merge pull request #23019 from prssanna/gross-profit-total 
feat: enable total row in Gross Profit Report
 2020-09-02 12:18:41 +05:30
rohitwaghchaure
1ab6c3fe94
Merge pull request #23059 from marination/credit-limit-email 
fix: Credit Limit Email not working
 2020-09-02 12:14:51 +05:30
Rucha Mahabal
d2881ba4dd fix: set conversion factor while creating RFQ from Opportunity 2020-09-02 11:52:59 +05:30
rohitwaghchaure
efd1ac5840
Merge pull request #23050 from anupamvs/stock-entry-type 
fix: deleting unused Stock Entry Type
 2020-09-02 11:43:29 +05:30
rohitwaghchaure
f898c807b8
Merge pull request #23227 from rohitwaghchaure/multiple-job-card-fixes 
Fix: job card issues
 2020-09-02 11:41:37 +05:30
Rohit Waghchaure
86a190652e fix: incorrect job card timer issue 2020-09-02 11:04:56 +05:30
rohitwaghchaure
6a51f3929b
Merge pull request #23054 from marination/general-ledger-filters 
fix: General Ledger filter validation
 2020-09-01 17:53:32 +05:30
Deepesh Garg
36b7bb0282
Merge pull request #23229 from deepeshgarg007/gst_template_update 
fix: Update tax template on supplier address change
 2020-09-01 16:27:44 +05:30
Marica
329292b9c3
Merge branch 'develop' into credit-limit-email 2020-09-01 16:18:12 +05:30
Deepesh Garg
cebf803455 fix: Update tax template on supplier address change 2020-09-01 16:15:28 +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
rohitwaghchaure
9bbb9dad8b
Merge pull request #23217 from anupamvs/product-contact-us-v13 
fix: contact us button issue
 2020-09-01 15:10:37 +05:30
Afshan
eb4b2aa142
fix: get_items from product bundle for purchase order (#22821) 
* fix: get_items from product bundle for purchase order

* fix: Don't overwrite  doctype while setting attributes in child row

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-09-01 15:01:32 +05:30
Shivam Mishra
d19947fccd
Merge pull request #23148 from scmmishra/feat-exotel-customer-link 2020-09-01 13:47:31 +05:30
Shivam Mishra
e91a5437bd
Merge pull request #23038 from scmmishra/iff-invoicing 2020-09-01 13:35:32 +05:30
Shivam Mishra
1b5de62454
Merge pull request #23121 from Mangesh-Khairnar/add-integrations-desk-page 
feat: add integrations desk page
 2020-09-01 13:34:52 +05:30
Anupam Kumar
232cb37ebf
Merge branch 'develop' into variance-report-fix 2020-09-01 09:31:22 +05:30
Anupam Kumar
477e41197e
Merge branch 'develop' into item-group-filter-portal 2020-09-01 09:09:19 +05:30
Deepesh Garg
37cb44e109
Merge pull request #23127 from marination/quoted-item-report-v2 
feat: Quoted Item Comparison Report Enhancements v2
 2020-08-31 21:28:56 +05:30
Deepesh Garg
26eab47851
Merge pull request #23221 from deepeshgarg007/pending_principal 
fix: Pending amount after loan closure request
 2020-08-31 21:25:53 +05:30