Rushabh Mehta
542bc01718
fix(minor): update routes
4 years ago
Shivam Mishra
dc1e240642
Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into rebrand-ui
4 years ago
Shivam Mishra
bed717b442
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
4 years ago
Jannat Patel
0ea0a7495c
fix: making company address read-only in delivery note ( #23890 )
4 years ago
Rucha Mahabal
2baf45496a
Merge pull request #23805 from pateljannat/production-planning-status-filter
feat: sales order status filter added for production plan
4 years ago
Rucha Mahabal
159d3bf14b
Merge branch 'develop' into production-planning-status-filter
4 years ago
Deepesh Garg
5e0f4e2f4b
Merge pull request #23582 from deepeshgarg007/loan_repayment_type_remove
fix: Loan repayment type option remove
4 years ago
Marica
d50874f0c7
Merge pull request #23729 from AfshanKhan/fix-po-no-fetching
fix: copying po no when mapping doc
4 years ago
Marica
a8ac101f5c
Merge branch 'develop' into fix-po-no-fetching
4 years ago
Mangesh-Khairnar
a91b68c868
feat: add communication channel to communication medium ( #23793 )
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
4 years ago
Marica
78cccbe015
Merge branch 'develop' into fix-po-no-fetching
4 years ago
Rushabh Mehta
780b6b466b
fix(hooks): include js/css with full path
4 years ago
Marica
2b44f22cf4
Merge branch 'develop' into fix-po-no-fetching
4 years ago
Jannat Patel
e008f85816
Merge branch 'develop' into production-planning-status-filter
4 years ago
pateljannat
d08c91673a
fix: removed unnecessary filter options
4 years ago
Deepesh Garg
101bad3ea1
fix: Remarks for penalty GL Entry
4 years ago
prssanna
922432616f
Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into rebrand-ui
4 years ago
prssanna
e3b71b9b24
fix: compact item print style
4 years ago
Deepesh Garg
cd15956d80
Merge pull request #23870 from frappe/barredterra-patch-2
fix: remove check for exempt_from_sales_tax
4 years ago
Afshan
1e564bc02d
fix: refactor
4 years ago
Afshan
a75708b02e
Merge branch 'fix-po-no-fetching' of https://github.com/AfshanKhan/erpnext into fix-po-no-fetching
4 years ago
Afshan
1924019531
fix: refactor
4 years ago
Raffael Meyer
57ce0462d9
fix: remove check for exempt_from_sales_tax
4 years ago
Anurag Mishra
91fdb7aa69
feat: added column cost_center to receivable reports ( #23835 )
4 years ago
Raffael Meyer
4f880e7454
refactor: zip_and_download ( #23844 )
4 years ago
Shivam Mishra
f38a1c305e
refactor: show form buttons only if permissions exist ( #23851 )
* refactor: show form buttons only if permissions exist
* style: add semicolon
* fix: typo in conditions
4 years ago
Deepesh Garg
8cfb210dc4
fix: Ignore doctypes on company transaction deleted ( #23864 )
4 years ago
UrvashiKishnani
bc64f5dfbb
fix: spelling error in filter label ( #23867 )
4 years ago
Suraj Shetty
d038a80c43
chore: Make eslint stricter ( #23869 )
Error for
- Invalid tab style
- No space between unary operations
- Space between blocks
Warn for
- Comma Spacing
- Block Spacing
- Object Key Spacing
- Keyword Spacing
4 years ago
Rucha Mahabal
30d58cc3d7
feat: Consider Holiday List in Student Leave Application and Attendance ( #23388 )
* feat: Consider holiday list in Student Attendance and Leave Application
* feat: Show Holidays as 'H' in Student Monthly Attendance Sheet
* fix: check if date is a holiday in attendance reports
* test: skip attendance record creation for holidays
* fix: holiday list validation
* fix: clean up after test
* fix: codacy
* fix: show date in user format
* fix: remove ununsed imports
* fix: sider
* fix: test
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
4 years ago
Frappe PR Bot
7915a3acae
chore: Update translations ( #23856 )
Co-authored-by: frappe <frappe@scw-dazzling-elgamal>
4 years ago
Deepesh Garg
d53abf194e
fix: Party for loan ledger entries
4 years ago
rohitwaghchaure
8d39d7570a
Merge pull request #23764 from anupamvs/project-timesheet
fix: added project link in timesheet form
4 years ago
Marica
2d4a3498e9
Merge pull request #23735 from marination/purchase-invoice-payment-terms
fix: Payment Terms not fetched in Purchase Invoice from Purchase Receipt
4 years ago
Marica
9a3e1f6f83
Merge branch 'develop' into purchase-invoice-payment-terms
4 years ago
Suraj Shetty
1183980e0e
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
4 years ago
Marica
63d1a0436c
Merge branch 'develop' into fix-po-no-fetching
4 years ago
rohitwaghchaure
94bfa6a659
Merge pull request #23843 from frappe/datev_check_fiscal_year
feat: validate fiscal year
4 years ago
rohitwaghchaure
af840ddec1
Merge pull request #23850 from marination/bank-link-card-desk
fix: Added link of bank reconciliation and clearance in accounting desk page
4 years ago
Marica
709daf354b
Merge branch 'develop' into purchase-invoice-payment-terms
4 years ago
Marica
da2c6444f6
Merge branch 'develop' into bank-link-card-desk
4 years ago
Deepesh Garg
29a8994506
Merge pull request #23832 from deepeshgarg007/india_tax_template_fetch
fix: Auto Statewise gst tax template
4 years ago
Deepesh Garg
dd94587ef8
fix: Loan write off precision issue
4 years ago
Deepesh Garg
2ad015450e
fix: Remarks fix
4 years ago
Saqib
e0af8fe8e5
fix: auto fetch sr nos with modifed conversion factor ( #23854 )
4 years ago
rohitwaghchaure
471341fb87
Merge pull request #23849 from anupamvs/formatdate
fix: replaced formatdate -> format_date
4 years ago
Deepesh Garg
3899079bb9
fix: Loan seurity unpledge msg improvement
4 years ago
Deepesh Garg
3e69756e15
fix: Add better remarks for Loan GL entries
4 years ago
marination
0b4946ba27
fix: Add missing links
- Added Bank Transaction Statement Entry and Bank Statement Settings
4 years ago
Nabin Hait
06ba92be7a
fix: Added link of bank reconciliation and clearance in accounting desk page
4 years ago