Commit Graph

32253 Commits

Author SHA1 Message Date
Deepesh Garg
e3e8f5069d
Merge pull request #22719 from frappe/delivery_note
fix: Update modified timestamp for Delivery Note Item
2020-07-17 11:29:47 +05:30
michellealva
d02465a68f fix: Update modified timestamp for Delivery Note Item 2020-07-17 10:35:16 +05:30
marination
6319073d81 fix: Move Issue List actions under 'Actions' dropdown 2020-07-16 15:38:51 +05:30
Karthikeyan S
ff6ba25386
fix: remove FE validation for log_type field 2020-07-16 13:33:38 +05:30
Anurag Mishra
ac23ac6a02
fix: validation for additional salary (#22645)
* fix: validation for additional salary

* fix:changes requested

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2020-07-16 13:10:43 +05:30
Rucha Mahabal
aab0ada598
Merge pull request #22682 from Anurag810/expense-claim-payment-fix
fix: 'ExpenseClaim' object has no attribute 'conversion_rate'
2020-07-16 12:58:51 +05:30
Rucha Mahabal
6b3110ed13
Merge branch 'develop' into expense-claim-payment-fix 2020-07-16 12:23:26 +05:30
Anurag Mishra
50902cf30c Fix: Changes Requested 2020-07-16 12:21:46 +05:30
Deepesh Garg
48ba29b647
Merge pull request #22693 from surajshetty3416/fix-financial-statement-print-format
fix: Show total row in print format of financial statement
2020-07-16 11:32:34 +05:30
Suraj Shetty
11b0554ae9
Merge branch 'develop' into fix-financial-statement-print-format 2020-07-16 09:45:26 +05:30
Deepesh Garg
56475999cf
Merge pull request #22705 from deepeshgarg007/rcm_country_v13
fix: Update RCM only for indian countries
2020-07-16 00:25:14 +05:30
Deepesh Garg
52c319cfa7 fix: Update RCM only for indian countries 2020-07-16 00:23:58 +05:30
Deepesh Garg
2af43b3df6
fix: linting 2020-07-15 21:54:28 +05:30
Deepesh Garg
49821df0ae
Merge pull request #22697 from rohitwaghchaure/fixed-not-able-to-submit-si
fix: not able to submit sales invoice
2020-07-15 21:51:16 +05:30
Deepesh Garg
177bbd8e20
Merge pull request #22701 from deepeshgarg007/gstr3b_cess
fix: Cess amount in GSTR 3B report
2020-07-15 18:20:42 +05:30
Deepesh Garg
0fa4143bac fix: Cess amount in GSTR 3B report 2020-07-15 18:17:38 +05:30
rohitwaghchaure
8ff821970a
Merge pull request #22700 from rohitwaghchaure/fixed-incorrect-balance-qty-in-stock-ledger-develop
fix: incorrect balance qty in stock ledger report
2020-07-15 17:25:11 +05:30
Rohit Waghchaure
132376750c fix: incorrect balance qty in stock ledger report 2020-07-15 17:23:17 +05:30
Rohit Waghchaure
e0de0ac617 fix: not able to submit sales invoice 2020-07-15 17:13:43 +05:30
rohitwaghchaure
c53782ebd4
Merge pull request #22694 from rohitwaghchaure/fixed-patch-update-actual-start-end-date
fix: patch update_actual_start_and_end_date_in_wo
2020-07-15 16:43:34 +05:30
Rohit Waghchaure
07cc918d70 fix: patch update_actual_start_and_end_date_in_wo 2020-07-15 16:41:32 +05:30
Suraj Shetty
34617744e1 fix: Show total row in print format of financial statement 2020-07-15 16:37:21 +05:30
rohitwaghchaure
f16bd00463
Merge pull request #22608 from ruchamahabal/fix-sla-ui
fix: allow creating SLA documents even if SLA tracking is not enabled
2020-07-15 15:47:37 +05:30
rohitwaghchaure
30030230bf
Merge pull request #22675 from marination/material-request-warehouse
fix: Dont overwrite default warehouse in Material Request
2020-07-15 15:35:38 +05:30
rohitwaghchaure
7c08ff7572
Merge pull request #22596 from marination/exploded-item-rate
fix: Exploded Item Rate in BOM
2020-07-15 14:30:27 +05:30
rohitwaghchaure
453b66460c
Merge pull request #22689 from rohitwaghchaure/fixed-double-project-field-in-purchase-receipt
fix: project field added two time in purchase receipt
2020-07-15 14:27:39 +05:30
Rohit Waghchaure
e1b3f16abd fix: project field added two time in purchase receipt 2020-07-15 12:28:19 +05:30
Deepesh Garg
5beac7a0cc
fix: Period list fixes in financial statements (#22677) 2020-07-15 12:17:43 +05:30
Anurag Mishra
c1636f8fab fix: conversion rate as 1 if no conversion rate 2020-07-14 18:58:02 +05:30
marination
392f323d2d fix: Dont overwrite default warehouse in Material Request 2020-07-14 17:03:17 +05:30
rohitwaghchaure
eb2a42d9e1
Merge pull request #22589 from deepeshgarg007/rcm_fix
fix: Do not add GST tax amount in grand total for reverse charge invoices
2020-07-14 13:42:48 +05:30
Rucha Mahabal
b81dca8146
Merge pull request #22674 from ruchamahabal/fix-sla-error
fix(Support): TypeError while saving Service Level Agreement
2020-07-14 13:33:19 +05:30
Rucha Mahabal
c4a1b34811
Merge branch 'develop' into fix-sla-error 2020-07-14 13:24:57 +05:30
Marica
82a606d04b
fix: Added Project Field in Purchase Receipt for Stock Ledger Tagging (#22666) 2020-07-14 13:16:28 +05:30
Anupam Kumar
c5f14da99c
Merge branch 'develop' into lead-owner-efficiency 2020-07-14 12:59:42 +05:30
Rucha Mahabal
88931f0677 fix(Support): TypeError while saving Service Level Agreement 2020-07-14 11:46:11 +05:30
John Veness
72320afb07
Correct help link for Address (#22673) 2020-07-14 10:44:15 +05:30
Rucha Mahabal
282f495fb6
Merge pull request #22672 from bhavesh95863/patch-4
fix: Quotation list view blank if quotation_to field not set as a standard filter
2020-07-14 00:30:15 +05:30
bhavesh95863
eb69859d3e
fix: Quotation list view blank if quotation_to field not set as a standard filter 2020-07-13 23:15:31 +05:30
rohitwaghchaure
165d57aa0b
Merge pull request #22663 from rohitwaghchaure/fixed-error-report-related-to-task-develop
fix: '>' not supported between instances of 'str' and 'int'
2020-07-13 18:11:50 +05:30
rohitwaghchaure
165eb5a1c3
Merge pull request #22665 from marination/maintenance-schedule
fix: Block Invalid Serial No updates in Maintenance Schedule
2020-07-13 18:11:06 +05:30
rohitwaghchaure
62fe2cac19
Merge pull request #22051 from deepeshgarg007/project-link-for-all-accounts
fix: Project link not set in accounts other than profit and loss accounts
2020-07-13 18:09:41 +05:30
Marica
3f8840cd7a
Merge branch 'develop' into maintenance-schedule 2020-07-13 15:24:37 +05:30
Rucha Mahabal
68cc3e4220
Merge branch 'develop' into fix-sla-ui 2020-07-13 14:40:01 +05:30
Anurag Mishra
b9d8ff91a5
Merge branch 'develop' into lead-owner-efficiency 2020-07-13 14:22:34 +05:30
Anurag Mishra
d38c22d85d
Merge branch 'develop' into fixed-error-report-related-to-task-develop 2020-07-13 14:21:58 +05:30
rohitwaghchaure
a8fea8df98
Merge pull request #22614 from deepeshgarg007/payment_reco_cost_center_fix
fix: Add default cost center in payment reconciliation JV
2020-07-13 13:44:49 +05:30
marination
1791bc187b fix: Block Invalid Serial No updates in Maintenance Schedule 2020-07-13 12:32:09 +05:30
Rohit Waghchaure
2e8d8b9aeb fix: '>' not supported between instances of 'str' and 'int' 2020-07-13 12:09:10 +05:30
rohitwaghchaure
ac984eb37c
Merge branch 'develop' into project-link-for-all-accounts 2020-07-13 11:50:11 +05:30