Sagar Sharma
|
81a57e4e41
|
Merge branch 'develop' into stock-reservation
|
2023-05-13 09:44:06 +05:30 |
|
Sagar Sharma
|
9b617cc062
|
Merge branch 'develop' into PACKING-SLIP-FOR-DN-PACKED-ITEMS
|
2023-05-13 09:43:54 +05:30 |
|
Sagar Sharma
|
e17eeec619
|
Merge branch 'develop' into FIX-ISS-23-24-00368
|
2023-05-13 09:43:44 +05:30 |
|
Sagar Sharma
|
59f9d41756
|
Merge pull request #35275 from s-aga-r/FIX-35272
fix: add missing options for `Content Align`
|
2023-05-13 09:34:45 +05:30 |
|
Sagar Sharma
|
88ab075b11
|
Merge branch 'develop' into FIX-35272
|
2023-05-13 09:33:25 +05:30 |
|
rohitwaghchaure
|
e7bb6ad31c
|
Merge pull request #35224 from rohitwaghchaure/fixed-inventory-dimension-for-material-transfer-not-working
fix: inventory dimension for material transfer not working
|
2023-05-13 02:15:18 +05:30 |
|
Rohit Waghchaure
|
6798b900ef
|
fix: inventory dimension for material transfer not working
|
2023-05-13 01:44:06 +05:30 |
|
Sagar Sharma
|
4aff3c9a50
|
Merge branch 'develop' into FIX-35272
|
2023-05-12 15:06:47 +05:30 |
|
Sagar Sharma
|
d16caa2d2c
|
fix: add missing options for Content Align
|
2023-05-12 15:06:03 +05:30 |
|
rohitwaghchaure
|
0723fbc108
|
Merge pull request #35273 from rohitwaghchaure/fixed-incorrect-packing-list
fix: incorrect packing items
|
2023-05-12 14:42:57 +05:30 |
|
Rohit Waghchaure
|
a686b8c337
|
fix: incorrect packing items
|
2023-05-12 14:12:29 +05:30 |
|
rohitwaghchaure
|
46a2bd8986
|
Merge pull request #35268 from rohitwaghchaure/fixed-incorrect-bom-filter-issue
fix: BOM item filter issue
|
2023-05-12 13:09:57 +05:30 |
|
Rohit Waghchaure
|
2879cb7c28
|
fix: bom item filter issue
|
2023-05-12 13:08:37 +05:30 |
|
rohitwaghchaure
|
4aa1508f04
|
Merge pull request #35261 from rohitwaghchaure/fixed-timeout-error-for-stock-entry-more-than-6-mmoths
fix: enqueue submit/cancel action for stock entry to avoid time out error
|
2023-05-12 12:32:33 +05:30 |
|
Nabin Hait
|
ca8b587730
|
Merge pull request #35178 from nabinhait/account-closing-balance-patch
fix: account closing balance patch
|
2023-05-12 12:07:45 +05:30 |
|
Sagar Sharma
|
b22f9a234b
|
Merge branch 'develop' into FIX-ISS-23-24-00368
|
2023-05-12 11:55:12 +05:30 |
|
Sagar Sharma
|
9c72c2a6cb
|
refactor: use calculate_items_qty_and_amount() to update scr items rate
|
2023-05-12 11:50:27 +05:30 |
|
Sagar Sharma
|
d6433f803b
|
refactor(minor): rename function to be more descriptive
|
2023-05-12 11:45:33 +05:30 |
|
Sagar Sharma
|
46c1bef446
|
Merge branch 'develop' into PACKING-SLIP-FOR-DN-PACKED-ITEMS
|
2023-05-12 11:06:00 +05:30 |
|
Rohit Waghchaure
|
2d6f112727
|
fix: test case
|
2023-05-12 10:51:14 +05:30 |
|
Rohit Waghchaure
|
7a3801578c
|
fix: enqueue submit/cancel action for stock entry to avoid time out error
|
2023-05-11 23:20:12 +05:30 |
|
Nabin Hait
|
f5cc41e182
|
fix: account closing balance patch
|
2023-05-10 16:41:47 +05:30 |
|
Ankush Menat
|
2ea38333f0
|
refactor: use job_id instead of job_name (#35242)
depends on https://github.com/frappe/frappe/pull/20951
|
2023-05-10 13:26:10 +05:30 |
|
rohitwaghchaure
|
5d43b35d20
|
Merge pull request #35230 from rohitwaghchaure/fixed-serial-no-issue-stock-reco
fix: Changed type of column 'serial_no' in Stock Reconciliation to fix Data too Long error
|
2023-05-09 19:54:24 +05:30 |
|
rohitwaghchaure
|
bf29ec4341
|
Merge pull request #35227 from rohitwaghchaure/fixed-do-not-include-manufacturing-item
fix: non manufacturing items/fixed asset items in BOM
|
2023-05-09 18:47:36 +05:30 |
|
Rohit Waghchaure
|
1a673fd424
|
fix: Changed type of column 'serial_no' in Stock Reconciliation to fix Data too long error
|
2023-05-09 18:45:19 +05:30 |
|
ruthra kumar
|
b8971c7add
|
Merge pull request #35216 from rtdany10/broken-empty-row-save
fix: broken save on empty row existance
|
2023-05-09 18:31:17 +05:30 |
|
Rohit Waghchaure
|
aba8431d70
|
fix: non manufacturing items/fixed asset items in BOM
|
2023-05-09 16:48:30 +05:30 |
|
rohitwaghchaure
|
d5f123f2e1
|
Merge pull request #35220 from rohitwaghchaure/fixed-performance-issue-for-ste-mr
fix: added search index to improve performance
|
2023-05-09 14:33:56 +05:30 |
|
Rohit Waghchaure
|
80ea22b56c
|
fix: added search index to improve performance
|
2023-05-09 12:42:17 +05:30 |
|
ruthra kumar
|
afe9d7614b
|
Merge pull request #35212 from ruthra-kumar/chore_change_throw_to_msgprint
chore: convert throw to msgprint in payment reconciliation job hook
|
2023-05-08 17:57:13 +05:30 |
|
Dany Robert
|
d9b231aa16
|
fix: broken save on empty row existance
|
2023-05-08 12:26:47 +00:00 |
|
Anand Baburajan
|
67f3304ab4
|
fix: handle empty FBs properly in TB and GL [develop] (#35190)
fix: handle empty FBs properly in TB and GL
|
2023-05-08 16:55:05 +05:30 |
|
Anand Baburajan
|
5a3acab110
|
fix: handle empty FBs properly in TB and GL [develop] (#35190)
fix: handle empty FBs properly in TB and GL
|
2023-05-08 16:54:00 +05:30 |
|
Sagar Sharma
|
12785101d9
|
Merge branch 'develop' into stock-reservation
|
2023-05-08 16:47:40 +05:30 |
|
Sagar Sharma
|
2e9278ef90
|
Merge branch 'develop' into PACKING-SLIP-FOR-DN-PACKED-ITEMS
|
2023-05-08 16:47:30 +05:30 |
|
ruthra kumar
|
73134d57bf
|
chore: convert throw to msgprint
|
2023-05-08 16:42:12 +05:30 |
|
ruthra kumar
|
446f3d12eb
|
Merge pull request #35153 from ruthra-kumar/fetch_sales_team_from_customer_master
fix: fetch default sales team on Quotation -> Sales Order creation
|
2023-05-08 14:19:28 +05:30 |
|
ruthra kumar
|
6315d9f836
|
Merge pull request #35142 from ruthra-kumar/fix_bypass_check_in_customer_group
fix: ineffective bypass flag for Credit Limit in Customer Group
|
2023-05-08 14:10:31 +05:30 |
|
ruthra kumar
|
34a5f24026
|
Merge pull request #35186 from ruthra-kumar/child_account_should_inherit_parent_account_currency
fix: child acc will inherit acc currency if explicitly specified
|
2023-05-08 14:09:46 +05:30 |
|
ruthra kumar
|
f6ea8fd8d7
|
test: currency inheritance on child accounts
|
2023-05-08 13:30:39 +05:30 |
|
rohitwaghchaure
|
ecc80a8504
|
Merge pull request #34998 from Vishnu7025/develop
fix: update workstation hour rate when workstation change in job card
|
2023-05-08 09:25:38 +05:30 |
|
rohitwaghchaure
|
328c3369a2
|
Merge pull request #35200 from rohitwaghchaure/fixed-accepted-warehouse-and-supplier-warehouse-issue
fix: error regarding accepted and supplier warehouse
|
2023-05-08 09:23:54 +05:30 |
|
rohitwaghchaure
|
457f7f941c
|
Merge pull request #35196 from rohitwaghchaure/fixed-order-of-reposting-entry
fix: pick the in progress reposting entries first
|
2023-05-08 09:23:34 +05:30 |
|
Rohit Waghchaure
|
15f5f98858
|
fix: error regarding accepted and supplier warehouse
|
2023-05-07 20:27:17 +05:30 |
|
rohitwaghchaure
|
530edaf3d1
|
Merge branch 'develop' into develop
|
2023-05-07 19:58:42 +05:30 |
|
rohitwaghchaure
|
40e3747b93
|
Merge branch 'develop' into fixed-order-of-reposting-entry
|
2023-05-07 01:39:23 +05:30 |
|
rohitwaghchaure
|
c3ca5d0894
|
Merge pull request #35197 from rohitwaghchaure/fix-incorrect-fg-item-qty-in-job-po
fix: incorrect fg item quantity in subcontracted PO
|
2023-05-07 01:38:43 +05:30 |
|
Ritwik Puri
|
140cec8eb2
|
Merge branch 'develop' into fix-incorrect-fg-item-qty-in-job-po
|
2023-05-06 22:49:09 +05:30 |
|
Rohit Waghchaure
|
af16fbb0a3
|
fix: incorrect fg item quantity in subcontracted PO
|
2023-05-06 20:30:53 +05:30 |
|