Rucha Mahabal
8b4d33474e
fix: validation for attendance marked on future dates
2020-10-23 16:23:30 +05:30
Rucha Mahabal
6c3efbdb48
fix: filters for course and academic term fields
2020-10-23 16:11:40 +05:30
rohitwaghchaure
4eb87ea8e2
Merge pull request #23695 from rohitwaghchaure/fix-stock-entry-consumption-issue
...
fix: incorrect backflush qty in manufacture entry
2020-10-23 15:43:43 +05:30
Mangesh-Khairnar
675f79920e
fix: consider the existing paid payment request for phone payment channel
2020-10-23 15:41:05 +05:30
Marica
99dfbfc365
Merge pull request #23709 from marination/cashier-closing-type-issue
...
fix: Cashier Closing Type Issue
2020-10-23 14:43:18 +05:30
Rohit Waghchaure
558879fad7
fix: Translation Syntax
2020-10-23 13:42:51 +05:30
Mangesh-Khairnar
e03a02d9c0
fix: show descriptive message for missing fields
2020-10-23 13:38:55 +05:30
marination
efcc489967
fix: Cashier Closing Type Issue
2020-10-23 11:55:03 +05:30
Deepesh Garg
ca6cb6433c
Merge branch 'develop' of https://github.com/frappe/erpnext into loan_repayment_type_remove
2020-10-22 21:52:16 +05:30
Deepesh Garg
cd2c90451e
fix: Unaccrued interest after disbursal
2020-10-22 21:50:06 +05:30
Nabin Hait
db474aea95
Merge branch 'develop' into link-to-mr
2020-10-22 21:45:07 +05:30
Nabin Hait
ed1553ea81
Merge branch 'develop' into mpesa-integration
2020-10-22 21:45:03 +05:30
Nabin Hait
c77ce99ce8
Merge branch 'develop' into UAE-VAT-Format
2020-10-22 21:44:55 +05:30
Nabin Hait
5778595d50
Merge branch 'develop' into debit-credit-opening-invoice-tool
2020-10-22 21:42:54 +05:30
Nabin Hait
9ff4a2ebd8
Merge branch 'develop' into feat-added-balance-serial-no-column-develop
2020-10-22 21:40:29 +05:30
Marica
3b1be2b1de
fix: Add Taxes if missing via Update Items ( #23702 )
...
* fix: Add Taxes if missing via Update Items
* chore: PO Test for adding tax row via Update Items
* chore: SO Test for adding tax row via Update Items
2020-10-22 17:04:31 +05:30
rohitwaghchaure
e3ad5f0bc3
Merge pull request #23407 from deepeshgarg007/stock_entry_conversion_factor
...
fix: Conversion factor fixes in Stock Entry
2020-10-22 16:58:06 +05:30
Saqib
a6ff664386
fix: cannot auto unlink payments for credit/debit notes ( #23689 )
2020-10-22 16:30:57 +05:30
rohitwaghchaure
cc5171a324
Merge branch 'develop' into stock_entry_conversion_factor
2020-10-22 15:20:32 +05:30
Saqib
52435ee291
Merge branch 'develop' into UAE-VAT-Format
2020-10-22 14:16:28 +05:30
Suraj Shetty
6a0eb61af3
fix: Set customer only if contact is present ( #23704 )
2020-10-22 14:05:58 +05:30
Rohit Waghchaure
fa842e8774
fix: incorrect backflush qty in manufacture entry
2020-10-22 13:35:27 +05:30
Michelle Alva
52514a30d7
feat: Add Integrations Settings in desk ( #22857 )
...
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
Co-authored-by: Marica <maricadsouza221197@gmail.com>
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2020-10-22 09:52:34 +05:30
Deepesh Garg
2c97244bad
fix: Test Cases
2020-10-22 09:34:27 +05:30
Mangesh-Khairnar
1a6d82a447
fix(payment-request): only consider paid transactions
2020-10-22 01:07:49 +05:30
Deepesh Garg
3f177bffac
fix: Add test for loan top up
2020-10-21 22:15:18 +05:30
Deepesh Garg
8f9bab79a7
fix: Update no copy fields
2020-10-21 19:03:13 +05:30
Deepesh Garg
13cbda110d
fix: Test Case
2020-10-21 16:11:52 +05:30
Mangesh-Khairnar
c8a04fec35
fix(mpesa-settings): add test cases to verify transactions
2020-10-21 14:07:00 +05:30
Deepesh Garg
2f65ab5355
fix: Validatiion for loan write off amountt
2020-10-21 10:40:59 +05:30
Saqib
4970386990
Merge branch 'develop' into UAE-VAT-Format
2020-10-20 18:38:44 +05:30
Mohammad Hasnain
8796567b42
chore(UAE VAT 201): add puctuation
2020-10-20 16:35:28 +05:30
Deepesh Garg
ce95bc2ce0
Merge pull request #23691 from nextchamp-saqib/fix-#214
...
fix: '>' not supported between instances of 'str' and 'int'
2020-10-20 14:17:55 +05:30
Mohammad Hasnain
33e9a1ab31
refactor(UAE VAT 201): solve linting issues
2020-10-20 13:04:38 +05:30
rohitwaghchaure
b74d17b1e3
Merge pull request #23688 from rohitwaghchaure/fixed-overproduction-issue-develop
...
fix: overproduction issue develop
2020-10-20 12:55:43 +05:30
Saqib Ansari
903055b7b6
fix: '>' not supported between instances of 'str' and 'int'
2020-10-20 11:59:06 +05:30
Mohammad Hasnain
6a24da4efd
refactor(UAE VAT 201): break functions
2020-10-20 11:53:06 +05:30
Rohit Waghchaure
09572f10f8
fix: overproduction, not allowed to transfer extra materials
2020-10-20 11:01:36 +05:30
Mohammad Hasnain
c08591124c
chore(UAE VAT 21): solve merge conflicts
2020-10-20 10:17:48 +05:30
Rohit Waghchaure
6471912216
fix: not able to do overproduction
2020-10-20 10:02:01 +05:30
Mohammad Hasnain
75ccb62d46
Merge branch 'develop' into UAE-VAT-Format
2020-10-20 09:40:44 +05:30
Mohammad Hasnain
78ec254da4
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
2020-10-20 09:39:01 +05:30
Mohammad Hasnain
234036df32
chore(uae vat 201): solve travis issues
2020-10-20 07:42:10 +05:30
Mohammad Hasnain
853fd03f49
feat(uae vat 201): fix linter issues
2020-10-19 22:35:16 +05:30
Mohammad Hasnain
33cdfdfb7f
feat(UAE VAT 201): Add tests for report
2020-10-19 20:48:43 +05:30
Mohammad Hasnain
c1b8004757
feat(UAE VAT 21): claimable to recoverable
2020-10-19 20:47:56 +05:30
Mangesh-Khairnar
5c29eb08c4
Merge branch 'develop' of https://github.com/frappe/erpnext into mpesa-integration
2020-10-19 18:29:46 +05:30
Mangesh-Khairnar
ebb8ee3dc6
fix(payment gateway account): add patch to set the payment channel as email
2020-10-19 18:27:40 +05:30
Mohammad Hasnain
32eb9a7893
feat(UAE VAT 201): claimable to recoverable
2020-10-19 17:58:50 +05:30
Joseph Marie Alba
8115be58a3
fix: Posting Date bug in load_defaults ( #23415 )
...
this.frm.posting_date is always invalid and should be changed to this.frm.doc.posting_date
The effect of this bug fix is, a default Posting Date value may now be set in Custom Script's onload event, and the default value will be honored.
Example: (Assuming posting date has been included in standard filter)
```
frappe.ui.form.on('Journal Entry', {
before_load(frm) {
var posting_date = $("input[data-fieldname='posting_date']")[0].value
posting_date = moment(posting_date)._d
frm.set_value('posting_date', posting_date )
}
})
```
Without the fix, the posting date will always be today's date. With the bug fix, the default value for posting date which is taken from the posting date's Standard Filter vale is honored.
Co-authored-by: Sagar Vora <sagar@resilient.tech>
2020-10-19 17:02:04 +05:30
