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
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
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
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
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
e9b229c246
Merge pull request #23049 from deepeshgarg007/loan_top_up_fixes
...
feat: Enhancement in Loan Topups
2020-08-16 22:52:48 +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
2da23ba051
Merge pull request #22447 from scmmishra/support-search
...
feat: added search to support page
2020-08-14 14:01:17 +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
404afb823f
Merge pull request #22723 from Anurag810/HR-fix
2020-08-14 16:43:28 +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
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
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
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
Rucha Mahabal
517a6d0054
fix: set draft indicators for Asset Maintenance Log listview
2020-08-12 18:01:45 +05:30
