Dany Robert
3e1065a561
fix: company is ambiguous
2023-09-01 04:58:59 +00:00
ruthra kumar
0d26f67be5
Merge pull request #36888 from ruthra-kumar/gain_loss_refactor_issue_01_patch_failed
...
fix: calcuate received/paid amount on exchange rate change in Payment Entry
2023-08-31 18:37:39 +05:30
ruthra kumar
64d835374b
fix: calcuate received/paid amount on rate change in PE
2023-08-31 17:58:26 +05:30
Gursheen Anand
112cfe6dfa
fix: fetch discount amount for gle in base currency
2023-08-31 17:08:51 +05:30
Gursheen Anand
d73daafe77
fix: tax accounts in sales register
2023-08-31 15:19:46 +05:30
Deepesh Garg
cd74c6c07f
Merge pull request #36881 from deepeshgarg007/patch_revert
...
chore: remove patch
2023-08-30 22:12:46 +05:30
Deepesh Garg
283c0a1c0f
chore: remove patch
2023-08-30 19:43:32 +05:30
Suraj Shetty
e92d4e9b4a
Merge branch 'develop' into develop-ritvik-ignore-perm-tree-doctype
2023-08-30 16:46:00 +05:30
Deepesh Garg
5e38109481
Merge pull request #36872 from deepeshgarg007/sales_purchase_register_query
...
fix: Sales/Purchase register showing duplicate records
2023-08-29 21:47:01 +05:30
Ankush Menat
e75b72ae2d
Merge pull request #36856 from frappe/desk_user
...
refactor!: Lower all perm to `Desk User`
2023-08-29 20:55:55 +05:30
Deepesh Garg
92e503f75b
fix: Sales/Purchase register showing duplicate records
2023-08-29 20:45:57 +05:30
rohitwaghchaure
dea802dc41
fix: added valuation field type (Float/Currency) in the filter ( #36866 )
2023-08-29 16:53:00 +05:30
Ankush Menat
4856e11549
chore: update integrations workspace
2023-08-29 15:51:40 +05:30
RitvikSardana
de433d8626
fix: added ignore_user_permissions to parent field of tree doctypes
2023-08-29 13:07:13 +05:30
Corentin Flr
5c4df3e0e3
fix: Setup flake8 to stop turning trailing commas into tuples ( #36850 )
2023-08-29 10:59:58 +05:30
Deepesh Garg
1c237f455e
fix(demo): COA fixes for Mexico country ( #36840 )
2023-08-29 10:50:12 +05:30
Gursheen Kaur Anand
26e8b8f959
fix: create entries for only PR items present in LCV ( #36852 )
...
* fix: check if item code exists in lcv before creating gle
* refactor: use qb to fetch lcv items
2023-08-29 09:03:31 +05:30
Ankush Menat
0d22fe02be
refactor!: Lower all perm to Desk User
2023-08-28 22:42:14 +05:30
ViralKansodiya
3a2933db4d
fix: error in report when data is not available to load chart in report ( #36842 )
2023-08-28 18:14:52 +05:30
s-aga-r
eb5c61be1e
Merge pull request #36811 from s-aga-r/SCR-SCRAP-ITEMS
...
feat: provision to add scrap items in Subcontracting Receipt
2023-08-28 17:11:00 +05:30
s-aga-r
9d330a13ed
fix: get Valuation Rate instead of BOM rate
2023-08-28 16:09:05 +05:30
s-aga-r
592c7b5ff1
fix: test cases
2023-08-28 15:32:08 +05:30
ruthra kumar
9895bc3246
Merge pull request #36844 from ruthra-kumar/validation_error_on_payment_entry
...
fix: allocation error on partial payment against sales order
2023-08-28 15:11:36 +05:30
ruthra kumar
2fdbe82835
test: assert rounded amount is calculated
2023-08-28 14:30:37 +05:30
ruthra kumar
67a0969b78
test: allocation err misfire on Sales Order
2023-08-28 14:21:21 +05:30
ruthra kumar
714b8289c1
fix: fetch rounded total while pulling reference details on SO
2023-08-28 14:01:12 +05:30
s-aga-r
91927f2ada
chore: woocommerce linter issue ( #36837 )
2023-08-28 00:21:51 +05:30
s-aga-r
ffcbcd7397
test: add test case for SCR scrap items
2023-08-28 00:12:19 +05:30
ruthra kumar
d40504b973
test: Exchange Rate Revaluation functions and its impact on ledger
2023-08-27 14:33:34 +05:30
L Mwangi
3f077479f4
fix: On woocommerce test ping issued during a webhook creation
...
fix: On woocommerce test ping issued during a webhook creation
2023-08-26 19:45:55 +05:30
Abdo
6b75c03f34
chore: translate currency ( #36777 )
...
chore: translate currency
2023-08-26 19:37:28 +05:30
mergify[bot]
35f72a17db
Allow to make return against sales invoice which has closed sales order. ( #36676 )
...
fix: Allow to make return against sales invoice which has closed sales order
fix: Allow to make return against sales invoice which has closed sales order
(cherry picked from commit 0f98cc85e9dce00fa333474cfb438f243503df81)
Co-authored-by: Gourav Saini <63018500+gouravsaini021@users.noreply.github.com>
2023-08-26 19:29:33 +05:30
avc
fa2e5d5ab7
fix: create portal user for customer from shopping cart ( #36745 )
...
fix: create portal user for customer from shopping cart
2023-08-26 18:27:42 +05:30
Dany Robert
9bc5952dd5
fix: missing company flag for regional fn ( #36791 )
...
* fix: missing company flag for regional fn
2023-08-26 18:14:40 +05:30
mergify[bot]
740fe95ff3
fix: error list index out of range when saving a production plan
...
fix: error list index out of range when saving a production plan (#36807 )
2023-08-26 18:13:16 +05:30
s-aga-r
afd7d59c73
fix: AttributeError while saving subcontracting order
2023-08-26 13:10:47 +05:30
rohitwaghchaure
d4218a88ad
chore: fixed bom creator linter issue ( #36827 )
2023-08-26 12:54:13 +05:30
s-aga-r
27d56461c5
Merge branch 'develop' into SCR-SCRAP-ITEMS
2023-08-26 12:07:58 +05:30
s-aga-r
ed4f498704
feat: allow scrap items when backflush based on is Material Transfer
2023-08-26 11:38:45 +05:30
s-aga-r
08bc33689c
fix(ux): make Get Scrap Items button hidden for submitted and cancelled doc
2023-08-26 10:57:49 +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
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
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
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
s-aga-r
5b62bbe073
Merge pull request #36752 from s-aga-r/FR-35157
...
feat: `Update Items` for Subcontract Purchase Order
2023-08-23 11:13:28 +05:30
ruthra kumar
bf6bf79ae3
Merge pull request #36650 from ruthra-kumar/refactor_payment_reconcliation_ui
...
perf: improve responsiveness of payment reconciliation tool
2023-08-23 09:12:36 +05:30
Deepesh Garg
53926b0620
Merge pull request #36758 from RitvikSardana/develop-ritvik-ap-currency
...
fix: Accounts Payable Currency bug
2023-08-22 22:27:54 +05:30
mergify[bot]
a77e9d36cc
fix: Procurement Tracker report not showing material request items (backport #36768 ) ( #36774 )
...
fix: Procurement Tracker report not showing material request items (#36768 )
(cherry picked from commit 6a9935c00e502a28fa976c963a218f7e11b891ec)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-08-22 22:09:45 +05:30
s-aga-r
305d39f6a1
test: add test case for Subcontract PO update items
2023-08-22 18:24:30 +05:30
mergify[bot]
611c2bf775
fix: not able to make stock entry (backport #36759 ) ( #36767 )
...
fix: not able to make stock entry (#36759 )
(cherry picked from commit 873ee384a1f0832faf84015167f7bdc697f1dc46)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-08-22 17:36:56 +05:30
s-aga-r
b9b1717e96
fix: re-validate PO while updating items
2023-08-22 16:53:54 +05:30
s-aga-r
9588bb7443
fix: validate FG Item and Qty
2023-08-22 16:29:14 +05:30
Anand Baburajan
87e2309e8e
fix: avoid duplicate asset activity entries on asset capitalization ( #36756 )
2023-08-22 15:30:04 +05:30
RitvikSardana
9349bc77c5
fix: Accounts Payable Currency bug
2023-08-22 14:12:42 +05:30
Raffael Meyer
9d29ec8eac
fix: attachments should be an empty list by default ( #36757 )
...
fix: attachments should be an empty list by default
2023-08-22 13:35:12 +05:30
Anand Baburajan
8f04945cef
fix: incorrect schedule in asset value adjustment ( #36747 )
2023-08-22 12:36:09 +05:30
Raffael Meyer
4b75b6f309
feat(RFQ): optionally send document print ( #36363 )
2023-08-22 12:26:01 +05:30
ruthra kumar
3fd2778ae4
Merge pull request #36748 from ruthra-kumar/clean_up_reconcilition
...
chore: clean up stale code in reconciliation tool
2023-08-22 06:19:52 +05:30
