Commit Graph

38393 Commits

Author SHA1 Message Date
Andy Zhu
760248911d fix: Update Items on Purchase Order
If user add rows or remove rows to update items on purchase order, the quantity in bin won't get updated.
This fix is not mature yet but to give an tempopary solution for fixing this issue.
2020-10-05 12:16:48 +13:00
Saqib
2016a34e30 fix: naming series - cannot reset current value to zero (#23504) 2020-10-04 18:13:24 +05:30
Deepesh Garg
5bf35e465e Merge pull request #23220 from marination/account-add-rename
feat: Validate and Update Child Company Accounts on Rename/Adding Account
2020-10-04 15:19:26 +05:30
Mangesh-Khairnar
1bef6a530c fix: create payment entry against payment request 2020-10-04 13:01:11 +05:30
Deepesh Garg
f8bf139692 Merge pull request #23498 from aakvatech/patch-3
fix: get_outstanding_invoices not ignoring the cancelled transactions
2020-10-03 22:36:24 +05:30
Suraj Shetty
01e986b11c Merge pull request #23493 from frappe-pr-bot/translations-2020-10-03-develop
chore: Update translations
2020-10-03 22:17:18 +05:30
aakvatech
38ccf82604 fix: get_outstanding_invoices not ignoring the cancelled transactions
Added is_cancelled=0 in 2 places for get_outstanding_invoices
2020-10-03 19:41:38 +03:00
Suraj Shetty
5dc0432cff chore: Update translations 2020-10-03 08:52:07 +00:00
rohitwaghchaure
3c77a4697b Merge pull request #23471 from rohitwaghchaure/fixed-currency-issue-in-pl-report
fix: currency symbol in profit and loss report
2020-10-03 10:32:00 +05:30
Suraj Shetty
262590b672 Merge pull request #23481 from frappe-pr-bot/translations-2020-10-02-develop
chore: Update translations
2020-10-02 13:43:12 +05:30
marination
c213cd96c5 fix: Handle Blank from/to range in Numeric Item Attribute 2020-10-02 12:22:28 +05:30
marination
0bc61b31f7 chore: Move Qty fields (received qty,etc.) close to Qty/Stock UOM 2020-10-02 11:54:54 +05:30
Suraj Shetty
70c06512d2 chore: Update translations 2020-10-02 03:57:15 +00:00
marination
b9e2f17f4f fix: More secure query 2020-10-01 21:31:51 +05:30
marination
f57ba86bce chore: Add Date and Valid Till to List View 2020-10-01 21:10:00 +05:30
marination
5006345a0a chore: Fetch RFQs in Get Items from RFQ based on Supplier selected
- Rfq will appear only if selected supplier is in the RFQ
2020-10-01 20:41:05 +05:30
marination
4993ef19d6 feat: Supplier Quotation UX fixes 2020-10-01 16:35:09 +05:30
marination
29d7528a95 fix: Hide Preview Email button on submitted doc 2020-10-01 14:55:21 +05:30
Abhishek Balam
71c24c8a90 feat: add tests 2020-10-01 14:54:11 +05:30
marination
f90c3602a7 fix: Price should be total amount, modified deskpage 2020-10-01 14:38:17 +05:30
hasnain2808
f8db9582c3 feat(UAE VAT 21): Add currency formatting 2020-10-01 12:59:39 +05:30
hasnain2808
8cc6f2b388 feat(UAE VAT 21): add fixed width to columns 2020-10-01 12:44:39 +05:30
hasnain2808
10a3a338b6 refactor: change uae vat settingplural 2020-09-30 21:51:00 +05:30
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
Saurabh
2118d215e5 fix: validate theme_scss attribute (#23467)
#22851
2020-09-30 18:10:30 +05:30
Rohit Waghchaure
b428e4c493 fix: currency symbol in profit and loss report 2020-09-30 17:44:35 +05:30
Shivam Mishra
1323a9a990 feat: set app name for ERPNext in install and patch 2020-09-30 16:33:14 +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
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
hasnain2808
3294f86b92 refactor: fix linting 2020-09-30 12:15:07 +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