Andy Zhu
f7a0b8b5b6
fix: fieldname update for 'Credit' and 'Debit' ( #21405 )
...
* fix: fieldname update for 'Credit' and 'Debit'
'credit' updated to 'credit_in_account_currency'
'debit' updated to 'debit_in_account_currency'
* Update journal_entry.py
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-05-04 12:09:28 +05:30
Mangesh-Khairnar
c4c7d15d54
fix: pre-process both the existing and new products ( #21526 )
...
* fix: pre-process both the existing and new products
* fix: delete hub tracked item on unpublish
Co-authored-by: Marica <maricadsouza221197@gmail.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-05-04 11:25:06 +05:30
Deepesh Garg
095b5586a2
fix: Accounting Dimensions in Period Closing Voucher ( #21564 )
2020-05-04 11:12:14 +05:30
Rucha Mahabal
0243981f31
fix: handle exception if sending Appointment Confirmation message fails ( #21569 )
2020-05-04 11:08:44 +05:30
Deepesh Garg
c33c309da3
Merge pull request #21571 from surajshetty3416/fix-console
...
refactor: Folio no validation
2020-05-04 09:03:14 +05:30
Deepesh Garg
6df581f78b
Merge pull request #21375 from marination/commonify-warehouse-autofill
...
chore: Commonify auto-filling warehouses in child tables
2020-05-03 20:33:45 +05:30
Suraj Shetty
9a8512d01d
fix: NameError due to invalid variable
2020-05-03 20:17:47 +05:30
Suraj Shetty
9fffe254fc
refactor: Folio no validation
2020-05-03 19:10:02 +05:30
rohitwaghchaure
268df35d80
Merge pull request #21516 from marination/stock-balance-cleanup
...
chore: Added company filter and minor cleanup in Stock Balance Report
2020-05-03 16:31:34 +05:30
Saqib
d84a55313a
chore: add validation for gross purchase amount ( #21534 )
...
* chore: add validation for gross purchase amount
* fix: tests
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-05-03 13:20:24 +05:30
Mangesh-Khairnar
2f7861a9b8
feat: Process deferred accounting entry ( #19658 )
...
* feat: process deferred accounting
* feat: maintain entry for deferred accounting
* feat: add check for automatic deferred accounting entry
* feat: add build conditions for company and account
* fix: create record for automatic processing of deferred accounting
* feat: add custom naming series
* fix: change the deferred revenue creation via hooks
* fix: add client side validations
* test: creation of gl entries on submission of process deferred accounting
* fix: add multiple validations
* patch(accounts-settings): set automatically process deferred accounting entry
* fix: On cancel function for deferred entry
* fix: Send email per process instead of per invoice
* fix: Test cases
* fix: Label
* fix: Process deferred accounting fixes
* fix: Error flag
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: deepeshgarg007 <deepeshgarg6@gmail.com>
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2020-05-02 20:09:33 +05:30
Deepesh Garg
6d32f3d50a
Merge pull request #21562 from deepeshgarg007/make_reverse_entry
...
fix: Reverse GL Entry on cancel fix
2020-05-02 18:09:07 +05:30
Deepesh Garg
cea4eeaa53
fix: Reverse GL Entry on cancel fix
2020-05-02 18:05:33 +05:30
Marica
1c8cbd07b8
fix: variable referenced before assignment ( #21560 )
2020-05-02 17:55:15 +05:30
Nabin Hait
a1ffc44f0c
fix: removed unwanted comma from json
2020-05-01 18:55:57 +05:30
Deepesh Garg
f7966f444d
Merge pull request #21404 from abhishekbalam/develop
...
feat(Accounts): Journal Entry Templates v1
2020-05-01 18:42:54 +05:30
Deepesh Garg
978de8779c
fix: Add multi currency check and proper account filters
2020-05-01 18:38:13 +05:30
Nabin Hait
da17f9cb05
feat: Run MRP at parent level in the production plan ( #21545 )
...
* enhance: provision to make material request from other location
* fix: source warehouse for material transfer from production plan
Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
2020-05-01 18:16:25 +05:30
Saqib
39805918d4
fix: accounts payable shows advance amount of other company ( #21548 )
2020-05-01 18:15:13 +05:30
Vishal Dhayagude
2e082affc7
fix(HR): Leave application company field made read-only and filter in Monthly attendance sheet ( #20912 )
...
* fix(HR): Leave application company field made Readonly
* fix: in monthly report attandance employee filter based on company
* fix: minor typo
* fix: Fetch company from employee
* Update monthly_attendance_sheet.py
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-05-01 18:11:43 +05:30
Deepesh Garg
0f8150f8de
Merge pull request #21546 from deepeshgarg007/loan_closure_fixes
...
fix: Loan Closure without loan interest accrual
2020-05-01 15:49:56 +05:30
Deepesh Garg
662838adb3
fix: Party Type filter in payment entry list view ( #21541 )
2020-05-01 15:00:55 +05:30
Deepesh Garg
db83c29079
Merge branch 'develop' into develop
2020-05-01 14:20:53 +05:30
Deepesh Garg
1b35873743
Merge branch 'develop' into loan_closure_fixes
2020-05-01 14:18:36 +05:30
Deepesh Garg
1a1b06cf59
Merge pull request #21539 from deepeshgarg007/trvis_child_table_validation_fix
...
fix: Travis (develop)
2020-05-01 14:17:46 +05:30
Deepesh Garg
032814b86a
fix: Patch test
2020-05-01 13:26:26 +05:30
Deepesh Garg
2390f3d0e2
Merge pull request #21543 from frappe/revert-21420-patch-8
...
Revert "fix: Update in field type"
2020-05-01 12:04:24 +05:30
Deepesh Garg
998364d636
fix: Update timestamp
2020-05-01 12:04:13 +05:30
Deepesh Garg
6cce75a230
Revert "fix: Update in field type"
2020-05-01 12:03:18 +05:30
Deepesh Garg
e2de2923e2
Merge pull request #21420 from wojosc/patch-8
...
fix: Update in field type
2020-05-01 11:38:23 +05:30
Deepesh Garg
779815a035
fix: Loan Repayment Test
2020-05-01 11:04:12 +05:30
rohitwaghchaure
be16e5cccc
fix: 'NoneType' object is not iterable ( #21537 )
2020-05-01 10:50:17 +05:30
rohitwaghchaure
52005d1ea3
Merge pull request #21501 from nextchamp-saqib/validate-paid-inv-msg
...
chore: validate and warn payment against paid invoices
2020-05-01 10:37:23 +05:30
Deepesh Garg
2dbd228eab
fix: Check is child table for POS profile user
2020-05-01 09:50:56 +05:30
rohitwaghchaure
260bf54c99
Merge pull request #21171 from nextchamp-saqib/rename-bank-reco
...
chore: rename bank reconciliation to bank clearance
2020-05-01 09:33:52 +05:30
Deepesh Garg
1a497b3442
Merge branch 'develop' of https://github.com/frappe/erpnext into loan_closure_fixes
2020-05-01 09:24:10 +05:30
marination
3568dc75be
fix: Make Company the first filter
2020-05-01 00:01:37 +05:30
Shivam Mishra
f411e754ae
Merge pull request #21536 from scmmishra/rzpay-fixes
...
fix: elif block error
2020-04-30 22:39:54 +05:30
Shivam Mishra
d76c5e83ca
fix: elif block error
2020-04-30 22:39:03 +05:30
Deepesh Garg
61363d2ced
fix: Initialize interest_paid as zero
2020-04-30 22:22:44 +05:30
Deepesh Garg
4226191ec7
fix: Loan Closure without loan interest accrual
2020-04-30 22:11:57 +05:30
Saqib
dac51ea1cf
Merge branch 'develop' into validate-paid-inv-msg
2020-04-30 20:08:18 +05:30
Shivam Mishra
9067c7bc55
Merge pull request #21470 from scmmishra/razorpay-subscription
...
refactor: minor changes to razorpay subscription
2020-04-30 20:07:44 +05:30
Marica
66e99d5767
Merge branch 'develop' into razorpay-subscription
2020-04-30 20:07:05 +05:30
Rucha Mahabal
f65fb1fcf8
fix: Move Video Doctype from Education module to Core ( #21234 )
...
* fix: move Video Doctype from Education module to Core
* fix: patch to retain Permissions
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2020-04-30 19:47:18 +05:30
Saqib
4422ffdb22
chore: asset accounts should have company currency ( #21524 )
2020-04-30 18:39:13 +05:30
Raffael Meyer
3484a79ccf
Update datev_settings.json ( #21482 )
2020-04-30 16:27:11 +05:30
Michelle Alva
95b186268c
fix: only check for payment_account on bank entry ( #21445 )
...
* fix: only check for payment_account on bank entry
Since all the fields (company, start and end date are mandatory before form submission, there is no need to check for them again after submission.
* fix: cur_frm to frm
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-04-30 16:24:51 +05:30
marination
89c41d8384
chore: Added company filter and minor cleanup in Stock Balance Report
2020-04-30 13:56:49 +05:30
Saqib Ansari
c604109287
chore: handle credit note validation
2020-04-30 13:23:59 +05:30
