Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
42,998 Commits 3 Branches 0 Tags 1 GiB
377576f131
Commit Graph

42998 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sagar Vora
0aafc75c90 fix: add missing print format 2022-06-26 18:36:00 +05:30
Sagar Vora
85c4c342d8 fix: improve patches 2022-06-26 18:30:54 +05:30
Sagar Vora
7f390fb755 Merge branch 'develop' into remove-india 2022-06-26 18:10:44 +05:30
Smit Vora
64de0d06ad patch: remove custom field creation patch 2022-06-26 11:56:06 +05:30
Vladislav
7c682c55fa
Update ru.csv 2022-06-26 01:36:11 +03:00
Vladislav
99504ebe52
Update ru.csv 2022-06-26 00:15:30 +03:00
Deepesh Garg
904e69e541
Merge branch 'develop' into quotation_order_item_syn 2022-06-25 19:46:20 +05:30
Deepesh Garg
9c1eb770ba
Merge pull request #31442 from ruthra-kumar/incorrect_outstanding_on_multiple_cost_centers 
fix: incorrect outstanding for invoice
 2022-06-25 19:42:14 +05:30
Nabin Hait
f72d5506de fix: get_all replace by sql 2022-06-25 15:08:45 +05:30
Nabin Hait
2d226be3c4 fix: Made no of employees a select field 2022-06-25 11:40:23 +05:30
Nabin Hait
483fc420a1 test: invoice from timesheet 2022-06-25 11:40:23 +05:30
Nabin Hait
6a0d0a338d fix: Test cases removed related to copying comments from opportunity to quotation 2022-06-25 11:40:23 +05:30
Nabin Hait
82bf59e2a3 fix: test case 2022-06-25 11:40:23 +05:30
Nabin Hait
d8163f3e47 fix: set exchange rate 2022-06-25 11:40:23 +05:30
Nabin Hait
f904ac599e fix: merge conflicts and sider issues 2022-06-25 11:40:23 +05:30
Vladislav
49aa7634a3
Update ru.csv 2022-06-25 01:32:24 +03:00
Smit Vora
8fb0997cf1 patch: remove related docs and warn 2022-06-24 21:59:28 +05:30
Deepesh Garg
6acd0325be fix: General Ledger and TB opening entries mismatch issues 2022-06-24 21:45:05 +05:30
Deepesh Garg
58fe220479 fix: Quotation and Sales Order item sync 2022-06-24 19:43:50 +05:30
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