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

36374 Commits

Author SHA1 Message Date
Anand Baburajan
4f0bb45a8b
chore: patch to correct asset values if je has workflow [dev] (#36914) 
chore: patch to correct asset values if je has workflow
 2023-09-02 18:31:32 +05:30
Deepesh Garg
2e7548462d
Merge pull request #36895 from blaggacao/fix-coa-dill-down-on-startup 
fix(startup): coa drill down
 2023-09-02 17:12:18 +05:30
Deepesh Garg
f3282b1bb3
Merge pull request #36908 from barredterra/unreconcile-bank-transaction 
fix: only show "Unreconcile" if reconciled
 2023-09-02 17:11:56 +05:30
Deepesh Garg
30aba9414c
Merge pull request #36900 from GursheenK/pcv-request-timeout 
fix: reduce threshold for background job in PCV
 2023-09-02 17:11:08 +05:30
ruthra kumar
79fa562004 test: extend test to cancellation 2023-09-02 14:43:25 +05:30
ruthra kumar
cb6da6ec59 test: deduplicate gain/loss JE on reconciling journals against inv 2023-09-02 13:29:33 +05:30
ruthra kumar
79c6f0165b fix: deduplicate gain/loss JE creation for journals as payment 2023-09-02 13:29:31 +05:30
RitvikSardana
e599f75a51
fix: account payable currency and value (#36859) 
* fix: account payable currency and value

* fix: added party_type and party in accounts payable report

* chore: code cleanup

* fix: customer group test case failure

* fix: added test case of the issue

* fix: filter toggle for party_type

* fix: filter toggle for party_type

* chore: fix typo

---------

Co-authored-by: ruthra kumar <ruthra@erpnext.com>
 2023-09-02 13:08:08 +05:30
s-aga-r
2d8363a983
feat: Serial and Batch reservation (#35946) 
* feat: add `Has Serial No` and `Has Batch No` fields in SRE

* chore: set `Has Serial No` and `Has Batch No` while creating SRE

* feat: add field `Reserved Serial and Batch` in SRE

* fix(ux): hide `Amend` button on cancelled SRE

* fix: add validation for SRE amended doc

* fix(ux): hide `Reserved Serial and Batch` Table for non-serial/batch item

* fix(ux): set `Display Depends On` for `Has Serial No` and `Has Batch No` in SRE

* fix(ux): make `serial_no` and `batch_no` fields read-only based on `has_serial_no` and `has_batch_no`

* chore: remove table `Serial and Batch Entry` fieldlabel

* fix(ux): set warehouse for new row

* fix(ux): make qty field read-only for serial item

* fix(ux): set rows qty to `1` before making the field read-only

* chore: add filters for serial no

* chore: add filters for batch no

* chore: don't show Serial NO if already selected

* chore: hide rate related fields

* feat: add field `Reservation Based On` in SRE

* chore: make `Reserved Qty` field editable in SCR

* chore: add method to get total reserved qty against a voucher

* fix: add validation for `Reserved Qty`

* fix: update SRE status and Voucher's Reserved Qty

* chore: enable `Track Changes` in SRE

* fix: add validation to prevent delivered SRE to get updated

* fix(ux): make fields `Reserved Qty` and `Reservation Based On` read-only for delivered SRE

* fix: consider voucher's delivered qty while calculating max reserved qty

* fix: add UOM validation for SRE Reserved Qty

* fix: SRE warehouse mismatch error in DN

* fix: auto cancel SRE on update if item is fully delivered for the SO

* fix: skip SRE creation for group warehouse

* feat: add `Set Warehouse` field in SO stock reservation dialog

* fix(ux): hide `Add Row` button in SO stock reservation dialog

* fix: group warehouse validation in SO

* fix(ux): don't show Batch No if already selected

* feat: add field `Auto Reserve Serial and Batch Nos` in `Stock Settings`

* refactor: SRE reserved qty validation

* feat: auto serial and batch reservation

* chore: add section for `Serial and Batch Reservation` in `Stock Settings`

* fix: make SRE sb_entries warehouse mandatory

* fix(ux): unreserved qty calculation

* fix: add validation for `Reserved Qty` against `Batch`

* refactor: combine `get_available_qty_to_reserve()` and `get_available_qty_to_reserve_batch()`

* fix: validate disabled batch

* fix: add validation to validate serial nos availability

* fix: update row qty if `Partial Reservation` is enabled

* fix: ignore reserved serial nos while getting available serial nos

* fix: add validation to prevent repeat batches

* fix(ux): add validation for duplicate Serial No

* fix: don't allow to update SRE with delivered stock

* fix: ignore reserved serial and batch if reservation based on is not Serial and Batch

* fix(ux): stock un-reservation confirmation before `Update Items`

* chore: return list instead os set

* feat: add field `Delivered Qty` in `Serial and Batch Entry`

* feat: option to get SO reserved stock in Delivery Note

* fix: ignore reserved batches while getting available batches

* chore: `conflicts`

* fix: incorrect available qty

* fix: 'str' object has no attribute 'nodes_'

* fix: `linter`

* fix(ux): hide `Get Items From > Stock Reservation` if Stock Reservation is disabled

* fix(ux): add `depends_on` for `Auto Reserve Serial and Batch Nos`

* fix(ux): hide Stock Reservation field description in submitted SO

* fix(ux): confirm before unreserve stock

* feat: option to create DN for reserved stock from SO

* fix: update delivered qty in SRE sb_entries

* fix: Delivery Note (Reserved Stock) based on Delivery Date

* fix(ux): SO `Update Items` confirmation on `Update` button click

* feat: add dialog box to select SRE to unreserve

* fix: `ZeroDivisionError` while saving the DN (Reserved Stock)

* fix: don't allow to create Pick List if stock is reserved against SO

* fix(ux): hide Create > Pick List button for SO with reserved stock

* refactor: map reserved stock by default in DN

* refactor: code cleanup and comments

* fix: don't allow Stock Reservation against SO having Pick List

* refactor: `create_stock_reservation_entries()`

* feat: add fields to hold Pick List ref in SRE

* feat: add field `Stock Reserved Qty` in Pick List Item

* feat: provision to reserve stock from Pick List against Sales Order

* fix: don't allow to update SRE if created against a Pick List

* fix(ux): confirm before unreserve stock in Pick List

* fix: don't allow to update Pick List having reserved stock

* fix: circular dependency while cancelling the DN created from Pick List with Reserved Stock

* chore: update `Max Reserve Qty` err msg to be more descriptive

* refactor: rename field `Reserve Stock on Sales Order Submission`

* fix: msg on partial reservation if disabled in stock settings

* chore: add field description for `Enable Stock Reservation`

* fix(test): `test_stock_reservation_against_sales_order`

* fix(test): `test_stock_reservation_against_sales_order`

* test: add test cases for serial and batch reservation

* fix: batch stock levels qty

* refactor: method `get_sre_reserved_qty_for_item_and_warehouse`

* feat: show `Reserved Stock` in item master stock levels

* feat: Reserved Stock Report

* fix(ux): SO stock reservation dialogs width

* refactor: get previous values from `_doc_before_save` instead of db

* fix(ux): make `Reservation Based On` read-only if created against Pick List

* feat: option to open `Reserved Stock` report from Sales Order

* fix(ux): Sales Order - Reserve and Unreserve dialog box

* fix: decrease SRE Delivered Qty on DN cancel

* fix(ux): hide `Unreserve` button once reserved stock is delivered

* chore: `linter`

* fix(test): `test_reserved_stock_report`

* test: add test case for DN cancellation

* chore: rename field `Auto Reserve Stock on Sales Order Submission`

* fix: `Insufficient Stock` error msg
 2023-09-02 11:02:24 +05:30
barredterra
91e574609f fix: only show "Unreconcile" if reconciled 2023-09-01 19:23:27 +02:00
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
Gursheen Anand
b6e6f2ef8d fix: reduce threshold for bg job fn 2023-09-01 12:36:40 +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
marination
480903e3f4 refactor: verbosity in get_linked_payments result 
- Easier to read field names like x["rank"] than x[0]
- It's hard to keep up with what the indices mean, thus reducing readability
 2023-08-31 21:05:40 +05:30
marination
a1ae4262c3 refactor: auto_reconcile_vouchers 
- Use `reconcile_vouchers` instead of re-implementing
- More clear result message. Consider partially reconciled transactions
 2023-08-31 20:34:37 +05:30
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
Gursheen Anand
060da2c5bc fix: remove report field db set 2023-08-29 16:16:50 +05:30
Ankush Menat
4856e11549 chore: update integrations workspace 2023-08-29 15:51:40 +05:30
Gursheen Anand
a006b66e45 test: auto email for ar report 2023-08-29 14:51:35 +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
Gursheen Anand
f07f4ce86f fix: generate pdf only when result exists 2023-08-28 17:14:15 +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
Gursheen Anand
5c2a949593 feat: add field for specifying pdf name 2023-08-28 13:11:28 +05:30
Gursheen Anand
0a9187ea42 fix: show letterhead and terms for AR pdf 2023-08-28 13:09:51 +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
ruthra kumar
e93b927051 chore: clean up stale code in reconciliation tool 2023-08-22 05:32:56 +05:30
ruthra kumar
991770ed4a fix: incorrect gl balance on AR summary rpt on multi company setup 2023-08-21 21:32:23 +05:30
ruthra kumar
a4ff76c920
Merge pull request #36727 from ruthra-kumar/fix_broken_advance_field_in_ar_summary_rpt 
fix: broken advance field in Accounts Receivable summary rpt
 2023-08-21 20:53:03 +05:30
ruthra kumar
d01f0f2e96 refactor: filter for journal entries 2023-08-21 20:50:34 +05:30
ruthra kumar
86bac2cf52 refactor: filter on advance payments 2023-08-21 20:50:34 +05:30
ruthra kumar
52f609e67a refactor: filter on cr/dr notes 2023-08-21 20:50:34 +05:30
ruthra kumar
e48f8139eb refactor: trigger on value change 2023-08-21 20:50:34 +05:30
ruthra kumar
7a381affce refactor: limit output to 50 in reconciliation tool 2023-08-21 20:50:32 +05:30
ruthra kumar
af52f21ece test: add test for receivable summary report 2023-08-21 17:56:50 +05:30
ruthra kumar
06f86ad5e0
Merge pull request #36728 from ruthra-kumar/fetch_gain_loss_in_ar_ap_report 
fix: include gain/loss journal in AR/AP reports
 2023-08-21 17:22:31 +05:30
Ankush Menat
86cac1e1d2
fix: add missing items labels back (#36737) 
[skip ci]
 2023-08-21 15:59:52 +05:30
s-aga-r
faf9f13215 feat: allow Update Items for Subcontracted PO not having SCO created 2023-08-21 15:58:11 +05:30
Smit Vora
c47adcfdd9 fix: advance in seperate account 2023-08-21 15:12:11 +05:30
s-aga-r
450949cadd
Merge pull request #36709 from s-aga-r/FIX-36695 
fix: don't throw if item does not have default BOM
 2023-08-21 14:43:03 +05:30
ruthra kumar
0dc5e5c430 refactor: use payment ledger to fetch advance amount 2023-08-21 09:19:38 +05:30
ruthra kumar
896b123fb1 fix: broken advance field in Accounts Receivable summary rpt 2023-08-20 21:17:27 +05:30
ruthra kumar
e3104f1898 fix: include gain/loss journal in AR/AP reports 2023-08-20 20:13:31 +05:30
Deepesh Garg
a7f921a557
Merge pull request #36666 from batonac/batonac-plaid-fixes 
fix: Plaid Integration status and categories
 2023-08-20 16:02:30 +05:30
Deepesh Garg
ddd929ef9b
Merge pull request #36696 from RitvikSardana/develop-ritvik-pos-mode-of-payment 
fix: mode of payment fetched from pos profile company in POS
 2023-08-20 15:37:15 +05:30
mergify[bot]
87d02511a3
fix: timeout error coming during reposting (backport #36715) (#36717) 
fix: timeout error coming during reposting (#36715)

(cherry picked from commit 620b21fec59e40178fde96085003d419804f21e0)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-08-19 15:37:33 +05:30
avc
f10a93f6ee
fix: lost reason opportunity dialog don't appears 
Fix #36719
 2023-08-18 17:33:37 +02:00
ruthra kumar
a34cb8a8dc
Merge pull request #36710 from ruthra-kumar/fix_broken_consolidated_financial_report 
fix: broken consolidated report due to finance book filter
 2023-08-18 14:54:03 +05:30
ruthra kumar
96847db0ec fix: broken consolidated report due to finance book filter 2023-08-18 14:04:46 +05:30
Gursheen Kaur Anand
6a7b45f689
Merge branch 'develop' into view-projects-in-customer-portal 2023-08-18 13:32:08 +05:30
s-aga-r
2e22b019a0 fix: throw if BOM No is not set 2023-08-18 13:24:49 +05:30
Gursheen Anand
e8f6c286d1 fix: remove portal menu items in pre-model sync patch 2023-08-18 13:21:37 +05:30
s-aga-r
268c19e745 fix: don't throw if item does not have default BOM 2023-08-18 13:14:53 +05:30
ruthra kumar
8f695123cd refactor: criteria for Credit Note Issued and Debit Note Issued 2023-08-18 10:13:48 +05:30
Deepesh Garg
21e6db2bc7
Merge pull request #36060 from rtdany10/skip_tcs 
fix: skip tax witholding category if not account set for company
 2023-08-17 20:56:37 +05:30
Ritvik Sardana
1bdd43d0f6 fix: mode of payment fetched from pos profile company in POS 2023-08-17 17:29:01 +05:30
Deepesh Garg
c70abaa43a
Merge pull request #36684 from deepeshgarg007/gl_transaction_currency 
feat: Transaction currency columns in GL report
 2023-08-17 16:06:23 +05:30
rohitwaghchaure
3f6ff8e0b7
perf: enabled indexing for voucher no in SABB (#36688) 2023-08-17 13:48:37 +05:30
Shariq Ansari
5d9dde92fa
Merge pull request #36685 from shariquerik/api-fix 2023-08-17 13:09:14 +05:30
Ankush Menat
6bf79f18c8 chore: skip demo banner if another one present 2023-08-17 12:37:29 +05:30
Shariq Ansari
21c1141fdb
chore: linter fix 2023-08-17 12:14:13 +05:30
Raffael Meyer
552bbb1d46
fix(RFQ): make "update password" and "submit quotation" buttons the same size (#36667) 
fix(RFQ): button styling
 2023-08-17 12:04:05 +05:30
Shariq Ansari
7ec6909159 fix: check tax and charges if it is passed 2023-08-17 11:59:47 +05:30
Deepesh Garg
35be3ac5a1 feat: Transaction currency columns in GL report 2023-08-17 11:31:40 +05:30
Deepesh Garg
98adfb4c9a
Merge pull request #36492 from RitvikSardana/develop-ritvik-POS-runtime-effect 
fix: POS runtime effect
 2023-08-17 10:54:48 +05:30
ruthra kumar
3345165206
Merge pull request #36649 from ruthra-kumar/perf_latest_details_only_pulled_for_linked_vouchers 
perf: pull latest details only for referenced vouchers
 2023-08-17 09:00:29 +05:30
Deepesh Garg
124c0dbd88 fix(UX): Ignore prepared report 2023-08-16 19:10:39 +05:30
Gursheen Anand
d119d2ec32 fix: delete doc without filters 2023-08-16 17:35:07 +05:30
ruthra kumar
f6e4ac2b62 refactor(test): payments to invoice with -ve outstanding 2023-08-16 16:19:53 +05:30
Gursheen Anand
c071523e35 fix: delete portal settings for education doctypes 2023-08-16 12:23:10 +05:30
Ritvik Sardana
0d95fc0f20 fix: test_serial_no_case_1 test case works 2023-08-16 11:41:24 +05:30
Kevin Shenk
43f530b077
fix: Plaid Integration status and categories 
"pending" is a boolean not a string, and "category" doesn't exist in some edge cases
 2023-08-15 13:34:59 -04:00
ruthra kumar
924911e743
Merge pull request #36663 from ruthra-kumar/readd_permissions_in_journal 
fix: re-add permission that was unintentionally removed
 2023-08-15 17:06:24 +05:30
ruthra kumar
45662fa646 fix: re-add permission that was unintentionally removed 
Remove `Reversal OF ITC` and re-add permissions. Both of them
unintended changes
 2023-08-15 16:23:47 +05:30
Anand Baburajan
e0c79d3b53
chore: add validation for depreciation expense account in asset category (#36659) 2023-08-15 10:17:15 +00:00
Deepesh Garg
1e07f6eef9
fix(demo): More exception handling on demo data generation (#36652) 2023-08-15 10:45:36 +05:30
Gughan Ravikumar
cdf100d552
fix: Naming Series preview when no previous transaction present 2023-08-15 09:38:29 +05:30
ruthra kumar
0e2fb1188a refactor(test): ledger entries will be against itself 2023-08-15 09:03:02 +05:30
Babuuu
89e89de961
Fix tax amount in customer portal (#36453) 
The net total is the value that is currently being displayed instead of the tax amount.
 2023-08-15 08:54:06 +05:30
ruthra kumar
d77b0295fa
Merge pull request #36642 from ruthra-kumar/toggle_for_negative_rates 
refactor: toggle for negative item rates in Selling Settings
 2023-08-15 08:12:10 +05:30
ruthra kumar
a0fc68538f refactor: toggle for negative rates in Selling Settings 2023-08-15 07:34:33 +05:30
ruthra kumar
deb0d71294 perf: pull latest details only for referenced vouchers 2023-08-15 05:26:26 +05:30
Kevin Shenk
7ab55b1bb2
fix: Document Name link validation in Bank Reconciliation Tool (#36495) 
fix: format_row broke Document Name link validation

#35540 broke Voucher Matching, leading to an invalid link exception on submission. This is because the format_row() function overwrites the row data instead of just providing a formatter on the DataTable column, and therefore passes through the formatted (linked) column data instead of the Document Name only.

This patch moves the appropriate frappe.form.formatters.Link function to a dedicated format hook on the DataTable columns definition, both fixing the error and retaining the functionality of #35540.
 2023-08-14 19:03:01 +05:30
abdosaeed95
670d9e5556
fix: validate loyalty_amount against rounded_total instead of grand_total (#36466) 2023-08-14 18:54:01 +05:30
HarryPaulo
843e77e72d
fix: standard formula to calculate the "difference" (#36612) 2023-08-14 18:51:30 +05:30
Deepesh Garg
985ff9781b
fix: Tax withholding post LDC limit consumed (#36611) 
* fix: Tax withholding post LDC limit consumed

* fix: LDC condition check
 2023-08-14 18:19:15 +05:30
Gursheen Kaur Anand
12a6f3b997
feat: add invoice totals in tax withholding report (#36567) 
* fix: add invoice totals in tax withholding report

* fix: naming series col in tax withholding report

* fix: tds computation summary cols
 2023-08-14 18:15:47 +05:30
mergify[bot]
1ff80fcbee
fix: Button Alignment center in hero slider (backport #36607) (#36638) 
fix: Button Alignment center in hero slider (#36607)

fix: speling in CSS (Button alignment center is not working on hero slider)#36561
(cherry picked from commit b131f70ed6a8e3b763d59106084440e08a73b815)

Co-authored-by: ViralKansodiya <141210323+viralkansodiya@users.noreply.github.com>
 2023-08-14 16:25:38 +05:30
Ankush Menat
8b57979e9c
fix: clear demo data with unknown columns (#36637) 2023-08-14 08:46:48 +00:00
ViralKansodiya
75652799cd
feat: Tick on checkbox to include draft timesheets (#36577) 
feat: Tick on Check box to include Draft Timesheets
 2023-08-14 14:14:49 +05:30
Ankush Menat
e023e33a15
fix(demo): drop parent item group (#36636) 
This is translated according to user language, so "All Item Groups" might not
exist on site.

The code already finds root item group without doing anything.

towards https://github.com/frappe/erpnext/issues/36635
 2023-08-14 13:46:16 +05:30
Ritvik Sardana
d4cc9daca1 chore: code clean up 2023-08-14 11:52:49 +05:30
Ritvik Sardana
68df3f9729 fix: get_items call improved 2023-08-14 11:44:47 +05:30
Deepesh Garg
fbb5058531
fix: AR/AP report based on payment terms (#36574) 
* fix: AR/AP report based on payment terms

* fix: AR/AP report based on payment terms
 2023-08-14 08:32:07 +05:30
Deepesh Garg
39ec11200e
fix(demo): Item creation with India Compliance app (#36627) 2023-08-13 18:33:09 +05:30
ruthra kumar
b30c1e1abf refactor(test): return invoice will have -ve outstanding 2023-08-13 15:52:45 +05:30
ruthra kumar
00878707ae refactor: remove return_against for cr/dr note filter 2023-08-13 15:52:42 +05:30
ruthra kumar
db76e8a277 refactor: cr notes will post for itself 2023-08-13 15:30:17 +05:30
RitvikSardana
ae2c600223
fix: POS compatible for mobile view (#36534) 
* fix: POS compatable for mobile view

* fix: variables for margin and font size, and dark mode compatibility while selecting any item from cart

---------

Co-authored-by: Ritvik Sardana <ritviksardana@Ritviks-MacBook-Air.local>
 2023-08-13 13:27:43 +05:30
Naufal Afif
ce25f9e8c9
fix: wrong currency on financial-statement based reports (#36524) 
* add missing field options on financial_statement Total field

* format financial statement code
 2023-08-13 13:26:56 +05:30
ruthra kumar
3c7702c53c
Merge pull request #36309 from ruthra-kumar/fix_incorrect_validation_on_partial_pay_for_so 
fix: allocation validation blocks partial payment for SO and PO
 2023-08-13 08:42:42 +05:30
s-aga-r
539cfd08f0
fix: fetch Stock UOM from Item if not set (#36606) 2023-08-12 22:42:01 +05:30
Ankush Menat
2d3fa8040c fix(UX): make demo button dismissable for session 2023-08-12 11:35:02 +05:30
Ankush Menat
6b464edf84 fix: dont render demo clear button if onboarding tour present 2023-08-12 11:35:02 +05:30
Deepesh Garg
f8e7bc08af
Merge pull request #36564 from deepeshgarg007/monthly_sales_update 
fix: Make default sales update frequency as monthly instead of each transaction
 2023-08-11 22:39:04 +05:30