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
469a97ddd2
Merge branch 'fix_asset_sold_status' of https://github.com/AnandBaburajan/erpnext into fix_asset_sold_status
2022-09-29 08:55:30 +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
Anand Baburajan
b3c4305fa2
Merge branch 'develop' into fix_asset_sold_status
2022-09-28 21:36:43 +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
9743add40e
Merge pull request #32406 from s-aga-r/fix/stock-entry/supplied-items
...
fix: supplied items added twice in Stock Entry
2022-09-28 17:50:16 +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
Nabin Hait
dde8b2afff
Merge pull request #32226 from AnandBaburajan/fix_asset_scrap_and_sale_dep
...
fix: calculate depreciation properly on asset sale entry and scrap entry
2022-09-28 14:28:52 +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
Saqib Ansari
d5359bbdc2
Merge pull request #32379 from maharshivpatel/fix-pos-validate-qty-if-is_stock_item
...
fix(pos): validate available quantity only if stock item
2022-09-28 12:00:03 +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
rohitwaghchaure
f95de1fd4d
Merge pull request #32377 from s-aga-r/fix/work-order/finish-button
...
fix: consider overproduction percentage for WO finish button
2022-09-27 17:44:41 +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
rohitwaghchaure
c917d716f7
Merge pull request #32370 from rohitwaghchaure/fixed-allow-expied-batch-return-using-pr-pi
...
fix: Not allowing to return expired batches using purchase return
2022-09-27 14:20:40 +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
