Afshan
a75708b02e
Merge branch 'fix-po-no-fetching' of https://github.com/AfshanKhan/erpnext into fix-po-no-fetching
2020-11-10 13:19:53 +05:30
Afshan
1924019531
fix: refactor
2020-11-10 13:19:21 +05:30
Mohammad Hasnain Mohsin Rajan
72adb0b218
Merge branch 'develop' into UAE-VAT-Format
2020-11-10 09:58:45 +05:30
Raffael Meyer
57ce0462d9
fix: remove check for exempt_from_sales_tax
2020-11-09 19:04:46 +01:00
Anurag Mishra
91fdb7aa69
feat: added column cost_center to receivable reports ( #23835 )
2020-11-09 20:20:05 +05:30
Raffael Meyer
4f880e7454
refactor: zip_and_download ( #23844 )
2020-11-09 20:17:56 +05:30
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
2020-11-09 20:16:28 +05:30
Deepesh Garg
8cfb210dc4
fix: Ignore doctypes on company transaction deleted ( #23864 )
2020-11-09 20:14:53 +05:30
UrvashiKishnani
bc64f5dfbb
fix: spelling error in filter label ( #23867 )
2020-11-09 20:14:06 +05:30
Suraj Shetty
e3fe8ff195
Merge branch 'develop' into purchase-taxes-and-charges-account-name-issue
2020-11-09 19:16:23 +05:30
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
2020-11-09 19:10:43 +05:30
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>
2020-11-09 18:41:03 +05:30
Frappe PR Bot
7915a3acae
chore: Update translations ( #23856 )
...
Co-authored-by: frappe <frappe@scw-dazzling-elgamal>
2020-11-09 18:37:28 +05:30
Deepesh Garg
d53abf194e
fix: Party for loan ledger entries
2020-11-09 18:34:38 +05:30
rohitwaghchaure
8d39d7570a
Merge pull request #23764 from anupamvs/project-timesheet
...
fix: added project link in timesheet form
2020-11-09 17:34:11 +05:30
Marica
2d4a3498e9
Merge pull request #23735 from marination/purchase-invoice-payment-terms
...
fix: Payment Terms not fetched in Purchase Invoice from Purchase Receipt
2020-11-09 16:09:19 +05:30
Marica
9a3e1f6f83
Merge branch 'develop' into purchase-invoice-payment-terms
2020-11-09 14:51:20 +05:30
Marica
63d1a0436c
Merge branch 'develop' into fix-po-no-fetching
2020-11-09 12:59:10 +05:30
rohitwaghchaure
94bfa6a659
Merge pull request #23843 from frappe/datev_check_fiscal_year
...
feat: validate fiscal year
2020-11-09 12:33:15 +05:30
rohitwaghchaure
af840ddec1
Merge pull request #23850 from marination/bank-link-card-desk
...
fix: Added link of bank reconciliation and clearance in accounting desk page
2020-11-09 12:31:54 +05:30
Marica
709daf354b
Merge branch 'develop' into purchase-invoice-payment-terms
2020-11-09 10:33:32 +05:30
Marica
da2c6444f6
Merge branch 'develop' into bank-link-card-desk
2020-11-09 10:29:51 +05:30
Deepesh Garg
29a8994506
Merge pull request #23832 from deepeshgarg007/india_tax_template_fetch
...
fix: Auto Statewise gst tax template
2020-11-08 17:48:57 +05:30
Deepesh Garg
dd94587ef8
fix: Loan write off precision issue
2020-11-07 17:08:30 +05:30
Deepesh Garg
2ad015450e
fix: Remarks fix
2020-11-07 00:14:40 +05:30
Mohammad Hasnain Mohsin Rajan
d54969bd86
Merge branch 'develop' into UAE-VAT-Format
2020-11-06 23:39:34 +05:30
Mohammad Hasnain
c5aad7b6e5
feat(UAE VAT 201): reorder desk page listing
2020-11-06 23:36:50 +05:30
Mohammad Hasnain
4d99d695a3
feat(uae vat 201): update desk page entry
2020-11-06 23:33:19 +05:30
Saqib
e0af8fe8e5
fix: auto fetch sr nos with modifed conversion factor ( #23854 )
2020-11-06 18:19:36 +05:30
rohitwaghchaure
471341fb87
Merge pull request #23849 from anupamvs/formatdate
...
fix: replaced formatdate -> format_date
2020-11-06 17:47:08 +05:30
Deepesh Garg
3899079bb9
fix: Loan seurity unpledge msg improvement
2020-11-06 17:39:54 +05:30
Deepesh Garg
3e69756e15
fix: Add better remarks for Loan GL entries
2020-11-06 14:25:09 +05:30
marination
0b4946ba27
fix: Add missing links
...
- Added Bank Transaction Statement Entry and Bank Statement Settings
2020-11-06 13:15:46 +05:30
Nabin Hait
06ba92be7a
fix: Added link of bank reconciliation and clearance in accounting desk page
2020-11-06 13:15:38 +05:30
Marica
7e1511f527
Merge branch 'develop' into purchase-invoice-payment-terms
2020-11-06 12:28:55 +05:30
Anupam
c3307f7900
fix: replaced formatdate -> format_date
2020-11-06 12:28:38 +05:30
Marica
d967ad6b5b
Merge pull request #23789 from marination/dialog-cleanup
...
chore: Get Items From Dialog cleanup (Buying)
2020-11-06 12:22:14 +05:30
Marica
9694432270
Merge branch 'develop' into dialog-cleanup
2020-11-06 12:19:41 +05:30
Raffael Meyer
a62d138748
Merge branch 'develop' into datev_check_fiscal_year
2020-11-05 17:29:42 +01:00
barredterra
f91d82b538
fix: imports
2020-11-05 17:28:39 +01:00
barredterra
815341d454
feat: validate fiscal year
2020-11-05 16:57:23 +01:00
Deepesh Garg
1145b3796c
fix: Remove accrual type from process
2020-11-05 21:21:40 +05:30
Deepesh Garg
a2bff7fbfc
fix: Penalty amount calculation fix
2020-11-05 21:14:29 +05:30
Deepesh Garg
49cc57e76e
fix: Negative amount check for amounts
2020-11-05 21:14:07 +05:30
Anupam Kumar
3a9dc90695
fix: fix: replaced formatdate -> format_date ( #23829 )
2020-11-05 18:51:56 +05:30
rohitwaghchaure
9a62858da2
Merge pull request #23831 from rohitwaghchaure/incorrect-assign-to-in-asset-maintenance-develop
...
fix: incorrect assign to in Maintenance Schedule
2020-11-05 18:43:51 +05:30
Marica
c070f2ed57
Merge branch 'develop' into dialog-cleanup
2020-11-05 18:37:56 +05:30
Marica
08f6c9d5f9
Merge pull request #23820 from marination/so-to-po-dialog-fix
...
fix: SO to PO Mapping Issue
2020-11-05 18:29:52 +05:30
pateljannat
5b02d32826
fix: trailling spaces removed
2020-11-05 18:04:14 +05:30
Saqib
bc919e2e7d
fix: cannot expand row in update items dialog ( #23839 )
2020-11-05 17:38:35 +05:30
