Michelle Alva
7a927cefbd
fix: Social Media Status hidden in Mobie View ( #23158 )
2020-08-26 10:32:26 +05:30
Deepesh Garg
b4a992e6a3
Merge pull request #23156 from ruchamahabal/add-maintenance-visit-link
...
feat: add Maintenance Visit link in Customer and Sales Order dashboards
2020-08-25 21:04:00 +05:30
Anupam Kumar
91461a0016
fix: heading is hidden in the mobile view ( #23145 )
2020-08-25 21:01:17 +05:30
Michelle Alva
258b256dc6
fix: Add Delivery Note link in Sales Invoice Dashboard ( #23161 )
2020-08-25 20:37:39 +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
Rucha Mahabal
d43d1408cf
fix: conversion factor for BOM exploded item rate
2020-08-25 17:13:05 +05:30
Shivam Mishra
de4ac0c905
chore: remove stray tabs
2020-08-25 17:10:05 +05:30
Shivam Mishra
2030b66fc6
feat: add customer link to call log
2020-08-25 17:09:53 +05:30
Anupam K
42092cc377
fix: Homepage Featured Product image fetch issue
2020-08-25 15:29:18 +05:30
Rushabh Mehta
ee921052c0
fix(minor): test dependencies
2020-08-25 14:35:49 +05:30
Rushabh Mehta
b5b8f9e72d
fix(minor): import
2020-08-25 14:14:23 +05:30
Rushabh Mehta
8ad0fa48bf
fix(minor): circular imports?
2020-08-25 12:24:31 +05:30
Rushabh Mehta
ff5d19609f
fix(hot): Pricing Rule encoding fixed
2020-08-25 11:59:57 +05:30
Anupam K
28f4417fc5
fix: added filter show in website for filtering product
2020-08-25 08:59:37 +05:30
Deepesh Garg
07ee7a5bd6
Merge branch 'develop' into dims_in_gl_report
2020-08-24 20:23:19 +05:30
Marica
3e966d6889
Merge branch 'develop' into crm-reports
2020-08-24 19:42:18 +05:30
Shivam Mishra
7556517a4f
feat: validate if removed item attributes exist in variants ( #22911 )
...
* feat: validate if removed item attributes exist in variants
* Update erpnext/stock/doctype/item/item.py
Co-authored-by: Marica <maricadsouza221197@gmail.com>
* Update erpnext/stock/doctype/item/item.py
Co-authored-by: Marica <maricadsouza221197@gmail.com>
* refactor: smaller loop
Co-authored-by: marination <maricadsouza221197@gmail.com>
* feat: don't run validation for new entries
Co-authored-by: Marica <maricadsouza221197@gmail.com>
* fix: use tuple as is
Co-authored-by: Marica <maricadsouza221197@gmail.com>
* refactor: error description
Co-authored-by: Marica <maricadsouza221197@gmail.com>
* refactor: remove unused variable
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-08-24 19:37:09 +05:30
marination
8f452b8663
fix: Codacy and indicator message
2020-08-24 18:57:07 +05:30
marination
f49665077c
feat: Quoted Item Comparison Report Enhancements v2
2020-08-24 18:26:48 +05:30
Anupam K
64e84643fb
lost opportunity
2020-08-24 18:01:28 +05:30
rohitwaghchaure
cf4268e21a
Merge pull request #23116 from nabinhait/subcontracted-pr-gle
...
fix: GLE for subcontracted PR is fg item rate is zero
2020-08-24 16:07:32 +05:30
Shivam Mishra
5d6b07558d
Merge branch 'develop' into iff-invoicing
2020-08-24 07:56:01 +00:00
rohitwaghchaure
554e2c2eb7
Merge pull request #23120 from deepeshgarg007/sle_cancel
...
fix: Reverse SLE not created for fraction qty or qty less than 1
2020-08-24 13:25:12 +05:30
rohitwaghchaure
7d8d26bbea
Merge pull request #23106 from ruchamahabal/add-pos-page
...
fix: POS page link not visible on Desk
2020-08-24 12:22:18 +05:30
Mangesh-Khairnar
e292fd6c58
feat: add integrations desk page
2020-08-24 00:45:13 +05:30
Deepesh Garg
8331a38ace
fix: Test Case for qty less than 1
2020-08-23 21:23:26 +05:30
Deepesh Garg
cb0bc2dcaf
fix: Negative SLE not created for fraction qty or qty less than 1
2020-08-23 20:43:50 +05:30
Nabin Hait
337ee0a4bf
test: Test case for GLE in subcontracted PR if FG item rate is zero
2020-08-22 20:02:27 +05:30
Nabin Hait
df175cc8fc
fix: GLE for subcontracted PR is fg item rate is zero
2020-08-22 19:17:18 +05:30
Nabin Hait
111183d080
fix: Installation failed due to global variable ( #23114 )
2020-08-22 12:31:06 +05:30
Deepesh Garg
1b760cb278
Merge branch 'develop' of https://github.com/frappe/erpnext into navbar_links
2020-08-21 12:36:21 +05:30
Saurabh
66ff5e5e77
Merge pull request #22990 from saurabh6790/erpnext-before-install-flag-1
...
fix: check setup complete flag instead setup page
2020-08-21 11:55:38 +05:30
Nabin Hait
1ba62c9732
fix:Validate Job offer against vacancies ( #23109 )
2020-08-20 19:39:10 +05:30
Deepesh Garg
cf3e482052
Merge pull request #23105 from deepeshgarg007/rcm_submit_v13
...
fix: Unable to submit reverse charge invoice
2020-08-20 19:35:25 +05:30
Marica
c23797e350
fix: Create Opportunity without Default Company from Email ( #23097 )
...
* fix: Create Opoortunity without Default Company from Email
* fix: Add Prompt to Select Company
* Update communication.js
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-08-20 19:12:12 +05:30
Rucha Mahabal
4061186429
fix: POS page link not visible on Desk
2020-08-20 18:01:20 +05:30
Deepesh Garg
afd2dd3570
fix: Unable to submit reverse charge invoice
2020-08-20 16:52:52 +05:30
rohitwaghchaure
019d4debb2
fix: incorrect stock value in return case ( #23102 )
2020-08-20 15:53:58 +05:30
Raffael Meyer
f0b9f660cd
Merge branch 'develop' into datev_refactor
2020-08-20 12:05:50 +02:00
Shivam Mishra
25ba271562
Merge branch 'develop' into fix-margin-for-filter
2020-08-20 08:59:04 +00:00
Shivam Mishra
d5971d3c59
Merge branch 'develop' into iff-invoicing
2020-08-20 08:16:22 +00:00
rohitwaghchaure
5f2463933a
Merge pull request #23061 from DeeMysterio/dev-sort-warehouses-qty
...
feat(queries): sort warehouses based on item quantity in descending manner
2020-08-20 09:36:16 +05:30
Raffael Meyer
585f1f67b7
Merge branch 'develop' into navbar_links
2020-08-19 18:55:44 +02:00
Raffael Meyer
2c26144a6b
Update erpnext/patches/v13_0/add_standard_navbar_items.py
2020-08-19 18:55:06 +02:00
Deepesh Garg
cbedb3de3a
Merge pull request #23089 from deepeshgarg007/rcm_deduction_v13
...
fix: Do not update total for RCM invoices if net taxes are zero
2020-08-19 20:19:06 +05:30
Deepesh Garg
8aed48fe31
fix: Do not update total for RCM invvoices if net taxes are zero
2020-08-19 18:59:27 +05:30
Rucha Mahabal
eed2a6340c
Merge branch 'develop' into fix-pos-print
2020-08-19 18:57:47 +05:30
marination
22d3729427
fix: Codacy
2020-08-19 15:42:40 +05:30
Deepesh Garg
aaeb3980bc
feat: JSON download for HSN wise outward summary
2020-08-19 15:13:30 +05:30
marination
698d983eef
fix: Item Tax Updation via Update Items in SO/PO
2020-08-19 14:59:46 +05:30
Diksha Jadhav
182ee5e7c1
feat(queries): sort warehouses based on item quantity
2020-08-19 14:04:34 +05:30
Deepesh Garg
1fb1c08872
Merge pull request #23076 from deepeshgarg007/hsn_wise_outward_v13
...
fix: Tax amounts in HSN Wise Outward summary
2020-08-19 11:43:14 +05:30
Deepesh Garg
b240cfe401
fix: Remove print statements
2020-08-19 11:41:43 +05:30
Deepesh Garg
64ebbf0907
fix: Tax amounts in HSN Wise Outward summary
2020-08-19 11:41:33 +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
Deepesh Garg
1c14606c06
fix: Total calculations for multicurrency RCM invoices ( #23072 )
2020-08-18 19:32:52 +05:30
Deepesh Garg
9d60e48538
Merge pull request #23067 from rohitwaghchaure/profit-and-loss-report-not-working
...
fix: profit and loss report not working
2020-08-18 17:03:10 +05:30
Rohit Waghchaure
310ade7282
profit and loss report not working
2020-08-18 16:07:24 +05:30
Marica
847343af86
Merge branch 'develop' into general-ledger-filters
2020-08-18 13:40:45 +05:30
Marica
12c68d0450
Merge branch 'develop' into credit-limit-email
2020-08-18 13:39:03 +05:30
Marica
2d767debf1
Merge branch 'develop' into shift_management
2020-08-18 13:27:15 +05:30
Michelle Alva
849b712770
fix: Change spelling of "Successful" ( #23063 )
...
Before:
Import Successfull
After:
Import Successful
2020-08-18 12:06:46 +05:30
Shivam Mishra
115ad3e99a
Merge branch 'develop' into iff-invoicing
2020-08-18 05:51:41 +00:00
Rucha Mahabal
035907a24f
fix: remove Request for Quotation link from Fiscal Year dashboard ( #23040 )
2020-08-18 10:57:10 +05:30
Glen Whitney
b2604d1f77
fix(General Ledger): include Accounting Dimension columns in report
...
Prior to this commit, custom Accounting Dimensions are not
(by default) shown or even considered in generating a General
Ledger report. Moreover, as they are not considered, they are
not used to distinguish GL Entry lines in the same voucher
with the same Account when the "Group By" value is
"Group by Voucher (Consolidated)". This situation leads to
lines with different values for the accounting dimension
to be ganged together in the General Ledger view of a Journal
entry, making the entry difficult for an accountant to read.
This commit alleviates the problem by adding a checkbox
to control whether Accounting Dimension columns are considered
in the General Ledger report. When they are considered, they
are displayed and also included in the key that distinguishes
lines in the "Group by Voucher (Consolidated)" mode.
Resolves #23033 .
2020-08-17 20:43:56 +00:00
Deepesh Garg
38cabbd4b8
Merge pull request #23007 from prssanna/expense-claim-list-currency
...
fix: add company in list fields to fetch for Expense Claim
2020-08-17 23:07:51 +05:30
Deepesh Garg
aef5c4cb64
Merge pull request #23044 from frappe/sales-analytics
...
fix: Remove dependency of Sales Order in Sales Analytics
2020-08-17 23:00:49 +05:30
Shivam Mishra
eb832f6861
Merge branch 'develop' into iff-invoicing
2020-08-17 12:53:43 +00:00
Marica
4c1ea3e0e3
Merge branch 'develop' into credit-limit-email
2020-08-17 18:10:29 +05:30
Marica
0a926ee20d
Merge branch 'develop' into general-ledger-filters
2020-08-17 18:10:05 +05:30
Marica
11a167f8bb
Merge branch 'develop' into shift_management
2020-08-17 16:39:27 +05:30
marination
205df14a48
fix: Credit Limit Email not working
2020-08-17 16:23:44 +05:30
Anurag Mishra
df7b428331
fix: UI/UX Salary details and salary slip form cleanup ( #22536 )
...
* fix: UI/UX Salary details
* feat: salary slip form cleaup
* fix(test): set working days zero if salary slip is based on timesheet
* fix(revert): set working days zero if salary slip is based on timesheet
* fix: salary slip form cleanup
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2020-08-17 14:09:54 +05:30
Marica
39c97bfbe9
Merge branch 'develop' into shift_management
2020-08-17 13:46:51 +05:30
Anurag Mishra
13be09e883
Update update_start_end_date_for_old_shift_assignment.py
2020-08-17 13:43:33 +05:30
Afshan
084de5f0b2
fix: handled condition if staffing isn't created ( #22992 )
...
* fix: handled condition if staffing isn't created
* style: reformated code for redability
* Update erpnext/hr/doctype/job_offer/job_offer.py
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-08-17 13:14:09 +05:30
marination
eb241c6c42
fix: General Ledger filter validation
2020-08-17 12:57:56 +05:30
Anupam K
d7b69e57ae
fix: deleting unused Stock Entry Type
2020-08-17 11:20:56 +05:30
Afshan
5b45961b9d
fix: the JSON object must be str, bytes or bytearray, not "list" ( #23047 )
...
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2020-08-17 10:51:53 +05:30
Deepesh Garg
e1e847a3f7
feat: Enhancement in Loan Topups
2020-08-16 20:57:39 +05:30
Deepesh Garg
a2249e013d
Merge branch 'develop' of https://github.com/frappe/erpnext into loan_top_up_fixes
2020-08-15 18:28:04 +05:30
michellealva
e69b2e0da1
fix: Remove dependency of Sales Order in Sales Analytics
2020-08-15 10:16:26 +05:30
Shivam Mishra
fe57ed629e
Merge branch 'develop' into iff-invoicing
2020-08-14 14:31:31 +00:00
Shivam Mishra
736aee886e
Merge branch 'develop' into support-search
2020-08-14 13:36:59 +00:00
Rucha Mahabal
5fb0e7184e
fix: list index out of range error while setting POS payment mode ( #23018 )
2020-08-14 17:11:39 +05:30
Suraj Shetty
cab5918244
Merge branch 'develop' into HR-fix
2020-08-14 16:12:28 +05:30
Shivam Mishra
3daa9de998
feat: add email option to field email_id
2020-08-14 13:46:58 +05:30
Shivam Mishra
6b68eaad1e
feat: use email template for membership acknowledgement
2020-08-14 13:46:58 +05:30
Shivam Mishra
b4d3666e69
feat: show send acknowledgement button if enabled in settings
2020-08-14 13:46:58 +05:30
Shivam Mishra
e4c58c37c8
feat: allow member creation via API
2020-08-14 13:46:58 +05:30
Shivam Mishra
98bcedd09c
feat: create member if not already exists
2020-08-14 13:46:58 +05:30
Shivam Mishra
d7139bbd43
fix: type error
2020-08-14 13:46:58 +05:30
Shivam Mishra
87ddec069e
refactor: try block across the function
2020-08-14 13:46:58 +05:30
Shivam Mishra
6fbe9b5404
fix: remove payload
2020-08-14 13:46:58 +05:30
Shivam Mishra
733bde31c9
fix: doctype name in patch
2020-08-14 13:46:58 +05:30
Shivam Mishra
3a67a78ece
feat: add custom buttons for invoice and email
2020-08-14 13:46:58 +05:30
Shivam Mishra
8e0314e7f6
feat: separate invoice generation and email
2020-08-14 13:46:58 +05:30
Shivam Mishra
c8d9e7f77b
feat: add message field
2020-08-14 13:46:58 +05:30
Shivam Mishra
1678eb9b50
feat: drop payload column
2020-08-14 13:46:58 +05:30
Shivam Mishra
62e344188a
feat: update settings and link filters
2020-08-14 13:46:32 +05:30
Shivam Mishra
15340e0c7f
feat: send invoice via email
2020-08-14 13:46:32 +05:30
Shivam Mishra
811ac909f9
feat: add auto invoice creation fields and controllers
2020-08-14 13:46:32 +05:30
Shivam Mishra
96dc67c35e
feat: add copy button and docs link
2020-08-14 13:46:32 +05:30
Shivam Mishra
3a1868dae8
feat: add item field
2020-08-14 13:46:32 +05:30
Shivam Mishra
a16b24d50a
feat: add enable or disable invoicing and print format field
2020-08-14 13:46:32 +05:30
Anurag Mishra
759632c025
fix: requested Changes
2020-08-14 12:26:04 +05:30
Anurag Mishra
6f1579da1f
Merge branch 'develop' into shift_management
2020-08-14 12:11:41 +05:30
Deepesh Garg
8ca57eb5dd
Merge pull request #23022 from marination/loan-amount
...
fix: Validate or Set Loan Amount first
2020-08-13 19:53:09 +05:30
Afshan
d7d92c520e
fix: removed code relating to standard working hours ( #23009 )
2020-08-13 19:40:09 +05:30
Deepesh Garg
1151f888ba
fix: Set pledge amount before setting loan amount
2020-08-13 18:52:23 +05:30
bhavesh95863
a647bef682
fix: warehouse mandatory even update stock uncheck ( #23023 )
2020-08-13 17:41:55 +05:30
Anupam K
b3bd780d46
fix: codasy dix
2020-08-13 17:07:15 +05:30
Anurag Mishra
f096ba4998
patch: Old Shift Assignment
2020-08-13 14:18:48 +05:30
Anurag Mishra
c2710e05ce
fix: showing on_going shift on calendar
2020-08-13 14:17:47 +05:30
Anurag Mishra
74f0a1ab7c
fix: changes Requested
2020-08-13 14:17:47 +05:30
Anurag Mishra
00a8081aba
Fix: button label
2020-08-13 14:17:47 +05:30
Anurag Mishra
dcf598dc2d
Fix: requested Changes
2020-08-13 14:17:47 +05:30
Anurag Mishra
d5c921e358
Fix: Requested Changes
2020-08-13 14:17:47 +05:30
Anurag Mishra
b48110caf1
Update erpnext/hr/doctype/shift_assignment/shift_assignment.py
...
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-08-13 14:17:47 +05:30
Anurag Mishra
3aa1101d5e
fix: requested changes
2020-08-13 14:17:47 +05:30
Anurag Mishra
17e6d0918b
feat: Employee level Shift Request Approver
2020-08-13 14:17:47 +05:30
Anurag Mishra
43ba7dd4c8
feat: don't allow to request for default shift
2020-08-13 14:17:47 +05:30
Anurag Mishra
feef4a6c1e
test: employee checkin
2020-08-13 14:17:47 +05:30
Anurag Mishra
b3e00de0ae
refactor: Shift Request
2020-08-13 14:17:47 +05:30
Anurag Mishra
a6ec7e31d2
test: shift assignment
2020-08-13 14:17:47 +05:30
Anurag Mishra
dd46d19765
feat: map event calendar to show ongoing shift assignment and fixed period assigment
2020-08-13 14:17:47 +05:30
Anurag Mishra
afa98bb39b
feat: Assign shift for period or create ongoing assignment
2020-08-13 14:17:47 +05:30
marination
8264fcd0a5
fix: Only validate repayment if term loan
2020-08-13 12:47:34 +05:30
marination
6988fbb82d
fix: Validate or Set Loan Amount first
2020-08-13 12:17:13 +05:30
prssanna
bfb219612e
feat: enable total row in Gross Profit Report
2020-08-13 11:34:05 +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
Nabin Hait
e2ee455acc
fix: Calculate taxes if tax is based on item quantity
2020-08-12 20:58:03 +05:30
Deepesh Garg
21a220e2a5
fix: Update state code and union territory for Daman and Diu ( #22988 )
...
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2020-08-12 19:19:03 +05:30
Rucha Mahabal
cd5821e00a
Merge pull request #23011 from ruchamahabal/fix-asset-maintenance-status
...
fix: don't set asset maintenance log status as Overdue when Completed or Cancelled
2020-08-12 19:17:33 +05:30
Deepesh Garg
617027c6ca
Merge branch 'develop' of https://github.com/frappe/erpnext into navbar_links
2020-08-12 18:39:20 +05:30
Rucha Mahabal
517a6d0054
fix: set draft indicators for Asset Maintenance Log listview
2020-08-12 18:01:45 +05:30
Rucha Mahabal
691ec1bd27
fix: don't set maintenance log status as Overdue when Completed or Cancelled
2020-08-12 18:01:07 +05:30
Anupam Kumar
674d1b0803
feat: Material Request and Stock Entry Enhancement ( #22671 )
...
* feat: send to warehouse
* adding warehouse validation
* fix: review changes
* fix: review changes
* stock entry enhancement
* fix: review changes
2020-08-12 17:55:02 +05:30
Rucha Mahabal
e0cc421e50
fix: TypeError while setting transfer_qty in Stock Entry ( #22929 )
...
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-08-12 14:33:30 +05:30
Marica
846771cb29
Merge branch 'develop' into item-image-alt
2020-08-12 13:37:19 +05:30
Deepesh Garg
1d5ab618d2
Merge pull request #23001 from nabinhait/inclusive-tax-based-on-item-quantity
...
fix: Calculate taxes if tax is based on item quantity and inclusive on item price
2020-08-11 22:05:02 +05:30
Deepesh Garg
7d0a625b9c
git commit -m "fix: Add missing semicolon"
2020-08-11 22:02:12 +05:30
Nabin Hait
19ea7218d9
fix: Calculate taxes if tax is based on item quantity and inclusive on item price
2020-08-11 20:34:57 +05:30
Shivam Mishra
1679c7af88
Merge branch 'develop' into support-search
2020-08-11 14:54:10 +00:00
Afshan
ba33900712
Merge remote-tracking branch 'upstream/develop' into fix-duplicate-dropdown-PO
2020-08-11 20:17:05 +05:30
Afshan
b5b2586968
fix: referencing frm
2020-08-11 20:15:57 +05:30
Shivam Mishra
2fe5d76fe4
Merge branch 'develop' into item-image-alt
2020-08-11 14:45:55 +00:00
Shivam Mishra
ccdaf3da66
Merge branch 'develop' into fix-margin-for-filter
2020-08-11 14:41:29 +00:00
Deepesh Garg
ca9038feb7
Merge pull request #22998 from abhishekbalam/rename_source_section_opportunity
...
fix(CRM): Change 'Source' section name to 'More Information' in Opportunity
2020-08-11 18:26:09 +05:30
Anurag Mishra
ed6e9550ca
fix: removed payroll from HR. ( #22991 )
...
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2020-08-11 18:04:42 +05:30
Deepesh Garg
2633e292a5
fix: Is Secured Loan check mapping
2020-08-11 18:03:28 +05:30
Abhishek Balam
d0ae92d4bd
fix: moved company field, renamed to 'More Information'
2020-08-11 17:39:17 +05:30
prssanna
5a7618d8ec
fix: add company in list fields to fetch for Expense Claim
2020-08-11 16:50:31 +05:30
Abhishek Balam
ee5b9c7691
feat(Accounting): Process Statement Of Accounts ( #22901 )
...
* feat: Process Statement Of Accounts initial commit
* fix: add jinja supported inputs for subject and body in email settings
* feat: utils support in template, tested autoemail, fixed issues
2020-08-11 16:23:47 +05:30
Abhishek Balam
9f6d114265
fix: Change Source section name to 'Company Information'
2020-08-11 16:16:05 +05:30
Anupam Kumar
79d731dcd8
feat: Naming series for Sales/Purchase Return ( #22942 )
...
* feat: adding return naming series
* Update purchase_invoice.json
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-08-11 16:11:20 +05:30
Deepesh Garg
145b80b11c
Merge pull request #22987 from frappe/fix-company-field
...
fix: Consistent capitalization
2020-08-11 16:09:27 +05:30
Deepesh Garg
2621016884
fix: Allocated advance amount for multi-currency payment ( #22923 )
...
* fix: Allocated advance amount for multicurrency payment
* fix: Get grand total based on party currency
* fix: Remove unwanted code
2020-08-11 16:06:13 +05:30
Abhishek Balam
ef3b82dae2
fix(CRM): Move Source section above Follow Up section In Opportunity ( #22974 )
...
* fix: move source section above follow up
* fix: only moving source field to 1st section
2020-08-11 16:05:02 +05:30
Shivam Mishra
3325be1d87
fix: spacing for slideshow ( #22996 )
2020-08-11 16:03:46 +05:30
Deepesh Garg
285e059394
Merge pull request #22997 from abhishekbalam/set_opportunity_status_to_converted
...
fix(CRM): Change Opportunity to 'Converted' when Sales Order is created
2020-08-11 16:00:16 +05:30
Abhishek Balam
c992616d35
fix: change opportunity to 'Converted' when items not selected in opportunity itself for making quotation and sales order
2020-08-11 15:22:54 +05:30
Shivam Mishra
c798c6abbd
Merge branch 'develop' into fix-margin-for-filter
2020-08-11 09:11:30 +00:00
Afshan
acc3d42cf0
fix: escape apostrophe in company name if exist ( #22956 )
...
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2020-08-11 14:40:44 +05:30
Shivam Mishra
49dd8782fd
fix: margin overflow cutting the focus state
2020-08-11 14:39:04 +05:30
Rucha Mahabal
19b51762ef
fix: escape fields for Payroll Entry ( #22994 )
2020-08-11 13:12:00 +05:30
Rucha Mahabal
f7a7cc08d9
Merge branch 'develop' into escape-company-field
2020-08-11 10:22:32 +05:30
Saurabh
58d05ac0e0
fix: check setup complete flag insted setup page
2020-08-10 19:36:45 +05:30
Jai Chavan
dbbb864ba5
fix: Consistent capitalization
2020-08-10 16:55:03 +05:30
Deepesh Garg
069a54e5c3
fix: Cancellation of accounting transactions within closed accounting period
2020-08-10 16:01:01 +05:30
Deepesh Garg
372abaa420
Merge pull request #22976 from marination/sales-taxes-dashboard
...
fix: Susbcription in Sales Taxes and Charges Dashboard
2020-08-10 15:17:59 +05:30
marination
0f27500197
fix: Susbcription in Sales Taxes and Charges Dashboard
2020-08-10 15:17:58 +05:30
Saurabh
2547b7479e
Merge pull request #22975 from nextchamp-saqib/pos-fixes-1
...
fix: [pos] minor bugs
2020-08-10 14:50:53 +05:30
Marica
0fcb05a3aa
fix: Misleading filters on Item tax Template Link field ( #22918 )
...
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2020-08-10 14:48:13 +05:30
Saqib Ansari
f1091534cd
fix: [pos] minor bugs
2020-08-10 14:45:58 +05:30
Marica
42fbdc09f8
Merge branch 'develop' into opportunity-from-email
2020-08-10 13:48:43 +05:30
Anoop
d3d3db654e
fix: Inpatient Record - Transfer check-in time validation ( #22958 )
...
* fix: inpatient transfer should not allow future checkin time
* Update erpnext/healthcare/doctype/inpatient_record/inpatient_record.js
Error message corrected
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2020-08-10 13:21:12 +05:30
Deepesh Garg
d626e3bd2e
Merge branch 'develop' into billing_address_fetch
2020-08-10 12:57:12 +05:30
Shivam Mishra
ded9f41cce
refactor: update confusing label
2020-08-10 12:45:07 +05:30
marination
a07973cfa5
fix: Creating opportunity from email
2020-08-10 12:39:42 +05:30
Anurag Mishra
95984fd921
fix: Not able to cancel application,allocation nad encashments
2020-08-10 12:36:00 +05:30
Rucha Mahabal
97ecf52d6f
fix: failing Fees test
2020-08-10 12:13:35 +05:30
Prssanna Desai
5c0439f768
fix: set correct default value from from date in downtime analysis report ( #22903 )
...
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2020-08-10 11:12:52 +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
Deepesh Garg
41a4999711
Merge pull request #22843 from nextchamp-saqib/asset-adj-dimension-fix
...
fix: cannot submit value adjustment with custom dimension
2020-08-10 10:12:41 +05:30
Deepesh Garg
097d89f550
Merge pull request #22946 from deepeshgarg007/gst_export_wopay
...
fix: GSTR 1 report for exports without payment of Tax
2020-08-10 09:56:12 +05:30
Anupam K
d01caac852
report lead detail
2020-08-10 09:39:58 +05:30
Mangesh-Khairnar
a53f15ca35
fix: remove mentions of display items in stock ( #22963 )
2020-08-09 13:12:47 +05:30
Deepesh Garg
7882c70244
Merge pull request #22959 from deepeshgarg007/gst_rcm_fixes_v13
...
fix: Taxable value for RCM
2020-08-08 22:34:36 +05:30
Deepesh Garg
d4ecf426b7
fix: Place of supply fix
2020-08-08 22:33:18 +05:30
Deepesh Garg
5ac2fd94f0
fix: Taxable value for RCM
2020-08-08 22:28:13 +05:30
Deepesh Garg
af1f46f2d9
fix: Add default billing address for purchase documents
2020-08-07 19:44:20 +05:30
Deepesh Garg
72fc188706
Merge pull request #21756 from deepeshgarg007/loan_patch_and_fixes
...
fix: Description for fields and patch for old loans
2020-08-07 17:08:31 +05:30
Deepesh Garg
bad269c354
fix: Parent income account check
2020-08-07 16:21:41 +05:30
Afshan
1f3cc7553c
fix: grand_total assigment before reference
2020-08-07 15:57:31 +05:30
Rucha Mahabal
8118dd9e62
fix: escape company field
2020-08-07 14:52:50 +05:30
Deepesh Garg
ab611d5fd8
fix: GSTR 1 report for exports without payment of Tax
2020-08-07 14:47:40 +05:30
Shivam Mishra
b7a24ad95b
Merge branch 'develop' into item-image-alt
2020-08-07 09:15:00 +00:00
Shivam Mishra
b1f8859121
feat: add alt value in product page
2020-08-07 14:38:40 +05:30
Shivam Mishra
a0954e66a8
feat: add image alt argument for product_image macros
2020-08-07 14:34:54 +05:30
Shivam Mishra
ba4c4f107e
feat: add image alt field in items
2020-08-07 14:34:28 +05:30
Deepesh Garg
b98088bb01
Merge branch 'develop' into loan_patch_and_fixes
2020-08-07 13:27:40 +05:30
Deepesh Garg
a306af8c08
fix: Add help link in navbar settings
2020-08-06 20:52:02 +05:30
Shivam Mishra
124eabaac8
Merge branch 'develop' into barredterra-patch-1
2020-08-06 14:16:48 +00:00
Rucha Mahabal
a78336e77d
fix: remove patch for retaining permissions for Video DocType ( #22932 )
...
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-08-06 19:01:42 +05:30
Raffael Meyer
d854d39c00
fix: show only company's bank accounts
2020-08-06 15:09:22 +02:00
marination
63513f1b14
fix: Show Add to Cart Button anyway
...
- add to cart wasnt visible if show price is disabled in shopping cart settings (product_info = null), creating confusion
2020-08-06 18:22:28 +05:30
marination
ccf44a1bfd
fix: product action instead of info
2020-08-06 17:34:38 +05:30
Shivam Mishra
01f664a88f
fix: handle product_info null
2020-08-06 17:24:02 +05:30
Shivam Mishra
33a5fdfb78
fix: unbound error in product configurator
2020-08-06 17:23:51 +05:30
Afshan
085061fa21
fix: show or hide section or attributes depending on other attributes… ( #22861 )
...
* fix: show or hide section or attributes depending on other attributes for better UI
* Update erpnext/stock/doctype/item/item.js
Co-authored-by: Marica <maricadsouza221197@gmail.com>
* fix: made has_variants checkbox to read_only if stock_exists
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-08-06 14:36:34 +05:30
Marica
1afe177a4f
Merge branch 'develop' into education-dashboard
2020-08-06 14:12:00 +05:30
Deepesh Garg
44d62ad0d7
Merge pull request #22921 from ruchamahabal/fix-payment-entry-ref
...
fix: condition for checking reference details for Payment Entry
2020-08-05 23:16:14 +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
Rucha Mahabal
5da067b689
fix: condition for checking reference detail for Payment Entry
2020-08-05 18:18:57 +05:30
Marica
0c818927a5
fix: get_regional_address_details missing positional arg 'company' ( #22915 )
2020-08-05 16:47:41 +05:30
Rucha Mahabal
f9143e9bb0
Merge branch 'develop' into education-dashboard
2020-08-05 16:28:14 +05:30
Rucha Mahabal
8edace1a58
fix: covert Program wise Fee Collection to a Script Report
2020-08-05 16:24:21 +05:30
Rucha Mahabal
d67c2ea0d4
fix: make program field mandatory in Fees
2020-08-05 14:13:14 +05:30
Nabin Hait
a042d4721e
fix: Bank Clearance of POS purchase invoice ( #22882 )
2020-08-03 20:42:15 +05:30
Rucha Mahabal
b7311c8fc1
fix: SQL query in accounts receivable, payable reports ( #22888 )
2020-08-03 20:41:25 +05:30
Marica
e211bb7a53
fix: Reposition description in Warehouse ( #22895 )
2020-08-03 20:40:09 +05:30
Nabin Hait
48163e31c5
Dunning cleanup ( #22898 )
...
* fix: Dunning cleanup
* fix: Added dashboard for Dunning
2020-08-03 20:38:28 +05:30
Rucha Mahabal
101fe2b769
fix: Assessment Result child table not visible when accessed via dashboard ( #22880 )
...
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-08-03 19:42:24 +05:30
Anupam Kumar
1895e9b89a
fix: Shopping cart issue v13 ( #22868 )
...
* refactoring shopping cart settings
* adding column_break in shopping cart settings
* fix: mandatory depend on fix company
* fix: resetting company, price_list, default_customer_group, quotation_series when card is diabled.
2020-08-03 18:50:11 +05:30
Rucha Mahabal
b50b20458e
fix: TypeError while concatenating account number and name in COA ( #22885 )
...
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2020-08-03 15:51:57 +05:30
Marica
dd97524db5
fix: Misleading description in Warehouse ( #22877 )
...
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2020-08-03 14:55:40 +05:30
Prssanna Desai
1dfd9fd756
fix: check if row['delay'] exists ( #22889 )
2020-08-03 14:48:45 +05:30
Deepesh Garg
2f2de2264d
Merge pull request #22887 from deepeshgarg007/subscription_test
...
fix: Test case for subscription
2020-08-03 14:31:21 +05:30
Deepesh Garg
5572f8eb1e
fix: Test case for subscription
2020-08-03 13:40:11 +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
Nabin Hait
9cc2d340ba
Reset home page based on product settings ( #22875 )
2020-08-03 10:43:47 +05:30
Nabin Hait
4cc99286c0
fix: Update modified timestamp in accounts settings ( #22873 )
2020-08-03 09:33:31 +05:30
Anurag Mishra
ba52dd8ba6
fix: minor payroll_dashboard fixes ( #22832 )
...
* fix: minor payroll_dashboard fixes
* Update erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.js
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2020-08-03 08:57:49 +05:30
Deepesh Garg
4104887abb
fix: fieldname in filter
2020-08-02 18:23:54 +05:30
Deepesh Garg
d909669a18
fix: Test cases
2020-08-02 17:00:53 +05:30
Deepesh Garg
b9dc21129c
fix: Loan Seurity shortfall calculation fixes
2020-08-01 22:51:40 +05:30
Deepesh Garg
946e106714
Merge pull request #22863 from deepeshgarg007/taxjar_fix
...
fix: Import pycountry and taxjar only if taxjar is enabled
2020-08-01 13:52:40 +05:30
Deepesh Garg
dcb462f305
fix: Import pycountry and taxjar only if taxjar is enabled
2020-08-01 13:47:09 +05:30
Anurag Mishra
2a4c90302b
fix: minor recritment analytics fixes ( #22830 )
...
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2020-07-31 17:59:30 +05:30
Marica
cf00ee49ec
fix: PO/SO view title ( #22858 )
2020-07-31 15:14:50 +05:30
Deepesh Garg
01e0d50eba
Merge pull request #22854 from nabinhait/gl-balance-fix
...
fix: Ignore cancelled gl entries to get account balance
2020-07-30 22:15:23 +05:30
Nabin Hait
9837285bf1
fix: Ignore cancelled gl entries to get account balance
2020-07-30 20:52:20 +05:30
Rucha Mahabal
b6675f8dd4
feat: Lab Test Report Summary and Chart
2020-07-30 19:33:08 +05:30
Rucha Mahabal
c5ccf38cdf
refactor: Lab Test Report
2020-07-30 18:56:16 +05:30
Saurabh
a14618efe4
fix: validate theme_scss attribute
2020-07-30 17:22:29 +05:30
Rucha Mahabal
ca1b389c99
fix: validate negative quantity for sample collection
2020-07-30 16:58:19 +05:30
Rucha Mahabal
fa2c20ea9e
chore: Sample Collection Form clean-up
2020-07-30 16:56:11 +05:30
