Sagar Sharma
d2755c0106
Merge branch 'develop' into fix/github-issue/32559
2022-10-12 13:28:35 +05:30
Rohan
43037d893d
fix: type-cast while saving an item ( #32549 )
2022-10-12 13:07:58 +05:30
Sagar Sharma
7da32c7db3
fix: Brand Defaults filters
2022-10-12 12:15:07 +05:30
Sagar Sharma
16aef53470
Merge branch 'develop' into refactor/stock/reports
2022-10-12 00:38:40 +05:30
Sagar Sharma
a161048a9d
Merge branch 'develop' into refactor/buying/reports
2022-10-12 00:38:37 +05:30
Deepesh Garg
38b34f2a45
Merge pull request #32408 from nabinhait/sales-purchase-tab-break
...
feat: Tab Breaks in all Sales and Purchase cycle transactions
2022-10-11 16:02:45 +05:30
Deepesh Garg
df2a0e265b
chore: GL Entries for SLE diff
2022-10-11 14:55:09 +05:30
Deepesh Garg
dc20b21fb5
test: Internal tranfer precision loss test
2022-10-11 14:54:27 +05:30
Deepesh Garg
b31c3bd35d
chore: Increase incoming_rate field precision to 6
2022-10-11 14:53:26 +05:30
ruthra kumar
633c2a289e
Merge pull request #32557 from ruthra-kumar/value_error_on_pos_save
...
fix: Value error on validation of POS invoices with Serial Nos
2022-10-11 14:42:47 +05:30
Nabin Hait
e71c417f7e
fix: minor cleanup
2022-10-11 13:21:27 +05:30
Nabin Hait
5389a35798
fix: more fields reordering related to Tab Break
2022-10-11 13:21:07 +05:30
Nabin Hait
aaf3c2b329
feat: Tab Break in Purchase Invoice
2022-10-11 13:20:41 +05:30
Nabin Hait
35f836c4b7
feat: Tab Break in Purchase Receipt
2022-10-11 13:18:21 +05:30
Nabin Hait
3d9263bf86
feat: Tab Break in Supplier Quotation
2022-10-11 13:18:21 +05:30
Nabin Hait
2172c5034a
feat: Tab Break in Material Request
2022-10-11 13:18:21 +05:30
Nabin Hait
10a25603ac
feat: Tab Break in Purchase Order
2022-10-11 13:18:21 +05:30
Nabin Hait
7546562139
feat: Tab Break in Quotation
2022-10-11 13:18:21 +05:30
Nabin Hait
f6613e1e4c
feat: Tab Break in Sales Order, Delivery Note, Sales Invoice and Purchase Order
2022-10-11 13:18:21 +05:30
ruthra kumar
9e2bd10d03
test: value error on serial no validation on pos
2022-10-11 12:54:50 +05:30
Deepesh Garg
dddbc130db
Merge branch 'develop' of https://github.com/frappe/erpnext into internal_transfer_precision_fixes
2022-10-11 12:54:11 +05:30
ruthra kumar
4b908ebcd6
fix: value error on pos submit
2022-10-11 11:21:11 +05:30
Deepesh Garg
b99b2b75ca
Merge pull request #32477 from rasos/patch-1
...
Austria chart of accounts update
2022-10-11 10:20:49 +05:30
Anand Baburajan
ba754825b9
Merge branch 'develop' into fix_budget_autoname
2022-10-10 23:17:18 +05:30
anandbaburajan
e4d7d8c42d
fix: use naming_series in budget
2022-10-10 23:04:34 +05:30
codezart
2d30b36cca
fix: number of months subscription plan
2022-10-10 11:24:42 -04:00
ruthra kumar
65194efa97
Merge pull request #32548 from ruthra-kumar/suppress_linked_doc_valdiation_on_delete
...
fix: allow deletion of cancelled Invoices once payments are unlinked
2022-10-10 16:41:07 +05:30
ruthra kumar
143f905838
test: update ple on payment unlink for SI's and SO's
2022-10-10 15:57:38 +05:30
Deepesh Garg
a14c5dbcc4
Merge branch 'develop' of https://github.com/frappe/erpnext into internal_transfer_precision_fixes
2022-10-10 15:08:15 +05:30
rohitwaghchaure
be1ebd348b
Merge pull request #32497 from s-aga-r/fix/quality-inspection/status
...
chore: set `Quality Inspection` status based on readings status
2022-10-10 10:49:56 +05:30
ruthra kumar
537d953f4c
fix: unlink payment on invoice cancellation
2022-10-10 10:17:19 +05:30
Deepesh Garg
d806e32030
fix: PO cancel post advance payment cancel against PO
2022-10-08 21:25:11 +05:30
Deepesh Garg
4b828dd276
Merge branch 'develop' of https://github.com/frappe/erpnext into loan_schedule_types
2022-10-08 18:41:39 +05:30
Sagar Sharma
60befcd8a8
Merge branch 'develop' into fix/quality-inspection/status
2022-10-08 13:34:21 +05:30
Sagar Sharma
4992e4a2b8
fix(test): test_rejected_qi_validation
2022-10-08 13:33:36 +05:30
Sagar Sharma
fcc1272d42
test: add test cases for Quality Inspection status
2022-10-08 13:33:36 +05:30
Sagar Sharma
2657ece2cd
fix: set Quality Inspection status based on readings status
2022-10-08 13:33:22 +05:30
Sagar Sharma
ce20b05ed0
Merge branch 'develop' into refactor/buying/reports
2022-10-08 10:48:03 +05:30
Sagar Sharma
e78a706994
refactor: rewrite Procurement Tracker Report queries in QB
2022-10-08 10:47:10 +05:30
rohitwaghchaure
73a9791401
Merge branch 'develop' into provision-to-return-components
2022-10-07 23:50:05 +05:30
Rohit Waghchaure
d59ed24e6c
feat: provision to return non consumed components against the work order
2022-10-07 22:45:53 +05:30
Sagar Sharma
a14b9c7bac
refactor: rewrite Supplier Quotation Comparison Report queries in QB
2022-10-07 18:07:53 +05:30
Sagar Sharma
a5b3f8cae9
refactor: rewrite Purchase Order Analysis Report queries in QB
2022-10-07 17:30:01 +05:30
Deepesh Garg
17201facf1
Merge pull request #32522 from deepeshgarg007/tax_withholding_related_fixes
...
fix: Tax withholding related fixes
2022-10-07 16:32:18 +05:30
Deepesh Garg
781d160c68
fix: Do not add tax withheld vouchers post tax withheding in one document
2022-10-07 14:22:40 +05:30
Deepesh Garg
abf5b6be3e
fix: Tax withholding related fixes
2022-10-07 14:04:36 +05:30
Sagar Sharma
f0f2413932
Merge branch 'develop' into refactor/stock/reports
2022-10-07 09:59:56 +05:30
Sagar Sharma
8103856a41
refactor: rewrite Warehouse wise Item Balance Age and Value Report queries in QB
2022-10-07 09:59:35 +05:30
Sagar Sharma
7c759b193c
refactor: rewrite Total Stock Summary Report queries in QB
2022-10-07 09:59:28 +05:30
Sagar Sharma
d7c3b7633a
fix: make readings status mandatory in Quality Inspection
2022-10-06 22:36:37 +05:30
Ankush Menat
8376fbc982
fix: Explicitly update modified ( #32519 )
...
* fix: Explicitly update modified
required after https://github.com/frappe/frappe/pull/18301
* chore: fix broken translations
2022-10-06 20:35:33 +05:30
Sagar Sharma
d3c073dc25
refactor: rewrite Supplier-Wise Sales Analytics Report queries in QB
2022-10-06 17:42:31 +05:30
Sagar Sharma
c18f13a45b
refactor: rewrite Stock Projected Qty Report queries in QB
2022-10-06 17:04:50 +05:30
Ankush Menat
07c4a74838
chore: drop stale demo page ( #32515 )
2022-10-06 13:01:53 +05:30
Ankush Menat
8d1db0ea3d
fix: single column indexes ( #32425 )
...
refactor: move single column indexes to doctypes
2022-10-06 11:28:26 +05:30
HENRY Florian
0e4017cbe5
chore: update fr translation ( #32385 )
2022-10-05 18:19:44 +05:30
Deepesh Garg
0235901614
Merge pull request #32478 from rtdany10/patch-23
...
feat(JE): trigger account field when fetched from template
2022-10-05 16:07:59 +05:30
Deepesh Garg
fbdd1f39e7
Merge pull request #32499 from rohitwaghchaure/fixed-TooManyWritesError-for-reposting
...
fix: TooManyWritesError during reposting of stock
2022-10-05 16:05:12 +05:30
Deepesh Garg
777ed10e21
Merge pull request #32491 from ruthra-kumar/performance_issue_on_migrate_remarks_patch
...
refactor: remove duplicate entries on remarks migration patch
2022-10-05 16:04:23 +05:30
Rohit Waghchaure
aaabba9b1e
fix: TooManyWritesError during reposting of stock
2022-10-05 10:58:21 +05:30
Sagar Sharma
39707757a6
chore: add Manual Inspection field in Quality Inspection DocType
2022-10-04 23:16:16 +05:30
Dany Robert
74505a116f
Merge branch 'develop' into patch-23
2022-10-04 17:17:30 +05:30
ruthra kumar
518ab93e03
refactor: remove duplicate entries on remarks migration patch
2022-10-04 12:39:34 +05:30
Summayya Hashmani
da43a5e371
refactor(UI): clean up portal pages ( #29018 )
...
* refactor: list view for portal pages
* refactor: add align center class
* refactor: change footer btn class(primary)
* refactor: add order style page
* refactor: import order page in website
* refactor: remove table elements
* fix: preview image height
* fix: make string translatable
* refactor: change font variables
* refactor: order preview bg white
* refactor: center align items
* fix: breadcrumb padding
* refactor: make preview image rounded
* refactor: add condition for image container
* refactor: change alignment for mobile view
* fix: make footer button secondary
* refactor: clean code
* refactor: code indentantion
* refactor: remove space
* fix: Payment section cleanup
Co-authored-by: Summayya <frappe@Summayyas-MacBook-Air.local>
Co-authored-by: Marica <maricadsouza221197@gmail.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
2022-10-04 09:57:07 +05:30
Dany Robert
c35adcf5a1
feat(JE): trigger account field when fetched from template
...
Closes #32409
2022-10-03 19:31:20 +05:30
Roland
7d84cca431
Austria chart of accounts update
...
improved mapping of VAT accounts
2022-10-03 14:13:27 +02:00
niralisatapara
e758a753f8
Item Wise TDS Calculation
...
For calculating Item wise TDS in Purchase Invoice.
2022-10-03 16:39:35 +05:30
Sagar Sharma
e295d0c091
Merge branch 'develop' into fix/pick-list/picked-qty
2022-10-03 14:20:05 +05:30
Sagar Sharma
ba02209f1d
fix: pick list picked-qty for batch item
2022-10-03 14:12:42 +05:30
rohitwaghchaure
1c5ae80029
Merge pull request #32466 from rohitwaghchaure/allow-to-return-expired-batches
...
fix: not able to return sold expired batches
2022-10-03 13:14:59 +05:30
Deepesh Garg
8c23b19da1
Merge pull request #32394 from maharshivpatel/fix-payment-request-fetch-swift-number
...
fix: fetch swift number in payment request from bank doctype
2022-10-03 12:55:02 +05:30
Rohit Waghchaure
0b1727cf79
fix: not able to return sold expired batches
2022-10-03 12:06:32 +05:30
Shridhar Patil
69efd2ee24
fix: fixes query builder order by issue in postgres ( #32441 )
...
* fix: fixes query builder order by issue in postgres
* fix: linter
2022-10-03 11:07:24 +05:30
Dany Robert
91055151ce
fix: (bulk transaction) key error and better error logging ( #32445 )
...
* fix: (bulk transaction) key error and better error logging
* chore: pre-commit
* chore: linter - missing comma
2022-10-03 10:59:53 +05:30
Muvuk
73e5a7d671
fix: update with new Frappe color. fix #32455 ( #32456 )
...
* Update with new Frappe color.
* refactor: use css variables
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
2022-10-02 22:30:36 +05:30
Deepesh Garg
601880f1ce
Merge pull request #32454 from AnandBaburajan/fix_test_scrap_asset
...
fix: test_scrap_asset not working on end of month
2022-10-02 17:44:46 +05:30
Deepesh Garg
28772bc9a4
Merge pull request #32405 from AnandBaburajan/fix_asset_sold_status
...
fix: status of assets with maintenance_required changing back to 'Partially Depreciated' some time after being sold
2022-10-02 17:41:31 +05:30
Anand Baburajan
04f9e7fa73
Merge branch 'develop' into fix_test_scrap_asset
2022-10-01 17:12:24 +05:30
anandbaburajan
47bd4be71b
fix: test_scrap_asset
2022-10-01 17:04:22 +05:30
Deepesh Garg
1c560a967c
Merge branch 'develop' into fix-payment-request-fetch-swift-number
2022-10-01 16:14:27 +05:30
Maharshi Patel
62c5b28690
fix: typo in sales_register's filter mode_of_payment ( #32371 )
...
* fix: typo in sales_register's filter mode_of_payment
2022-10-01 11:04:53 +05:30
Sagar Sharma
e71b25107d
Merge branch 'develop' into purchase-order/item/fg-item
2022-09-30 19:10:07 +05:30
Sagar Sharma
128c4bb7cb
Merge branch 'develop' into purchase-order/item/fg-item
2022-09-30 17:06:35 +05:30
Sagar Sharma
f95ed7dca2
fix: add non-stock item filter for fg_item in PO
2022-09-30 17:05:16 +05:30
Sagar Sharma
1f4e4db50d
Merge branch 'develop' into fix/item/update-stock
2022-09-30 16:55:26 +05:30
Sagar Sharma
ca2958a999
Merge branch 'develop' into fix/item/update-stock
2022-09-30 16:36:46 +05:30
Maharshi Patel
dc8d49260c
fix: payment request make bank field Link instead of Read Only
2022-09-30 16:22:57 +05:30
Sagar Sharma
eedaf9cd26
Merge branch 'develop' into fix/scr/non-stock-item
2022-09-30 16:19:23 +05:30
Sagar Sharma
fa2290657a
fix: add validation for non-stock item in SCR
2022-09-30 16:18:15 +05:30
Deepesh Garg
cceb29c005
Merge pull request #32412 from deepeshgarg007/tcs_deduction_issue
...
fix: Incorrect TCS amount deducted in Sales Invoice
2022-09-30 16:05:30 +05:30
Deepesh Garg
a79d074436
Merge pull request #32368 from ruthra-kumar/remove_code_for_buying_side_discount_accounting
...
chore: remove discount accounting logic from PI and PI Item
2022-09-30 15:58:35 +05:30
Deepesh Garg
429303bbb7
Merge pull request #32402 from deepeshgarg007/item_dashboard_create_new
...
fix: Item details fetching on making transaction from item dashboard
2022-09-30 15:56:32 +05:30
Nabin Hait
fe891aa488
fix: Create accounting dimension fields in asset capitalization
2022-09-30 15:55:41 +05:30
Maharshi Patel
9245d3b5cd
Revert "fix: fetch swift_number in payment_request"
...
This reverts commit f42a8e4e03
2022-09-30 15:35:12 +05:30
Deepesh Garg
bf7a51791a
chore: label post save
2022-09-30 15:29:07 +05:30
Sagar Sharma
6d0842465b
fix: don't allow to update Maintain Stock if the item has a BOM
2022-09-30 15:18:10 +05:30
Deepesh Garg
679b5ed551
chore: Add patch to update repayment schedule type in loan documents
2022-09-30 14:06:06 +05:30
Sagar Sharma
b1edd911f9
Merge branch 'develop' into remove_code_for_buying_side_discount_accounting
2022-09-30 12:39:29 +05:30
Sagar Sharma
774097bd10
Merge branch 'develop' into item_dashboard_create_new
2022-09-30 12:37:58 +05:30
Deepesh Garg
2ddee50f27
chore: Update labels as per repayment type
2022-09-30 10:39:45 +05:30
Deepesh Garg
3466461eb3
chore: Remove print statements
2022-09-30 10:19:58 +05:30
Deepesh Garg
76c6ccab5d
feat: Repayment schedule types for term loans
2022-09-30 10:13:17 +05:30
anandbaburajan
eadcd8e614
Merge branch 'fix_asset_sold_status' of https://github.com/AnandBaburajan/erpnext into fix_asset_sold_status
2022-09-29 15:34:48 +05:30
anandbaburajan
28952eda87
chore: remove unused function
2022-09-29 15:33:45 +05:30
Anand Baburajan
990514ae6d
Merge branch 'develop' into fix_asset_sold_status
2022-09-29 15:32:37 +05:30
anandbaburajan
f1169fb213
chore: refactor by just using a filter
2022-09-29 15:32:01 +05:30
Sagar Sharma
ffef659782
Merge branch 'develop' into fix/supplier-portal/make-pi-btn
2022-09-29 14:54:29 +05:30
rohitwaghchaure
10b7592d14
Merge pull request #32414 from rohitwaghchaure/consider-searchfields-as-per-customize-form
...
fix: searchfields as per customize form not working for Item
2022-09-29 14:51:55 +05:30
Rohit Waghchaure
3656f7d06f
test: added test case
2022-09-29 14:01:51 +05:30
anandbaburajan
0b3b4c99e6
Merge branch 'develop' of https://github.com/frappe/erpnext into fix_asset_sold_status
2022-09-29 08:55:00 +05:30
anandbaburajan
b734f9d237
chore: refactor by creating is_sold
2022-09-29 08:54:35 +05:30
Rohit Waghchaure
fd889fd29a
fix: searchfields as per customize form not working for Item
2022-09-28 23:00:45 +05:30
Deepesh Garg
369a343fb2
Merge pull request #32363 from ernestoruiz89/patch-7
...
fix: add translate function to strings in www/book appoinment
2022-09-28 20:15:05 +05:30
Deepesh Garg
bff3cd9068
chore: Remove print statements
2022-09-28 20:13:24 +05:30
Deepesh Garg
08443c6421
fix: Incorrect TCS amount deducted in Sales Invoice
2022-09-28 20:11:00 +05:30
Deepesh Garg
84ab5d45fd
Merge pull request #32403 from deepeshgarg007/loan_type_patch_fix
...
fix: Disbursement Account in patch to update old loans
2022-09-28 19:35:42 +05:30
Anand Baburajan
d4242de699
Merge branch 'develop' into fix_asset_sold_status
2022-09-28 18:20:46 +05:30
anandbaburajan
f4bf9c672f
chore: rewrite query using frappe.qb
2022-09-28 18:20:20 +05:30
Sagar Sharma
a145d1065a
Merge branch 'develop' into fix/stock-entry/supplied-items
2022-09-28 16:55:57 +05:30
Sagar Sharma
ac7409bbf3
fix: supplied items added twice in Stock Entry
2022-09-28 16:46:48 +05:30
Anand Baburajan
0618f606b2
Merge branch 'develop' into fix_asset_sold_status
2022-09-28 16:42:21 +05:30
anandbaburajan
a8dd3c3a7c
chore: adding missing asset statuses
2022-09-28 16:39:14 +05:30
anandbaburajan
1725672168
chore: adding missing asset statuses
2022-09-28 16:22:35 +05:30
anandbaburajan
f9f68005a5
fix: asset requiring maintenance sold status
2022-09-28 16:21:31 +05:30
Sagar Sharma
e63e017d20
Merge branch 'develop' into fix/supplier-portal/make-pi-btn
2022-09-28 15:46:52 +05:30
Sagar Sharma
80080a3d7b
fix: show Make Purchase Invoice button based on permission
2022-09-28 15:40:07 +05:30
Deepesh Garg
be623ce8e8
fix: Disbursement Account in patch to update old loans
2022-09-28 15:36:59 +05:30
Deepesh Garg
0439e41a44
fix: Item details fetching on making transaction from item dashboard
2022-09-28 14:54:53 +05:30
Maharshi Patel
f42a8e4e03
fix: fetch swift_number in payment_request
...
There isn't direct link between payment_request and bank so swift_number wasn't fetched using Fetch form. I fixed it by fetching swift_number on_change of bank_account.
2022-09-28 12:54:00 +05:30
Anand Baburajan
c1e3498a2a
Merge branch 'develop' into fix_asset_scrap_and_sale_dep
2022-09-28 12:18:38 +05:30
Deepesh Garg
0c869251ce
Merge branch 'develop' into fix_asset_scrap_and_sale_dep
2022-09-28 08:38:52 +05:30
Maharshi Patel
d850b0adb1
Merge branch 'develop' into fix-pos-validate-qty-if-is_stock_item
2022-09-27 23:45:50 +05:30
Maharshi Patel
e392ea1104
fix: POS properly validate stock for bundle products
...
Stock availability was not calculated properly for Product Bundle with non stock item so i have added logic to properly calculate that as well.
2022-09-27 23:44:56 +05:30
Deepesh Garg
dbe4fdc73d
Merge pull request #32382 from deepeshgarg007/subscription_process
...
fix: Move subscription process to hourly long queue
2022-09-27 23:39:12 +05:30
Deepesh Garg
4c8617e1bb
Merge pull request #32378 from deepeshgarg007/add_index_return_against
...
fix: Add return against indexes for POS Invoice
2022-09-27 22:22:03 +05:30
Deepesh Garg
82a2f31ada
fix: Move subscription process to hourly long quque
2022-09-27 22:12:32 +05:30
Anand Baburajan
cf72931816
Merge branch 'develop' into fix_asset_scrap_and_sale_dep
2022-09-27 20:43:53 +05:30
anandbaburajan
c6a7de0e54
chore: add blank lines
2022-09-27 20:43:08 +05:30
anandbaburajan
14e2d31619
test: adding test_asset_with_maintenance_required_status_after_sale
2022-09-27 20:19:01 +05:30
Deepesh Garg
cbfe28286a
fix: Add return against indexes for POS Invoice
2022-09-27 16:22:59 +05:30
Nabin Hait
6145013f30
Merge branch 'develop' into fix_asset_scrap_and_sale_dep
2022-09-27 15:56:39 +05:30
Maharshi Patel
e39e088f18
fix: POS only validate QTY if is_stock_item
...
POS invoice raised " Item not available " validation error even though item is non_stock.
2022-09-27 15:44:38 +05:30
Deepesh Garg
1f6205e1ea
fix: Add return against indexes for POS Invoice
2022-09-27 15:37:41 +05:30
Sagar Sharma
376febb9d1
Merge branch 'develop' into fix/work-order/finish-button
2022-09-27 15:36:15 +05:30
Maharshi Patel
c760ca2323
fix: Scrap Asset Accounting Dimensions ( #31949 )
...
* fix: Scrap Asset Accounting Dimensions
2022-09-27 15:31:36 +05:30
Sagar Sharma
05392e0918
fix: consider overproduction percentage for WO finish button
2022-09-27 15:30:08 +05:30
Rohit Waghchaure
a4a86ee23f
fix: allow to return expired batches using purchase return
2022-09-27 13:55:27 +05:30
Sagar Sharma
9049db41ae
fix: For Quantity error msg in Stock Entry
2022-09-27 12:00:50 +05:30
ruthra kumar
21095502b9
chore: clean up purchase invoice and purchase invoice item
...
1. remove discount accounting related fields from purchase invoice and
purchase invoice item
2. clean buying settings doctype
2022-09-27 11:10:41 +05:30
Deepesh Garg
ce80b9fa0e
Merge branch 'develop' of https://github.com/frappe/erpnext into internal_transfer_precision_fixes
2022-09-26 21:16:25 +05:30
Deepesh Garg
6e47fd54a0
fix: Hanlde rounding loss for internal transfer
2022-09-26 21:15:57 +05:30
rohitwaghchaure
106ee1bf4d
Merge pull request #32339 from rohitwaghchaure/fixed-opening-entry-trial-balance-issue
...
fix: opening entry causing discrepancy between stock and trial balance
2022-09-26 20:32:41 +05:30
rohitwaghchaure
6a67cc96d0
Merge pull request #32049 from djpalshikar/patch-1
...
Allow Item Templates in Work Order Items
2022-09-26 20:27:33 +05:30
Ernesto Ruiz
499ce5139c
fix: add translate function to book appointment verify html
2022-09-26 08:04:14 -06:00
Ernesto Ruiz
728ef46048
fix: add translate function to book appointment index.js
2022-09-26 08:01:48 -06:00
Ernesto Ruiz
e683cccf35
fix: add translate function to book appointment html
2022-09-26 07:59:13 -06:00
Sagar Sharma
e312d17eae
refactor: rewrite Item Prices Report queries in QB
2022-09-26 17:50:17 +05:30
hendrik
f41d1500b0
fix: report chart field type
...
* fix: report chart field type
Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
2022-09-26 17:47:24 +05:30
Sagar Sharma
afb323b01c
Merge branch 'develop' into refactor/stock/report/incorrect-stock-value
2022-09-26 17:09:22 +05:30
Sagar Sharma
9a1fa53791
Merge branch 'develop' into refactor/stock/report/item-price-stock-report
2022-09-26 17:08:30 +05:30
Deepesh Garg
d84fd6c925
Merge pull request #32245 from pps190/feat_scan_sound
...
feat(stock): Audible indication of barcode scan status.
2022-09-26 17:02:37 +05:30
Deepesh Garg
9b38a372fb
Merge pull request #32262 from shashankshirke/develop
...
fix: broken link for item valuation updated
2022-09-26 16:59:36 +05:30
Deepesh Garg
389fa180c8
Merge pull request #32276 from ernestoruiz89/patch-4
...
fix: add some strings to translate function
2022-09-26 16:39:04 +05:30
Deepesh Garg
539f8550c7
Merge pull request #32336 from ernestoruiz89/patch-6
...
fix: typo on opportunity summary by sales stage report
2022-09-26 16:37:58 +05:30
ruthra kumar
8b21d27f04
Merge pull request #32310 from nishibakabeer/patch-4
...
fix: total value in all keys
2022-09-26 11:27:47 +05:30
nishibakabeer
6919f389aa
fix: total value in all keys
...
Gross and net profit report showing wrong values in monthly quarterly and half yearly filters which is the total value
@ruthra-kumar added in develop branch as suggested ( https://github.com/frappe/erpnext/pull/32020 )
2022-09-26 10:40:55 +05:30
ruthra kumar
b33fb26b84
Merge pull request #32303 from ruthra-kumar/fix_difference_amount_calculation_on_payment_reconciliation
...
fix: difference amount calculation and popup on payment reconciliation
2022-09-26 10:25:12 +05:30
Sagar Sharma
b93331e844
refactor: rewrite Incorrect Stock Value Report queries in QB
2022-09-26 09:44:29 +05:30
Sagar Sharma
22299d2382
refactor: rewrite Item Price Stock Report queries in QB
2022-09-26 09:40:49 +05:30
Sagar Sharma
bb59346651
refactor: rewrite Delayed Item Report queries in QB
2022-09-23 15:47:26 +05:30
Rohit Waghchaure
bc3ab45af2
fix: opening entry causing discepancy between stock and trial balance
2022-09-23 15:21:09 +05:30
Sagar Sharma
1c1f991d2f
refactor: rewrite Batch-Wise Balance History Report queries in QB
2022-09-23 14:57:44 +05:30
Sagar Sharma
2c9d9577e3
refactor: rewrite Batch Item Expiry Status Report queries in QB
2022-09-23 14:06:37 +05:30
Ernesto Ruiz
c4919cf5ec
fix: typo on opportunity summary by sales stage report
2022-09-22 15:42:46 -06:00
Sagar Sharma
729193aca8
Merge branch 'develop' into refactor/report/production-planning-report
2022-09-22 11:18:02 +05:30
Sagar Sharma
8417b9b99c
refactor: rewrite Production Planning Report queries in QB
2022-09-22 11:17:11 +05:30
rohitwaghchaure
d7e699ea1a
Merge pull request #32309 from rohitwaghchaure/fixed-item-code-key-error
...
fix: item_code key error in production plan
2022-09-21 15:27:43 +05:30
Rohit Waghchaure
caf23e6b8e
fix: item_code key error in production plan
2022-09-21 13:11:51 +05:30
Sagar Sharma
86c9ce9c20
Merge branch 'develop' into refactor/report/exponential-smoothing-forecasting
2022-09-21 10:25:47 +05:30
Sagar Sharma
1c0f1a2831
Merge branch 'develop' into refactor/report/exponential-smoothing-forecasting
2022-09-21 09:55:28 +05:30
Sagar Sharma
56f9c1b6f7
refactor: rewrite Exponential Smoothing Forecasting queries in QB
2022-09-21 09:54:38 +05:30
ruthra kumar
122d5f2729
fix: difference amount calculation on payment reconciliation
2022-09-21 08:36:09 +05:30
Sagar Sharma
d3a6881737
Merge branch 'develop' into refactor/report/bom-variance-report
2022-09-20 23:11:08 +05:30
Sagar Sharma
0048f58500
Merge branch 'develop' into refactor/report/bom-variance-report
2022-09-20 20:21:49 +05:30
Sagar Sharma
92e03e2c22
Merge branch 'develop' into refactor/report/bom-stock-report
2022-09-20 20:21:38 +05:30
ruthra kumar
6e65f01ede
Merge pull request #32296 from ruthra-kumar/amount_in_words_for_debit_note
...
fix: get amount in words for debit note
2022-09-20 18:09:33 +05:30
Sagar Sharma
19e64eb247
refactor: rewrite BOM Variance Report queries in QB
2022-09-20 17:56:47 +05:30
ruthra kumar
70f6484d9d
fix: get amount in words for debit note
2022-09-20 17:32:23 +05:30
Sagar Sharma
000c538d65
Merge branch 'develop' into refactor/report/bom-stock-report
2022-09-20 16:27:00 +05:30
Sagar Sharma
390ce5719d
fix: warehouse filter in BOM Stock Calculated Report
2022-09-20 16:25:20 +05:30
Sagar Sharma
8fd7c04920
refactor: rewrite BOM Stock Report queries in QB
2022-09-20 16:23:14 +05:30
Deepesh Garg
d4b01f6ffd
Merge branch 'develop' of https://github.com/frappe/erpnext into fix-remove-no-copy-for-ignore_pricing_rule
2022-09-20 14:58:48 +05:30
Nabin Hait
ecb5fff2ec
Merge pull request #32264 from deepeshgarg007/asset_depreciation_date
...
fix: Depreciation posting date only when calculate depreciation is checked
2022-09-20 14:48:03 +05:30
Deepesh Garg
ef7d7e7d71
Merge pull request #32204 from deepeshgarg007/pending_tds_vouchers
...
fix(UX): More predictable tax withholding application in invoices
2022-09-20 14:35:16 +05:30
Sagar Sharma
dad40b8d51
Merge branch 'develop' into refactor/report/item-shortage-report
2022-09-20 10:48:29 +05:30
Sagar Sharma
3dc754cac2
test: add test cases for Item Shortage Report
2022-09-20 10:48:05 +05:30
Sagar Sharma
f0a78aa559
refactor: rewrite Item Shortage Report queries in QB
2022-09-20 10:47:55 +05:30
Deepesh Garg
3d356763d0
Merge pull request #32217 from ruthra-kumar/bug_in_tax_on_multi_currency_payment_entry
...
fix: incorrect gl if tax on multi currency payment entry
2022-09-20 09:59:47 +05:30
Deepesh Garg
49538e81de
Merge pull request #32235 from maharshivpatel/fix-payment-schedule-description
...
fix: fetch description only if empty on the payment schedule
2022-09-20 09:13:43 +05:30
Deepesh Garg
1f4932966a
Merge branch 'develop' of https://github.com/frappe/erpnext into pending_tds_vouchers
2022-09-20 09:06:35 +05:30
Deepesh Garg
9aa1f84d45
chore: fix tests
2022-09-20 09:06:18 +05:30
Ernesto Ruiz
94199b7867
fix: add translate function to strings
2022-09-19 11:56:42 -06:00
Ernesto Ruiz
aa49ec815a
fix: add translate function to strings
2022-09-19 11:55:13 -06:00
Ernesto Ruiz
9decebe6e1
fix: Add strings to translate function
2022-09-19 10:13:30 -06:00
Sagar Sharma
a4db9abcb4
Merge branch 'develop' into fix/stock-entry/subcontract-order-item-reference
2022-09-19 18:52:27 +05:30
Sagar Sharma
3a9c08e7c9
fix: po_detail or sco_rm_detail not getting set while while mapping SE
2022-09-19 18:47:46 +05:30
Deepesh Garg
083309c056
fix: Incoming rate precision fixes for intra company transfer
2022-09-19 15:06:06 +05:30
ruthra kumar
efc9553561
Merge pull request #32251 from ruthra-kumar/set_default_supplier_currency_for_po_created_from_so
...
fix: use default supplier currency if default supplier is enabled
2022-09-19 12:44:51 +05:30
Deepesh Garg
fac82cf69b
fix: Depreciation posting date only when calculate depreciation is checked
2022-09-18 19:41:05 +05:30
Shashank Shirke
785eaf8e8f
fix: broken link for item valuation updated
...
Old URL (404 Not Found): https://docs.erpnext.com/docs/v13/user/manual/en/stock/item/item-valuation-fifo-and-moving-average
Updated URL: https://docs.erpnext.com/docs/v13/user/manual/en/stock/articles/calculation-of-valuation-rate-in-fifo-and-moving-average
2022-09-18 05:42:47 -07:00
Sagar Sharma
b747d9d05e
Merge branch 'develop' into fix/stock-entry/supplied-item-reference
2022-09-18 11:37:38 +05:30
Sagar Sharma
b90875575c
fix: make po_detail or sco_rm_detail mandatory for SE Send to Subcontractor
2022-09-18 11:37:07 +05:30
Deepesh Garg
110840aa98
Merge pull request #32244 from deepeshgarg007/project_po_linking
...
fix: Parent Level project linkning on creating PO from project
2022-09-17 20:29:40 +05:30
ruthra kumar
77fdc37cb7
fix: use default supplier currency if default supplier is enabled
2022-09-17 16:34:33 +05:30
Sagar Sharma
2f97370b8e
fix: sco_rm_detail in Stock Entry
2022-09-17 14:29:42 +05:30
rohitwaghchaure
3c01bf3a12
Merge pull request #32238 from rohitwaghchaure/fix-pricing-rules-issues
...
fix: suggestion threshold label and rule was not working for other item with min and max amount
2022-09-17 12:11:24 +05:30
Devin Slauenwhite
32e75ff808
feat: audible indication of scan status.
2022-09-16 17:58:01 -04:00
Devin Slauenwhite
613c8158a8
fix: actually reject process_scan when update_table fails.
2022-09-16 17:49:00 -04:00
Deepesh Garg
93e134aab0
fix: Parent Level project linkning on creating PO from project
2022-09-16 22:44:23 +05:30
Maharshi Patel
8c5b420aea
fix: remove no_copy for ignore_pricing_rule
2022-09-16 18:26:00 +05:30
Sagar Sharma
bd6af7c613
test: update test case for production plan pending-qty
2022-09-16 18:00:26 +05:30
ruthra kumar
5bd5dd7262
test: gl entries of payments with advance tax
2022-09-16 16:22:21 +05:30
Rohit Waghchaure
f5bd3fa952
fix: suggestion threshold label and rule was not working for other items with min and max amount
2022-09-16 16:03:08 +05:30
Sagar Sharma
5be7d42dfd
fix: production plan pending-qty
2022-09-16 14:39:39 +05:30
Maharshi Patel
f4b64686ae
fix: fetch description only if empty on the payment schedule
...
added fetch_if_empty on description field of payment_schedule.
2022-09-16 14:14:14 +05:30
Deepesh Garg
36d0906ea2
fix: TDS deduction via journal entry
2022-09-16 13:50:37 +05:30
ruthra kumar
f0ae77b23b
fix: incorrect gl if tax on multi currency payment entry
2022-09-16 12:40:40 +05:30
Deepesh Garg
0a6462e627
Merge branch 'develop' of https://github.com/frappe/erpnext into pending_tds_vouchers
2022-09-16 12:35:39 +05:30
Sagar Sharma
be0d9d8c13
Merge branch 'develop' into refactor/file/production_plan.py
2022-09-16 12:28:48 +05:30
Sagar Sharma
b8cf3b4c77
refactor: rewrite Production Plan queries in QB
2022-09-16 12:23:43 +05:30
Deepesh Garg
38d00f407e
Merge pull request #32225 from nabinhait/dunning-fix
...
fix: create dunning from sales invoice
2022-09-16 11:04:55 +05:30
Deepesh Garg
e4ef6c9645
Merge pull request #32219 from nabinhait/bank-clearnance-perm-issue
...
fix: No permission to read doctype
2022-09-16 11:04:42 +05:30
Nabin Hait
0286f2da78
Merge branch 'develop' into dunning-fix
2022-09-16 09:40:18 +05:30
Nabin Hait
a1fcabee0e
Merge pull request #32221 from rohitwaghchaure/consider-posting-time-for-internal-po
...
fix: consider posting time for internal transfer PO
2022-09-16 09:37:45 +05:30
anandbaburajan
43a3400221
fix: fix restore asset value after depreciation
2022-09-15 23:25:04 +05:30
anandbaburajan
5a8b28c194
fix: refactor asset capitilization
2022-09-15 22:52:25 +05:30
anandbaburajan
11ac20e5ee
fix: asset tests
2022-09-15 22:43:18 +05:30
Nabin Hait
786891c600
Merge branch 'develop' into bank-clearnance-perm-issue
2022-09-15 17:42:37 +05:30
Nabin Hait
0d732609f0
Merge branch 'develop' into consider-posting-time-for-internal-po
2022-09-15 17:42:26 +05:30
Nabin Hait
c5c6a69269
Merge branch 'develop' into cost-center-renaming
2022-09-15 17:42:13 +05:30
Nabin Hait
73f6c5fe35
Merge branch 'develop' into dunning-fix
2022-09-15 17:42:00 +05:30
anandbaburajan
ff5cad1cd6
fix: calculate depreciation properly on asset sale entry and scrap entry
2022-09-15 13:15:34 +05:30
Nabin Hait
29db084dc3
fix: create dunning from sales invoice
2022-09-15 13:11:53 +05:30
Nabin Hait
af21a11e1e
fix: abbreviation issue on renaming cost center
2022-09-15 12:09:18 +05:30
Rohit Waghchaure
cb763938dc
fix: consider posting time for internal transfer PO
2022-09-15 11:48:43 +05:30
Nabin Hait
c0da948a4e
fix: No permission to read doctype
2022-09-15 11:27:35 +05:30
Nabin Hait
3457105504
fix: test cases
2022-09-15 11:19:33 +05:30
Nabin Hait
a5b5885933
fix: test cases
2022-09-15 11:19:14 +05:30
Nabin Hait
cbf973d90f
fix: always set default expense account in company
2022-09-15 11:19:06 +05:30
Ankush Menat
97977cdb4b
fix: correct sql output format in CRM patch ( #32213 )
2022-09-14 19:19:05 +05:30
