ruthra kumar
0e517227ee
Merge pull request #36899 from ruthra-kumar/use_own_exchange_rate_on_references
...
fix: difference amount calculation logic in Payment Entry UI
2023-09-01 17:37:23 +05:30
Deepesh Garg
1e72a43a8e
Merge pull request #36889 from GursheenK/discount-accounting-multi-currency-gle
...
fix: fetch currency in discount accounting SI
2023-09-01 15:11:21 +05:30
Deepesh Garg
39b598e0ec
Merge pull request #36898 from rtdany10/company-ambiguous
...
fix: `company` is ambiguous
2023-09-01 14:28:34 +05:30
ruthra kumar
a7e0709ae8
fix: difference amount in UI should not be calculated
2023-09-01 12:18:55 +05:30
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
Deepesh Garg
2537f5674e
Merge pull request #36886 from GursheenK/sales-register-tax-accounts
...
fix: tax accounts in sales register
2023-08-31 15:53:39 +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
f032476a75
Merge pull request #36869 from RitvikSardana/develop-ritvik-ignore-perm-tree-doctype
2023-08-30 16:46:28 +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
25e78fb311
Merge pull request #36830 from ruthra-kumar/increase_test_coverage
...
test: Exchange Rate Revaluation functions and its impact on ledger
2023-08-27 15:09:25 +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
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
