Faris Ansari
db8764a520
Merge pull request #23201 from alyf-de/website_theme_scss
...
fix: style for website theme
2020-09-30 18:26:58 +05:30
rohitwaghchaure
d65e050f4b
Update profit_and_loss_statement.py
2020-09-30 18:17:21 +05:30
Rohit Waghchaure
b428e4c493
fix: currency symbol in profit and loss report
2020-09-30 17:44:35 +05:30
Deepesh Garg
287014a9a2
fix: Remove any taxes fetched due to unknown rules
2020-09-30 13:42:10 +05:30
Deepesh Garg
fc71e5b5b7
fix: Remove any taxes fetched due to unknown rules
2020-09-30 13:42:00 +05:30
Saqib Ansari
57caf99a7e
fix: hide cancel irn dialog on error
2020-09-30 13:18:37 +05:30
Saqib Ansari
d729f7f50e
chore: show irn cancelled check after cancellation
2020-09-30 13:18:37 +05:30
Saqib Ansari
6fce734476
fix: item discount
2020-09-30 13:18:37 +05:30
Saqib Ansari
354da7ad4c
chore: minor fixes
2020-09-30 13:18:37 +05:30
Saqib Ansari
aaf445af98
feat: Generate & Cancel IRN from Sales Invoice
2020-09-30 13:18:37 +05:30
Saqib Ansari
6eb4fe6659
feat: make IRN field on regional setup
2020-09-30 13:18:37 +05:30
Saqib Ansari
3739dc3f78
chore: rename schema to template & js cleanup
2020-09-30 13:18:37 +05:30
Saqib Ansari
dc3c03e47e
chore: split einvoice settings and operations
2020-09-30 13:18:37 +05:30
Saqib Ansari
2fbc8c8f30
chore: move e-invoice settings to regional
2020-09-30 13:18:37 +05:30
Saqib Ansari
06a21da29e
feat: complete e-invoice schema
2020-09-30 13:18:37 +05:30
Saqib Ansari
b488872cbd
feat: cancel IRN
2020-09-30 13:18:37 +05:30
Saqib Ansari
88fa9866b1
chore: validations
2020-09-30 13:18:37 +05:30
Saqib Ansari
62109c3c1a
feat: decode signed json and QR code
2020-09-30 13:18:37 +05:30
Saqib Ansari
1bbdc504bf
feat: generate IRN
2020-09-30 13:18:37 +05:30
Saqib Ansari
e43a50357b
feat: make e invoice from erpnext sales invoice
2020-09-30 13:18:37 +05:30
Saqib Ansari
17cd44ecd7
feat: decrypt json data with SEK
2020-09-30 13:18:36 +05:30
Saqib Ansari
54ebb06d8a
feat: AES decryption of SEK with appkey
2020-09-30 13:18:36 +05:30
Saqib Ansari
ddf9d9ae0e
chore: handle error response
2020-09-30 13:18:36 +05:30
Saqib Ansari
5488ccfa8c
feat: save token and sek from auth request
2020-09-30 13:18:36 +05:30
Saqib Ansari
0b304b3561
feat: rsa encryption with public key
2020-09-30 13:18:36 +05:30
Saqib Ansari
4971061054
feat: read public key file
2020-09-30 13:18:36 +05:30
Saqib Ansari
a7167f775d
feat: init e-invoice settings
2020-09-30 13:18:36 +05:30
Deepesh Garg
23313538df
Merge pull request #23465 from abhishekbalam/currency_in_trial_balance
...
fix(Accounts): Add Currency filter in Trial Balance report
2020-09-30 13:16:16 +05:30
Marica
6dc940fdb8
Merge pull request #23457 from marination/update-items-perm
...
fix: Check only Read and Write Permission in Update Items
2020-09-30 12:55:06 +05:30
Marica
8fbd960f66
Merge branch 'develop' into update-items-perm
2020-09-30 12:51:35 +05:30
Deepesh Garg
1ccba26173
Merge branch 'version-13-beta' of https://github.com/frappe/erpnext into enconnex_erpnext
2020-09-30 12:31:19 +05:30
Shivam Mishra
7aca810b58
Merge pull request #23418 from scmmishra/better-logging-for-membership
2020-09-30 12:02:23 +05:30
Shivam Mishra
b04b53c613
Merge branch 'develop' into better-logging-for-membership
2020-09-30 12:01:54 +05:30
Shivam Mishra
86171a3fda
fix: translate error log
2020-09-30 12:01:35 +05:30
Shivam Mishra
3ec67077a9
chore: use .format for message
...
Co-authored-by: Sagar Vora <sagar@resilient.tech >
2020-09-30 12:00:46 +05:30
Abhishek Balam
001e7e9df9
fix: remove default value
2020-09-30 10:39:26 +05:30
Abhishek Balam
42d8db59f0
fix: add currency select to Trial Balance
2020-09-30 01:32:42 +05:30
Deepesh Garg
bc44bc64cc
fix: Add test
2020-09-29 18:39:45 +05:30
marination
661bf64bba
fix: Check only Read and Write Permission in Update Items
2020-09-29 18:16:45 +05:30
Deepesh Garg
2b38361ff5
Merge branch 'develop' of https://github.com/frappe/erpnext into tax_fetch_quote
2020-09-29 17:26:48 +05:30
Deepesh Garg
c33fbd7e52
Merge pull request #23416 from anupamvs/quotation-portal
...
feat: provision to draft quotation from portal
2020-09-29 17:08:05 +05:30
barredterra
81ad90c1d4
feat: validate sales invoice for germany
2020-09-29 11:54:57 +02:00
Marica
25f4c1636e
Merge branch 'develop' into account-add-rename
2020-09-29 13:18:54 +05:30
Marica
202303e088
Merge pull request #23422 from marination/dialog-filters
...
chore: Add Filter Group to dialogs
2020-09-29 13:17:29 +05:30
Marica
3b610bd07d
Merge branch 'develop' into dialog-filters
2020-09-29 13:16:33 +05:30
Marica
7e03c12eba
Merge pull request #23445 from anupamvs/lead-contact-date
...
feat: open lead status on next contact date
2020-09-29 13:13:48 +05:30
michellealva
3aedeb642f
fix: Change Error Message in Work Order
2020-09-29 12:54:55 +05:30
Marica
818522bd45
Merge branch 'develop' into dialog-filters
2020-09-28 21:18:23 +05:30
Anupam
77cf53201a
feat: open lead status on next contact date
2020-09-28 18:38:41 +05:30
madar2020
ce39323a0a
feat: Allow rich text edit for questions ( #23402 )
...
* rich text
* Update question.json
As to make sense for rich text
* Update quiz_question.json
* Update question.json
* Update quiz_question.json
* Update macros.html
fix: cards in second row of homepage section overlapps the row before.
* Revert "Update macros.html"
This reverts commit b649b507e5ruchamahabal2@gmail.com >
2020-09-28 17:36:25 +05:30
