Mangesh-Khairnar
|
5cdda19494
|
fix: ledger entries after expiry
|
2019-08-20 14:45:57 +05:30 |
|
rohitwaghchaure
|
16dda1a991
|
fix: group by voucher consolidated showing incorrect data for deferred entries (#18779)
|
2019-08-20 12:37:32 +05:30 |
|
rohitwaghchaure
|
d5b4b1fdaf
|
fix: group by voucher consolidated showing incorrect data for deferred entries (#18777)
|
2019-08-20 12:35:15 +05:30 |
|
Mangesh-Khairnar
|
b69595904a
|
Merge pull request #18786 from Mangesh-Khairnar/payment-order-fetch-fix
fix: restrict the payment order to non received type payment entries
|
2019-08-20 12:21:24 +05:30 |
|
rohitwaghchaure
|
9ef7d5edaf
|
Merge pull request #18789 from rohitwaghchaure/asset_pro_rata_cal_for_wdv_remaining_amt_develop
Asset pro rata cal for wdv remaining amt develop
|
2019-08-20 10:33:15 +05:30 |
|
Rohit Waghchaure
|
5d3dee206f
|
fixed test cases and the logic for pro rata calculation
|
2019-08-20 10:30:56 +05:30 |
|
Rohit Waghchaure
|
1583925080
|
fix: Pro rata calculation is not working for WDV depreciation method
|
2019-08-20 10:30:38 +05:30 |
|
Mangesh-Khairnar
|
c97a7fb845
|
fix: restrict the payment order to non received type payment entries
|
2019-08-20 00:27:43 +05:30 |
|
Mangesh-Khairnar
|
becb89213f
|
Merge pull request #18737 from Mangesh-Khairnar/fix-payment-order
fix: restrict the payment order to non received type payment entries
|
2019-08-20 00:13:32 +05:30 |
|
Rohit Waghchaure
|
1008e6e450
|
fix: debit note not reconciled with another purchase invoice using payment reconciliation
|
2019-08-19 20:27:15 +05:30 |
|
Mangesh-Khairnar
|
09ddc84c3a
|
Merge pull request #18774 from deepeshgarg007/test_case_fix
fix: Failing sales and purchase return test cases
|
2019-08-19 19:20:52 +05:30 |
|
Deepesh Garg
|
33b392ac2b
|
Update erpnext/controllers/sales_and_purchase_return.py
Co-Authored-By: Mangesh-Khairnar <mkhairnar10@gmail.com>
|
2019-08-19 17:43:10 +05:30 |
|
Deepesh Garg
|
3965451c7a
|
Update erpnext/controllers/sales_and_purchase_return.py
Co-Authored-By: Mangesh-Khairnar <mkhairnar10@gmail.com>
|
2019-08-19 17:40:29 +05:30 |
|
deepeshgarg007
|
0487ad5515
|
fix: Code cleanup
|
2019-08-19 16:40:29 +05:30 |
|
deepeshgarg007
|
e2acc748c8
|
fix: Check for return against delivery noteas well
|
2019-08-19 16:38:04 +05:30 |
|
Mangesh-Khairnar
|
4645727163
|
Merge branch 'develop' into fix-payment-order
|
2019-08-19 16:29:30 +05:30 |
|
deepeshgarg007
|
7d288437d8
|
fix: Assignment
|
2019-08-19 16:19:48 +05:30 |
|
deepeshgarg007
|
c80e5fe7a1
|
fix: Failing sales and purchase return test cases
|
2019-08-19 14:38:15 +05:30 |
|
Deepesh Garg
|
5efedd7a60
|
fix: Travis (#18772)
|
2019-08-19 12:56:22 +05:30 |
|
Deepesh Garg
|
960a1cbd8f
|
fix: Party dashboard heatmap not capturing sales, purchase and other activities (#18753)
|
2019-08-19 11:51:16 +05:30 |
|
Anurag Mishra
|
19c3cb0d5b
|
fix: removed filters(not required) (#18729)
|
2019-08-19 10:31:02 +05:30 |
|
Anurag Mishra
|
bc5712a1b3
|
fix: validated cost center in financial_statement (#18733)
* fix: validated cost center in financial_statement
* Update financial_statements.py
|
2019-08-19 10:24:44 +05:30 |
|
Mangesh-Khairnar
|
0df513434e
|
fix: valuation rate in stock ledger (#18744)
* fix: valuation rate in stock ledger
* test: allow zero valuation rate for items
|
2019-08-19 10:04:52 +05:30 |
|
Karthikeyan S
|
d5e5e22adb
|
Merge pull request #18523 from Vigneshsekar/attendance_grace_period
feat(Auto Attendance): Add grace period
|
2019-08-18 13:25:48 +05:30 |
|
Deepesh Garg
|
77ec3cf402
|
Merge pull request #18757 from deepeshgarg007/accounting_dimension_fix
fix: Default dimensions in child doctypes
|
2019-08-16 17:27:14 +05:30 |
|
deepeshgarg007
|
0a2ed6da37
|
fix: Add missing semicolon
|
2019-08-16 15:50:17 +05:30 |
|
Deepesh Garg
|
6e80cbfd1e
|
Merge pull request #18761 from deepeshgarg007/symbol_fix_develop
fix: Symbol fix in chart of accounts
|
2019-08-16 15:48:17 +05:30 |
|
Faris Ansari
|
ac3579d2c6
|
Merge pull request #17624 from Mangesh-Khairnar/leave-management
feat: Carry Forward Leave Expiry
|
2019-08-16 15:39:24 +05:30 |
|
deepeshgarg007
|
8d0b6f9a60
|
fix: Handling if no default dimension exists
|
2019-08-16 14:00:26 +05:30 |
|
deepeshgarg007
|
42d9298318
|
fix: Remove extra space
|
2019-08-16 13:06:47 +05:30 |
|
Mangesh-Khairnar
|
4b71d9ca9f
|
Merge branch 'develop' into fix-payment-order
|
2019-08-16 12:42:26 +05:30 |
|
deepeshgarg007
|
2fb6bc9867
|
fix: Default dimensions in child doctypes
|
2019-08-15 17:06:32 +05:30 |
|
Deepesh Garg
|
98a6e5cb6c
|
Merge pull request #18742 from rohitwaghchaure/incorrect_sequnce_between_name_and_contact
fix: sequence of customer name and contact in the AR report
|
2019-08-14 23:20:55 +05:30 |
|
Rohit Waghchaure
|
c5d41af10f
|
fix: sequence of customer name and contact in the AR report
|
2019-08-14 18:49:19 +05:30 |
|
Mangesh-Khairnar
|
dbb44c8950
|
fix: restrict the payment order to non received type payment entries
|
2019-08-14 17:38:44 +05:30 |
|
Mangesh-Khairnar
|
ae2a0fb4c7
|
chore: remove unused code
|
2019-08-14 16:50:31 +05:30 |
|
Mangesh-Khairnar
|
2e1d7cbdc2
|
Merge pull request #18736 from Mangesh-Khairnar/fix-travis
fix: travis
|
2019-08-14 16:33:34 +05:30 |
|
Mangesh-Khairnar
|
ca55af836b
|
fix: travis
|
2019-08-14 16:32:02 +05:30 |
|
Mangesh-Khairnar
|
3a42631e65
|
Merge branch 'develop' of https://github.com/frappe/erpnext into leave-management
|
2019-08-14 16:11:08 +05:30 |
|
Mangesh-Khairnar
|
107b2768fd
|
refactor: replace raw sql with orm
|
2019-08-14 16:09:16 +05:30 |
|
Anurag Mishra
|
78690d7b8b
|
fix:payment ammount validation for pos invoices (#18663)
|
2019-08-14 15:03:58 +05:30 |
|
Mangesh-Khairnar
|
760b078dc9
|
fix(payroll-entry): commit submitted salary slip check on change (#18694)
* fix(payroll-entry): commit submitted salary slip check onchange
* fix: track submitted ss via flags
|
2019-08-14 14:40:00 +05:30 |
|
Deepesh Garg
|
2c5dcbe819
|
fix: Error handling in payment entry (#18720)
|
2019-08-14 14:26:37 +05:30 |
|
Mangesh-Khairnar
|
06ce1f5a40
|
fix(quality-inspection): fetch all items for inspection type in process (#18716)
* fix(quality-inspection): fetch all items for inspection type in process
* fix(quality-inspection): add server side validation for in process items
|
2019-08-14 14:25:59 +05:30 |
|
Vignesh S
|
4454630549
|
feat(Auto Attendance): Add grace period
Co-authored-by: Karthikeyan S <skarthikeyan1410@gmail.com>
|
2019-08-14 13:40:02 +05:30 |
|
Deepesh Garg
|
612b0ff9cd
|
Merge pull request #18719 from Anurag810/company_fix_v13
fix: removed hard coded string
|
2019-08-14 12:12:26 +05:30 |
|
Deepesh Garg
|
5a7f26f4d2
|
Merge pull request #18717 from Anurag810/company_fix
fix: removed hard coded string form company
|
2019-08-14 12:11:33 +05:30 |
|
Anurag Mishra
|
de20b083a0
|
Merge branch 'develop' into company_fix_v13
|
2019-08-14 12:10:02 +05:30 |
|
Anurag Mishra
|
904cbef4dc
|
fix: removed hard coded string
|
2019-08-13 19:48:42 +05:30 |
|
Anurag Mishra
|
81d5265385
|
fix: removed hard coded string
|
2019-08-13 19:40:36 +05:30 |
|