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
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
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
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
8fbd960f66
Merge branch 'develop' into update-items-perm
2020-09-30 12:51:35 +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
marination
661bf64bba
fix: Check only Read and Write Permission in Update Items
2020-09-29 18:16:45 +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
Marica
3b610bd07d
Merge branch 'develop' into dialog-filters
2020-09-29 13:16:33 +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 b649b507e5d546b5b4a78fbf68053493a71c7af2.
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2020-09-28 17:36:25 +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
Anupam
519a00ce44
fix: flushing contact details, generating assignment rule issues
2020-09-28 13:10:06 +05:30
Anupam Kumar
5b3af82e75
Update item_add_to_cart.html
2020-09-28 10:59:43 +05:30
Sagar Vora
382676d875
Merge branch 'develop' into mr-stock-uom-v13
2020-09-27 20:09:00 +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
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
Anupam
dd2f547c3b
fix: Ui fixes
2020-09-24 16:37:08 +05:30
Anupam
5a72022289
Merge branch 'develop' of https://github.com/frappe/erpnext into quotation-portal
2020-09-24 16:18:47 +05:30
Anupam
78ee75d744
fix: review changes
2020-09-24 16:17:02 +05:30
Saqib
2fa2a40b3f
chore: make asset movement transaction date match with purchase date & time ( #23423 )
2020-09-24 15:07:29 +05:30
Anupam
a4df105813
fix: UI fixes
2020-09-24 13:21:54 +05:30
marination
4f395cce54
chore: Add Filter Group to dialogs
2020-09-24 12:43:41 +05:30
marination
8370d9b997
fix: Check Company in Payment Entry before selecting values
2020-09-24 11:51:03 +05:30
Anupam
09775bbdaa
feat: showing UOM even item price is hidden
2020-09-24 11:19:32 +05:30
Shivam Mishra
0bd8719035
Merge branch 'develop' into better-logging-for-membership
2020-09-24 10:32:41 +05:30
Shivam Mishra
cee891aa92
refactor: better logging for membership
2020-09-24 10:31:36 +05:30
Anupam
c077fac2a6
feat: provision to draft quotation from portal
2020-09-23 22:02:31 +05:30
Deepesh Garg
cfc5e29127
fix: Post cancellation accounting entry on posting date instaed of current ( #23361 )
2020-09-23 17:19:11 +05:30
Prssanna Desai
fd42af5b91
fix: ignore permission while creating supplier scorecard period in supplier scorecard ( #23406 )
2020-09-23 17:14:37 +05:30
