bhavesh95863
33f984c7af
fix: can't multiply sequence by non-int of type 'float
2020-08-27 21:49:21 +05:30
Rucha Mahabal
c8eea556d1
fix: BOM Update Tool failing due to Too Many Writes error
2020-08-27 18:54:25 +05:30
michellealva
ead2f6abf0
fix: Chage fiedtype of Customer's PO in Sales Invoice
2020-08-27 13:57:15 +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
Marica
e7fabb10e1
Merge branch 'develop' into general-ledger-filters
2020-08-27 11:59:01 +05:30
bhavesh95863
bb5d886930
fix: account & cost center filter by company
2020-08-26 18:23:21 +05:30
marination
733fd5f03c
fix: get_applied_pricing_rule in taxes_and_totals
2020-08-26 18:23:12 +05:30
Marica
d741ac6871
Merge branch 'develop' into quoted-item-report-v2
2020-08-26 17:33:13 +05:30
Rucha Mahabal
cf2db41876
Merge branch 'develop' into fix-appointment-overlap
2020-08-26 16:33:27 +05:30
Anupam K
c7830f7107
feat: Added phone field in product Inquiry
2020-08-26 15:28:22 +05:30
Rucha Mahabal
9766adbf4e
fix: don't overwrite appointment duration if already specified
2020-08-26 14:53:23 +05:30
Rushabh Mehta
73f648473f
fix(minor): update_start_end_date_for_old_shift_assignment.py
2020-08-26 14:51:37 +05:30
Rushabh Mehta
a163d8bc84
fix(minor): rename_lost_reason_detail
2020-08-26 14:51:37 +05:30
Rushabh Mehta
544d18327c
fix(patch): quotation_lost_reason_detail
2020-08-26 14:51:37 +05:30
Rushabh Mehta
38fad58834
fix(patch)
2020-08-26 14:51:37 +05:30
rohitwaghchaure
fe0ecc2ff7
Merge pull request #23144 from anupamvs/product-image
...
fix: Homepage Featured Product image fetch issue
2020-08-26 13:05:50 +05:30
rohitwaghchaure
5f4b5f3f46
Merge pull request #23151 from ruchamahabal/fix-conversion-factor
...
fix: conversion factor for BOM exploded item rate
2020-08-26 13:01:13 +05:30
bhavesh95863
d888a59bd1
fix: set company filter in condition
2020-08-26 12:44:20 +05:30
Deepesh Garg
f4b939754c
fix: Codacy fixes
2020-08-26 12:10:12 +05:30
Deepesh Garg
29f187f4f3
Merge branch 'develop' into hsn_wise_json
2020-08-26 12:05:59 +05:30
Shivam Mishra
e1e5e3c915
Merge branch 'develop' into iff-invoicing
2020-08-26 11:30:01 +05:30
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
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
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
Deepesh Garg
aaeb3980bc
feat: JSON download for HSN wise outward summary
2020-08-19 15:13:30 +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
