Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
43,479 Commits 3 Branches 0 Tags
Commit Graph

43479 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ruthra kumar
321fea322c test: invoice outstanding when gl's are split on cost center allocat 2022-06-24 17:47:11 +05:30
Sagar Vora
b6133c300e test: create TDS payable account 2022-06-24 16:46:52 +05:30
Sagar Vora
4a2a02286a test: create tax withholding category instead of updating 2022-06-24 15:49:19 +05:30
Sagar Vora
69ff61c838 fix: add Lower Deduction Certificate to the Accounting workspace for now 2022-06-24 15:12:43 +05:30
Sagar Vora
9b057d15b2 fix: move hooks to reduce diff 2022-06-24 15:04:28 +05:30
Rucha Mahabal
c619b58ba9 fix: remove HR/Payroll references from form dashboards 
- Employee, Holiday List, Project, Task, Timesheet
 2022-06-24 15:03:16 +05:30
Vladislav
913b393969
Update ru.csv 2022-06-24 11:16:39 +03:00
Vladislav
2826056d41
Update ru.csv 2022-06-24 11:14:57 +03:00
Smit Vora
3c9eea54a5 fix: remove student naming series 2022-06-24 13:42:07 +05:30
Sagar Vora
593147d337 test: move code to ensure fixtures get created 2022-06-24 14:37:11 +05:30
Sagar Vora
2e6919b7be fix: remove more India patches 2022-06-24 14:14:12 +05:30
Sagar Vora
ff10f557c0 test: use Sales Expenses instead of VAT to test disabled account 2022-06-24 13:49:20 +05:30
Sagar Vora
12b7e14fde chore: keep back code to be a part of other apps / to be ported later 2022-06-24 13:38:13 +05:30
ruthra kumar
71f6f78d94 fix: incorrect outstanding for invoice 2022-06-24 13:36:15 +05:30
Rucha Mahabal
39e0d22044 chore: Remove HR related field references from Employee, Department form scripts 
- removed approver fields and payroll cost center from Employee master

- removed query filter code for HR related fields from employee and department form scripts

- removed `update_approver_role`
 2022-06-24 13:14:26 +05:30
Sagar Vora
0810674c8a Merge remote-tracking branch 'upstream/develop' into remove-india 2022-06-24 13:08:40 +05:30
Marica
1d683ca9f2
Merge pull request #31421 from s-aga-r/fix/production-plan/test/planned-qty 
fix: add UOM validation for planned-qty
 2022-06-24 12:40:03 +05:30
Vladislav
f59a6248bc
Update ru.csv 
- fix logic
- add translate
 2022-06-24 01:02:41 +03:00
Rucha Mahabal
eac58abcc5 chore: Remove HR related reports from other modules 
- Project Profitability report: Projects

- Employee Hours Utilization Based on Timesheet: Projects

- Unpaid Expense Claims: Accounts
 2022-06-23 20:50:55 +05:30
Rucha Mahabal
edb528ce41 chore: Remove code for Expense Claim from Project, Task, Delivery Trip 
- Remove `total_expense_claim` field from Project and Task, will be installed with hrms setup

- Remove Expense Claim calculation from `update_costing` in project

- Remove `update_total_expense_claim` from task

- Remove Expense Claim references from employee form tour

- Remove 'Make Expense Claim' button from Delivery Trip, will only be available if hrms is installed

- Update delivery trip tests
 2022-06-23 19:48:42 +05:30
Rucha Mahabal
1ff0e4519f chore: Extract Expense Claim, FnF, Gratuity, Employee Advance related code from accounting 
- Added hooks `advance_payment_doctypes`, `invoice_doctypes`, `period_closing_doctypes` for other apps to extend accounting functionality

- Removed `set_query` code from `journal_entry.js` and `payment_entry.js`

- removed `update_status_for_full_and_final_statement` trigger on JE submission/cancellation

- refactored `payment_entry.py`: split functions for validating reference doctypes for easy overriding, removed hrms references from `get_reference_details` and `get_payment_entry`

- removed dead code: functions `get_bill_no_and_update_amounts`, `get_total_amount_exchange_rate_base_on_currency`, `get_total_amount_exchange_rate_for_employee_advance`, `get_amounts_based_on_ref_doc`, `get_amounts_based_on_reference_doctype`
 2022-06-23 16:17:34 +05:30
GangaManoj
416d578290 fix: Add missing comma 2022-06-23 15:14:31 +05:30
GangaManoj
1b1786532a test: Test monthly depreciation by Written Down Value method 2022-06-23 15:14:31 +05:30
GangaManoj
2b7ab72a72 fix: Convert string to datetime object 2022-06-23 15:14:31 +05:30
GangaManoj
e62beaefc1 test: Test if final day of the month is taken if depr_start_date is the last day of its month 2022-06-23 15:14:31 +05:30
GangaManoj
154e258ad0 fix: Get last day of the monthif depr posting date is the last day of its month 2022-06-23 15:14:31 +05:30
GangaManoj
b07aae4da5 fix: Correct pro-rata amount calculation 2022-06-23 15:14:31 +05:30
GangaManoj
2d9153ea30 fix: Remove misleading comment 2022-06-23 15:14:31 +05:30
GangaManoj
ab13a178b5 fix: Replace asset life with total no of depreciations 2022-06-23 15:14:31 +05:30
Sagar Sharma
73a15adc67
Merge branch 'develop' into fix/production-plan/test/planned-qty 2022-06-23 11:20:22 +05:30
Deepesh Garg
79d5d35df9
Merge pull request #31395 from nihantra/bank_clear_summ 
fix: filter set in Bank Clearance Summary
 2022-06-23 10:54:56 +05:30
Sagar Sharma
70bc51a8fc
Merge branch 'develop' into fix/production-plan/test/planned-qty 2022-06-22 15:33:08 +05:30
s-aga-r
00807abe31 fix: add UOM validation for planned-qty 2022-06-22 14:28:17 +05:30
Deepesh Garg
db2484b6b2
Merge pull request #31418 from ruthra-kumar/payment_ledger_migration_logic_bug 
fix: handle empty values("") in against_voucher columns on gl migration
 2022-06-22 12:51:21 +05:30
Marica
4c0749e04a
Merge pull request #31406 from marination/bom-update-log-cleanup-perf 
chore: Clear Progress section for completed logs & `on_submit` UX
 2022-06-22 12:16:06 +05:30
Marica
46d02ec4b2
Merge branch 'develop' into bom-update-log-cleanup-perf 2022-06-22 11:50:06 +05:30
Marica
55d67a0d09
Merge pull request #31420 from HarryPaulo/translate-status-filter-orders 
fix: translation for filter status on report
 2022-06-22 11:45:59 +05:30
rohitwaghchaure
2ed06d7ceb
Merge pull request #31248 from rohitwaghchaure/fixed-transferred-materials-are-not-consumed 
fix: transferred batches are not fetched while making Manufacture stock entry
 2022-06-22 11:37:15 +05:30
hrzzz
8b1ff96e30 fix: translation for filter status on report 2022-06-21 15:10:19 -03:00
rohitwaghchaure
186224a12a
Merge branch 'develop' into fixed-transferred-materials-are-not-consumed 2022-06-21 22:45:05 +05:30
ruthra kumar
5826b7b071 fix: identify empty values "" in against_voucher columns 2022-06-21 19:50:50 +05:30
Vladislav
ce1b4e40a1
fix: update ru translate (#31404) 
* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

fix logic

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv
 2022-06-21 19:25:05 +05:30
Rucha Mahabal
f6fbcc99a3 chore: Removed payroll dependencies from Loan Management, moved to hrms app 
- Salary Slip Loan dt moved to hrms, removed from erpnext app

- Repay from Salary field removed from Loan and Loan Repayment, installed on hrms app setup

- fixed references to salary slip loan fields
 2022-06-21 18:13:01 +05:30
Ankush Menat
e866ec6e28
Merge pull request #31412 from s-aga-r/fix/bom/default 
fix: set default_bom for item
 2022-06-21 16:42:38 +05:30
s-aga-r
dc2830da4d fix: set default_bom for item 2022-06-21 15:13:01 +05:30
Deepesh Garg
b16ab818c5
Merge pull request #31264 from ankush/internal_trasfer_precision_loss 
fix: internal transfer GLE validation
 2022-06-21 14:31:18 +05:30
marination
4cf2225a29 chore: Implement Log clearing interface in BOM Update Log 
- Implement Log clearing interface in BOM Update Log
- Add additional info in sidebar: Log clearing only happens for 'Update Cost' type logs
- 'Replace BOM' logs have important info and is used in BOM timeline, so we'll let users decide if they wanna keep or discard it
 2022-06-21 14:10:59 +05:30
Sagar Sharma
912d26361d
Merge branch 'develop' into fixed-transferred-materials-are-not-consumed 2022-06-21 13:23:37 +05:30
Marica
5ae8f5d4b8
Merge branch 'develop' into bom-update-log-cleanup-perf 2022-06-21 11:01:03 +05:30
Deepesh Garg
f572c20009
Merge branch 'develop' into internal_trasfer_precision_loss 2022-06-21 10:45:02 +05:30