nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-18 09:05:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
32,275 Commits 399 Branches 1,700 Tags
28f4417fc526eef80d3f24911ed1a0917d1359ea
Commit Graph

32275 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anupam K
28f4417fc5 fix: added filter show in website for filtering product 2020-08-25 08:59:37 +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
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
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
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
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
93df724dc1 Merge pull request #22945 from scmmishra/item-image-alt 
feat: allow Item image alt
 2020-08-12 13:37:58 +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
Marica
f6e9888aa4 Merge pull request #23000 from AfshanKhan/fix-duplicate-dropdown-PO 
fix: po dropdown
 2020-08-11 20:35:28 +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
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