Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
33,631 Commits 3 Branches 0 Tags 1 GiB
e5e2ad646a
Commit Graph

33631 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
marination
65fc48da25 fix: Email Template and Codacy 
- Email Preview works well with email template
- Codacy for docstrings
 2020-09-29 12:46:19 +05:30
Marica
e5a60f1cec
Merge branch 'develop' into rfq-email 2020-09-29 11:56:44 +05:30
Marica
818522bd45
Merge branch 'develop' into dialog-filters 2020-09-28 21:18:23 +05:30
marination
629fa57f9d fix: Remove unneccessary div 2020-09-28 21:17:49 +05:30
marination
a6ea86432e fix: Skip Update Password in Preview 
- dont show update password button in preview, its for the suppliers mail only
- modified docstrings
- update supplier row contact only if None
 2020-09-28 21:05:11 +05:30
hasnain2808
a5e8e449ee chore: Merge branch 'develop' into UAE-VAT-Format 2020-09-28 20:43:03 +05:30
marination
f911228871 fix: UX and code cleanup 
- Added a small note in muted text at bottom of Dialog
- Dont call 'update_supplier_contact' at the time of preview, its a dummy view anyway
- Renamed `update_contact_of_supplier` to `link_supplier_contact`
- On sending mail, new users and contacts that were created get updated in RFQ doc
- Added docstrings to functions
 2020-09-28 20:21:44 +05:30
hasnain2808
23c8966e81 Merge branch 'develop' into UAE-VAT-Format 2020-09-28 20:06:02 +05:30
hasnain2808
2c62d946f5 Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2020-09-28 20:03:27 +05:30
Mangesh-Khairnar
8d12c3841f fix: process transaction callback 2020-09-28 19:40:42 +05:30
hasnain2808
80068e16e8 Refactor(UAE VAT 21): Replace f-strings by format 2020-09-28 18:58:27 +05:30
Anupam
77cf53201a feat: open lead status on next contact date 2020-09-28 18:38:41 +05:30
marination
056c86033d fix: Reuse function to render email preview 
- Reused `supplier_rfq_mail` to render preview
- Print hid Salutation and Subject
- Completely dynamic greeting
 2020-09-28 17:42:22 +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 b649b507e5d546b5b4a78fbf68053493a71c7af2.

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2020-09-28 17:36:25 +05:30
marination
bd36f2b94d feat: Supplier Email Preview in RFQ 2020-09-28 15:59:03 +05:30
hasnain2808
587bb05a37 feat(UAE VAT 21): Add desk page for UAE VAT 21 2020-09-28 14:52:29 +05:30
hasnain2808
0860c74c82 feat(UAE VAT 21): Add permissions for doctypes 2020-09-28 14:38:45 +05:30
hasnain2808
2d30148940 feat(UAE VAT 21): Add vat settings 2020-09-28 14:38:14 +05:30
Raffael Meyer
21266fe4a4
Merge branch 'develop' into website_theme_scss 2020-09-28 10:15:55 +02:00
rohitwaghchaure
7b2f141d0d
Merge pull request #23441 from anupamvs/lead-contact-detail 
fix: flushing contact details, generates assignment rule issues
 2020-09-28 13:30:09 +05:30
hasnain2808
2a601e59bf fix(UAE VAT 21): remove extra legend 2020-09-28 13:26:43 +05:30
hasnain2808
bed1add349 docs(UAE VAT 21): add docstrings 2020-09-28 13:26:05 +05:30
hasnain2808
815b7584dd refactor(UAE VAT 21): seperate get_chart, get_data 2020-09-28 13:24:40 +05:30
Anupam
519a00ce44 fix: flushing contact details, generating assignment rule issues 2020-09-28 13:10:06 +05:30
hasnain2808
79aca28453 refactor(UAE VAT 21): rename UAE VAT - UAE VAT 21 2020-09-28 12:27:41 +05:30
Anupam Kumar
5b3af82e75
Update item_add_to_cart.html 2020-09-28 10:59:43 +05:30
Deepesh Garg
0abcca833f
Merge pull request #23436 from prssanna/mr-stock-uom-v13 
fix: set Stock UOM in item while creating Material Request from Stock Entry
 2020-09-28 10:41:22 +05:30
Mangesh-Khairnar
98658603dd Merge branch 'develop' of https://github.com/frappe/erpnext into mpesa-integration 2020-09-28 02:10:53 +05:30
Sagar Vora
382676d875
Merge branch 'develop' into mr-stock-uom-v13 2020-09-27 20:09:00 +05:30
Mangesh-Khairnar
a26c6b4c2d fix: fetch account balance info 2020-09-25 23:56:39 +05:30
hasnain2808
127fbfcb93 feat(UAE VAT 21): Added Print Format 2020-09-25 20:42:54 +05:30
Anupam Kumar
6e0c1eeb68
Merge branch 'develop' into quotation-portal 2020-09-25 20:04:43 +05:30
prssanna
fec4ea5643 fix: set stock uom in tem while creating material request from stock entry 2020-09-25 18:01:12 +05:30
hasnain2808
321b5f54ae feat(UAE VAT 21): Add Roles for UAE VAT 21 Report 2020-09-25 14:24:57 +05:30
hasnain2808
72cad2a8ab feat(UAE VAT 21): Add zero rated and vat exempt 2020-09-25 13:13:38 +05:30
rohitwaghchaure
7512565184
fix: Patient Appointment not able to save (#23434) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2020-09-25 12:45:47 +05:30
hasnain2808
5225215d31 feat(UAE VAT 21): Add rows for inputs and tourists 2020-09-24 18:41:43 +05:30