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

46513 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepesh Garg
c2f8f1d028
Merge pull request #36983 from deepeshgarg007/employee_utils 
chore: Update employee for tests
 2023-09-06 16:31:29 +05:30
Ankush Menat
0f065fe280
Merge pull request #36984 from resilient-tech/remove-unused-var 
chore: remove unused variable `job`
 2023-09-06 14:49:17 +05:30
Sagar Vora
1b853857aa chore: remove unused variable job 2023-09-06 14:14:22 +05:30
Deepesh Garg
ae01d70b33 chore: Update employee for tests 2023-09-06 13:19:00 +05:30
Anand Baburajan
0077659e93
chore: asset finance books validation (#36979) 2023-09-06 12:44:07 +05:30
Devin Slauenwhite
8ce6b8179e
fix: use primary key for link lookup (#36919) 2023-09-06 11:44:45 +05:30
anandbaburajan
e1a94a9ba1 fix: move SI and DI connected links to internal_and_external_links 2023-09-05 21:38:06 +05:30
Gursheen Anand
175870ce8d test: tax withholding details report 2023-09-05 18:51:41 +05:30
Gursheen Anand
8eea4eb56e fix: remove tax category from common fields 2023-09-05 18:50:53 +05:30
Anand Baburajan
174f95d699
fix: ask for asset related accounts only when needed (#36960) 
* fix: only ask for asset_received_but_not_billed account when needed

* chore: remove unnecessary if condition

* fix: only ask for expenses_included_in_asset_valuation account when needed
 2023-09-05 17:45:23 +05:30
s-aga-r
f809e12747
fix: ignore mandatory fields while saving WO (#36954) 2023-09-05 16:27:17 +05:30
ruthra kumar
ccd2e2b086
Merge pull request #36963 from ruthra-kumar/index_error_on_receivable_report 
fix: index error on Receivable report based on payment terms
 2023-09-05 16:12:38 +05:30
ruthra kumar
b9c556c4a9 fix: index error on Receivable report based on payment terms 
cr note's don't have payment terms. So, skip for them.
 2023-09-05 15:07:07 +05:30
RitvikSardana
d2f03c8a65
fix: payment recon not showing payment entry when party_type is Student (#36920) 
* fix: payment recon not showing payment entry when party_type is Student

* chore: code cleanup

* fix: payment recon based on account_type which is fetched from Party Type master
 2023-09-05 12:00:54 +05:30
ruthra kumar
5dbcf7d2b9 refactor: only cancel specific gain/loss je 2023-09-05 09:52:36 +05:30
ruthra kumar
6fd1c1bca2 refactor: display allocated amount in account currency with symbol 2023-09-05 09:34:01 +05:30
ruthra kumar
9a1588f1cc fix: typo in doctype name and qb 2023-09-05 08:34:26 +05:30
ruthra kumar
67980188a7 test: more granular unreconciliation 2023-09-05 08:34:26 +05:30
ruthra kumar
9b6eac23b6 refactor: unlink individual vouchers from payments 2023-09-05 08:34:26 +05:30
ruthra kumar
b4dc2bdf28 chore: type info 2023-09-05 08:34:26 +05:30
ruthra kumar
0130aea2aa refactor: convert raw sql to query_builder 2023-09-05 08:34:26 +05:30
ruthra kumar
de910ab152 refactor: single fetch and unlinking logic for JE and PE 2023-09-05 08:34:26 +05:30
ruthra kumar
285963acdb feat: unreconcile support for journal entry 2023-09-05 08:34:26 +05:30
ruthra kumar
cce96669f0 refactor: modularisation and group by voucher_no 2023-09-05 08:34:26 +05:30
ruthra kumar
0ccb6d8242 chore: rename and add trigger in journal entry 2023-09-05 08:34:26 +05:30
ruthra kumar
69683776a5 chore: code cleanup 2023-09-05 08:34:26 +05:30
ruthra kumar
1981f3837a chore: fetch logic for payment entry 2023-09-05 08:34:26 +05:30
ruthra kumar
25fe752185 chore: move functions to a separate file in utils 2023-09-05 08:34:26 +05:30
ruthra kumar
5981c7e0ad chore: move dialog building function to utils.js file 2023-09-05 08:34:26 +05:30
ruthra kumar
58dc0e52e1 refactor: add UI elements 2023-09-05 08:34:26 +05:30
ruthra kumar
6bbe47c671 chore: delete unreoncile doc upon parent doc deletion 2023-09-05 08:34:26 +05:30
ruthra kumar
489a545bbb chore: track changes 2023-09-05 08:34:26 +05:30
ruthra kumar
42df0d3d67 refactor: remove references using framework 2023-09-05 08:34:26 +05:30
ruthra kumar
fbdfb8151c chore: delete references upon parent deletion 2023-09-05 08:34:26 +05:30
ruthra kumar
41eb2c9f5a feat: filter on voucher no 2023-09-05 08:34:26 +05:30
ruthra kumar
fc6be5bfb9 feat: UI for unreconcile 2023-09-05 08:34:26 +05:30
ruthra kumar
0faffaa8db test: basic unreconcile function 2023-09-05 08:34:26 +05:30
ruthra kumar
5114a9580d refactor: adding 'Get Allocations' button 2023-09-05 08:34:26 +05:30
ruthra kumar
e48a90efe6 chore: working state on barebones functions 2023-09-05 08:34:26 +05:30
ruthra kumar
dc71623295 feat: introduce unreconcile doctype 2023-09-05 08:34:26 +05:30
ruthra kumar
13ca474a46
Merge pull request #36950 from ruthra-kumar/use_reference_posting_date_on_je 
refactor: gain/loss je should use same posting date as payment
 2023-09-05 08:26:58 +05:30
ruthra kumar
f7865da4d2 refactor: gain/loss should use same posting date as payment 2023-09-04 21:40:40 +05:30
rohitwaghchaure
6a7bdeffdf
fix: auto refresh serial and batch bundle field (#36943) 2023-09-04 14:11:42 +05:30
ruthra kumar
04bc353e7f
Merge pull request #36940 from ruthra-kumar/invalid_gain_loss_in_expense_claim 
fix: invalid gain/loss JE created on base currency Expense Claim
 2023-09-04 13:56:01 +05:30
ruthra kumar
75d95acb23 fix: invalid gain/loss JE created on base currency Expense Claim 2023-09-04 13:05:57 +05:30
s-aga-r
cd8ddae7c5
refactor: remove Recalculate Rate from SCR Item (#36929) 2023-09-03 18:54:44 +05:30
s-aga-r
22cf1556cd
feat: Service Item and Finished Good Map (#36647) 
* feat: new DocType `Service Item and Finished Good Map`

* fix(ux): filters for Service Item and Finished Good

* fix: validations for Service Item and Finished Good

* feat: set FG Item on Service Item selection in PO

* refactor: one-to-many mapping between service item and finished goods

* feat: auto set Service Item for finished good in PO created from PP

* feat: auto set Service Item on Finished Good selection in PO

* test: add test case for service item and finished goods map

* feat: `BOM` field in `Finished Good Detail`

* feat: new DocType `Subcontracting BOM`

* fix: filters and validations for Subcontracting BOM

* feat: auto select Service Item in PO created from PP

* test: add test case for PO service item auto pick

* feat: pick BOM from Subcontracting BOM in SCO

* feat: auto pick `Service Item` on FG select

* refactor: remove DocType `Service Item and Finished Goods Map` and `Finished Good Detail`

* feat: fetch FG for Service Item

* chore: `linter`

* refactor: update `Auto Name` expression for Subcontracting BOM
 2023-09-03 11:59:28 +00:00
HENRY Florian
24e1144de5
fix: when create doc from item dashboard default uom (buying or selling) is not correctly selected (#36892) 
fix: when create doc from item dashboard defaut uom is not correctly selected
 2023-09-03 16:37:52 +05:30
ruthra kumar
27e0dd9fdc
Merge pull request #36911 from ruthra-kumar/deduplicate_gain_loss_journal_creation 
fix: deduplicate gain/loss JE creation for journals as payment
 2023-09-03 10:11:43 +05:30
ruthra kumar
0366928db5 test: cost center inheritance from payment 2023-09-03 09:21:26 +05:30