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

46903 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepesh Garg
57538bd76a
Merge pull request #36218 from GursheenK/view-projects-in-customer-portal 
fix: project routes and permissions in portal
 2023-08-25 22:01:01 +05:30
Deepesh Garg
5c48074bed Merge branch 'develop' of https://github.com/frappe/erpnext into view-projects-in-customer-portal 2023-08-25 21:05:59 +05:30
Deepesh Garg
a7137514b6 chore: Update patch 2023-08-25 21:05:49 +05:30
HENRY Florian
e462edc628
chore: update fr translation for Naming Series (#36785) 
* chore: update fr translation for Naming Series

* chore: update fr translation

* chore: update fr translation

* chore: update fr translation
 2023-08-25 20:40:31 +05:30
s-aga-r
c8d7433e30 refactor(minor): subcontracting_receipt.js 2023-08-25 20:23:39 +05:30
s-aga-r
1504ff8b6c fix: ignore scrap items while distribute additional cost 2023-08-25 20:18:30 +05:30
ruthra kumar
447b73fa77
Merge pull request #36821 from ruthra-kumar/increase_test_coverage_for_receivable_payable_report 
test: use mixin and increase coverage in receivable report
 2023-08-25 18:09:16 +05:30
ruthra kumar
ce81ffd844 test: increase coverage in ar/ap report 2023-08-25 17:28:54 +05:30
s-aga-r
879d31a588 fix: recalculate rate while getting scrap items 2023-08-25 16:13:08 +05:30
ruthra kumar
bb7bed4c1a refactor(test): make use of mixin in ar/ap report tests 2023-08-25 14:46:10 +05:30
Deepesh Garg
91ca2309da
Merge pull request #36802 from GursheenK/tax_withholding_jvs_with_no_partytype 
fix: fetch JVs without party value in tax withholding report
 2023-08-25 14:43:41 +05:30
ViralKansodiya
388a42ec7e
fix: Asset Category filter is not working in asset depreciation and b… (#36806) 
fix: Asset Category filter is not working in asset depreciation and balances

Co-authored-by: ubuntu <viralkansodiya167@gmail.com>
 2023-08-25 11:44:05 +05:30
s-aga-r
9b47617117 feat: button to get Scrap Items 2023-08-25 10:53:13 +05:30
s-aga-r
7a6db924d5 fix: validate scrap items 2023-08-25 09:56:48 +05:30
s-aga-r
199071b773 fix(ux): make Recalculate Rate field hidden for scrap items 2023-08-25 09:36:12 +05:30
s-aga-r
40a6b5cefe fix: don't recalculate rate for scrap items 2023-08-25 09:35:29 +05:30
s-aga-r
a6b2cf3acd fix: reduce scrap cost from FG total cost 2023-08-25 07:30:55 +05:30
s-aga-r
794edbb334 feat: add Scrap Cost Per Qty field in SCR Item 2023-08-24 22:02:29 +05:30
Deepesh Garg
1449e38b39
Merge pull request #36799 from deepeshgarg007/tds_on_debit_note 
fix: Tax withholding reversal on Debit Notes
 2023-08-24 19:30:54 +05:30
Deepesh Garg
abc5fdd47b
Merge pull request #36804 from deepeshgarg007/demo_coa 
fix(demo): Default accounts for demo company
 2023-08-24 19:30:17 +05:30
s-aga-r
f78b6d0081 refactor: code cleanup 2023-08-24 18:56:16 +05:30
Deepesh Garg
8ed8698fdf
Merge pull request #36596 from Nihantra-Patel/pos_receipt_mail 
fix: POS Invoice Email Receipt Mail
 2023-08-24 18:33:49 +05:30
Deepesh Garg
0120588f5f chore: Handle edge cases 2023-08-24 18:32:16 +05:30
Deepesh Garg
8bf87ebfdf
Merge pull request #36805 from deepeshgarg007/comments 
chore: Linting Issues
 2023-08-24 18:02:38 +05:30
Deepesh Garg
299e32befd chore: Linting Issues 2023-08-24 18:02:06 +05:30
Deepesh Garg
5f75aea6fa fix(demo): Default accounts for demo company 2023-08-24 17:58:51 +05:30
Deepesh Garg
6349b67df4 fix(demo): Default accounts for demo company 2023-08-24 17:54:14 +05:30
rohitwaghchaure
3c15feadf6
feat: Multi-level BOM Creator (#36494) 
* feat: Multi-level BOM Creator

* fix: renamed BOM Configurator to BOM Creator

* fix: added Cost in the tree

* fix: finished good cost

* fix: valuation rate in tree ui

* chore: conflicts and removed unnecessary files

* test: test cases for BOM Creator

* fix: added shortcut for the BOM Creator

* fix: added validation for Final Product
 2023-08-24 17:24:44 +05:30
s-aga-r
a33b75f2cd feat: allow manually entry for scrap items in SCR 2023-08-24 16:37:57 +05:30
Gursheen Anand
7c1417e199 chore: fix linting issues 2023-08-24 12:55:54 +05:30
Gursheen Anand
8f1e00906f fix: fetch JVs with no party selected in filters 2023-08-24 12:55:00 +05:30
Ankush Menat
ab6e600b9e
fix: demo data setup w/o territory (#36798) 
This can fail because it's translated.
 2023-08-24 12:23:33 +05:30
s-aga-r
d1e877b6f0 refactor: Subcontracting Receipt Item form view 2023-08-24 12:16:12 +05:30
s-aga-r
4e7cccbdf0 feat: Is Scrap Item field in Subcontracting Receipt Item 2023-08-24 11:53:09 +05:30
Deepesh Garg
6d9cebfee9 fix: Tax withholding reversal on Debit Notes 2023-08-24 11:49:03 +05:30
Dany Robert
89ddf3272e fix(regional): item wise tax calc issue 2023-08-24 05:56:56 +00:00
s-aga-r
49be1190d9
Merge pull request #36786 from s-aga-r/SCR-QI 
feat: `Quality Inspection` for Subcontracting Receipt
 2023-08-24 11:06:51 +05:30
s-aga-r
8010a157b1 fix: use flt for qty and rate fields 2023-08-24 11:06:19 +05:30
Dany Robert
9e1b2c9f57 fix: item wise split up rounding 2023-08-24 05:02:14 +00:00
s-aga-r
f31eb74234 test: add test case for SCR Quality Inspection 2023-08-24 10:22:21 +05:30
s-aga-r
723563c167
fix: SCR return status (#36793) 2023-08-24 10:13:47 +05:30
Raffael Meyer
54ffe41b54
feat(MR): Project and Cost Center in Connections (#36794) 2023-08-24 10:12:18 +05:30
ruthra kumar
758ea7bfe1
Merge pull request #35330 from ruthra-kumar/cr_note_posts_gl_for_itself 
refactor: cr/dr note should be standalone even when created from another invoice
 2023-08-23 20:38:14 +05:30
Deepesh Garg
2ed73c17c3
Merge pull request #36720 from git-avc/lost_reason_opportunity 
fix: lost opportunity reason dialog don't appears
 2023-08-23 19:42:22 +05:30
Anand Baburajan
bb3bd02f53
chore: styling improvements for asset depr sch table (#36792) 
* chore: improve asset depr sch table

* chore: fix text color
 2023-08-23 19:22:25 +05:30
Anand Baburajan
56b26852f3
fix: use current asset depr schedule to make temp schedule (#36783) 
fix: use current depr schedule to make temp schedule
 2023-08-23 18:01:59 +05:30
ruthra kumar
60eee564bf refactor: Payment btn criteria for Cr/Dr notes 2023-08-23 17:58:15 +05:30
s-aga-r
c9ae9df902 fix(ux): increase Quality Inspection dialog width 2023-08-23 13:58:43 +05:30
s-aga-r
3fab6610cb feat: setup Quality Inspection for Subcontracting Receipt 
- SCR[docstatus=0, is_return=0] Create > Quality Inspection(s)
- Filters for Quality Inspection field in Subcontracting Receipt Items table
 2023-08-23 13:58:40 +05:30
s-aga-r
3fdcd33b92 feat: Quality Inspection in Subcontracting Receipt 2023-08-23 12:15:35 +05:30