Commit Graph

32788 Commits

Author SHA1 Message Date
rohitwaghchaure
242bae4a81
Merge pull request #23548 from michellealva/selling_links
fix(Selling): Add missing reports on desk
2020-10-08 11:24:46 +05:30
Saqib
22b4c86a38
fix: cannot merge pos invoices with inclusive tax (#23541)
* fix: cannot merge pos invoices with inclusive tax

* fix: item rate calculation
2020-10-08 11:23:21 +05:30
michellealva
38aee6e3cb fix(Selling): Add missing reports on desk 2020-10-08 10:24:11 +05:30
Rucha Mahabal
d4c80abb6d
Merge pull request #23542 from kennethsequeira/student-app-nat
fix: remove default nationality as Indian in Student Applicant webform
2020-10-07 23:26:31 +05:30
Kenneth Sequeira
0b84a6399b fix: remove default nationality as Indian 2020-10-07 23:14:27 +05:30
Marica
82cb47fea0
Merge pull request #23533 from frappe/fix_title_customer_name
fix: use party name as title
2020-10-07 20:49:21 +05:30
Marica
71db253b86
Merge branch 'develop' into fix_title_customer_name 2020-10-07 20:27:32 +05:30
Abhishek Balam
ebf53a7f25
fix(HR): Appraisal form Enhancements (#23500)
* fix: remove total score button

* Removing conflicts
2020-10-07 19:59:26 +05:30
barredterra
242579b77c fix: use party name as title 2020-10-07 14:34:21 +02:00
Marica
bd775cbf26
Merge pull request #23529 from michellealva/acocunts_settings_fix
fix: Typo in Accounts Settings
2020-10-07 15:22:15 +05:30
michellealva
a9c2401a2d fix: Typo in Accounts Setings 2020-10-07 15:13:57 +05:30
Deepesh Garg
b16e447f86
Merge pull request #23352 from deepeshgarg007/tax_fetch_quote
fix: Taxes not getting fetched from Opportunity to Quotation
2020-10-06 19:55:21 +05:30
Deepesh Garg
f183dd6d3a
Merge branch 'develop' into tax_fetch_quote 2020-10-06 13:27:28 +05:30
rohitwaghchaure
59ee417d31
Merge pull request #23483 from marination/item-attr
fix: Handle Blank from/to range in Numeric Item Attribute
2020-10-06 12:00:26 +05:30
Sun Howwrongbum
72a596971c
fix: also update employee field when renamed (#23482) 2020-10-05 20:48:53 +05:30
rohitwaghchaure
bb61c77c6e
Merge pull request #23514 from deepeshgarg007/batch_search_fix
fix: Condition in batch selector query
2020-10-05 16:05:52 +05:30
Deepesh Garg
f58a5ec6a5 fix: Codition in batch selector query 2020-10-05 13:55:53 +05:30
rohitwaghchaure
96fadb7c9b
Merge pull request #23511 from marination/sales-order-project
fix: Show Project under Create button in SO
2020-10-05 13:17:48 +05:30
rohitwaghchaure
ad2dd6062e
Merge pull request #23513 from deepeshgarg007/batch_search
fix: Search batches based on search fields
2020-10-05 13:16:03 +05:30
Deepesh Garg
1fae7749be fix: Search batches based on search fields 2020-10-05 12:38:54 +05:30
marination
e7af9ff999 fix: Show Project under Create button in SO 2020-10-05 12:24:43 +05:30
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
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
Suraj Shetty
70c06512d2 chore: Update translations 2020-10-02 03:57:15 +00:00
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
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
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
Marica
25f4c1636e
Merge branch 'develop' into account-add-rename 2020-09-29 13:18:54 +05:30