rohitwaghchaure
8afbb06a33
Merge branch 'develop' into FIX-ISS-23-24-00368
2023-05-15 13:42:20 +05:30
Wolfram Schmidt
c236979508
fix: Update de.csv ( #35278 )
...
added many fixes on the base of 'No' which is often wrongly translated to 'Kein'.
Also removed translation of Naming Seris like ACC-INV-.YYYY.- to ACC-INV-.YYYY.-
2023-05-15 13:25:23 +05:30
Smit Vora
2a609616d9
fix: port option for additional_conditions in item wise sales register ( #35187 )
...
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
2023-05-15 13:24:39 +05:30
vishnu
f2ceb00379
fix: Creating landed cost voucher from connections
2023-05-14 09:35:38 +00:00
Indrajith.vs
0c8276ec82
fix: sales person allocated amount calculation error nonetype and float ( #35293 )
...
fix: sales person allocated amount calculation error nontype and float
2023-05-14 11:47:46 +05:30
Raffael Meyer
870b02b03c
fix: allow over-payment against SO ( #35079 )
2023-05-14 08:59:58 +05:30
Daizy Modi
19cd687784
fix: function batch_no should only be declared once ( #35115 )
...
fix: remove twice event call of `batch_no` to update batch qty
2023-05-14 08:56:25 +05:30
Kevin Shenk
26c5cfabdc
feat: copy project from timesheet to invoice ( #35146 )
...
copy project from timesheet to invoice
2023-05-14 08:49:28 +05:30
HarryPaulo
e12e3bb012
fix: allow search leads by doctype search fields
...
* fix: allow search leads by doctype search fields
* fix: allow search leads by doctype search fields, linters fix
2023-05-14 08:08:47 +05:30
Phanupong Janthapoon
2b59a95162
fix: share_transfer display wrong currency symbo
...
In multi-companies setting, on amount and rate field of Share Transfer
doctype are displaying wrong currency symbol, when create a
Share Transfer of others company that has different currency than
the main company. This due to the lack of `options` on those fields.
To fix this, add `options` to `amount` and `rate` fields.
2023-05-14 08:06:58 +05:30
Rohit Waghchaure
38aaba5720
fix: inventory dimension for inter company transfer return use case
2023-05-13 13:00:05 +05:30
Sagar Sharma
e17eeec619
Merge branch 'develop' into FIX-ISS-23-24-00368
2023-05-13 09:43:44 +05:30
Sagar Sharma
88ab075b11
Merge branch 'develop' into FIX-35272
2023-05-13 09:33:25 +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
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
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
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
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
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
Rohit Waghchaure
c8a4791d9b
fix: pick the in progress reposting entries first
2023-05-06 20:09:15 +05:30
Deepesh Garg
23e7c1480f
Merge pull request #34897 from barredterra/fix-translation-files
...
fix: translation files
2023-05-06 18:24:50 +05:30
ruthra kumar
abe691c03d
fix: child acc will inherit acc currency if explicitly specified
2023-05-06 10:40:41 +05:30
Hossein Yousefian
27d71e9ec1
Merge branch 'develop' into get_incoming_rate_v14_fix
2023-05-06 08:12:36 +03:30
Nabin Hait
713fa67b96
fix: account closing balance patch
2023-05-05 17:54:34 +05:30
Rohit Waghchaure
8167b24219
fix: not allow to transfer excess materials against the job card
2023-05-04 18:24:16 +05:30
rohitwaghchaure
3993bfd510
Merge pull request #35161 from rohitwaghchaure/configure-notify-reposting-role
...
feat: configuration to notify reposting errors to specific role
2023-05-04 17:35:14 +05:30
rohitwaghchaure
2bf771683c
Merge pull request #35158 from rohitwaghchaure/fixed-internal-trasfer-condition
...
fix: internal transfer condition
2023-05-04 17:01:58 +05:30
Rohit Waghchaure
c7b62011db
feat: configuration to notify reposting errors to specific role
2023-05-04 16:49:14 +05:30
Rohit Waghchaure
b5a2ccf21d
fix: internal transfer condition
2023-05-04 15:38:35 +05:30
Sagar Sharma
e0b22edb2e
test: add test case
2023-05-04 15:07:52 +05:30
ruthra kumar
4d31436917
fix: fetch default sales team on Quotation -> Sales Order creation
2023-05-04 10:45:22 +05:30
Raffael Meyer
9fd0091b60
Merge branch 'develop' into fix-translation-files
2023-05-04 00:26:01 +02:00
rohitwaghchaure
bea8f481b4
Merge pull request #35148 from rohitwaghchaure/fixed-extra-job-card-quantity-issue
...
fix: over production percentage not considered in validation
2023-05-04 00:13:53 +05:30
Rohit Waghchaure
a84d0af81e
fix: over production percentage not considered in validation
2023-05-03 23:22:59 +05:30
rohitwaghchaure
dfee45f7ae
Merge pull request #35144 from rohitwaghchaure/feat-reserved-qty-for-production-plan-in-bin
...
feat: reserve qty against production plan raw materials in BIN
2023-05-03 22:24:05 +05:30
Rohit Waghchaure
06e91e758f
feat: reserve qty against production plan raw materials in BIN
2023-05-03 18:21:23 +05:30
ruthra kumar
f9a4972cb6
fix: bypass flag in Customer Group wasn't effective
2023-05-03 16:40:38 +05:30
s-aga-r
a6cb6c6f47
fix: recalculate costs in SCR while reposting
2023-05-03 11:33:52 +05:30
Anand Baburajan
6864b11f83
fix: handle finance book properly in trial balance and general ledger ( #35085 )
...
* fix: get default fb properly and handle different fb and default fb case
* chore: minor UX improvement
* fix: handle FBs properly in general ledger
2023-05-02 20:58:22 +05:30
Vishnu VS
536473a484
Merge branch 'develop' into develop
2023-05-02 17:42:41 +05:30
ruthra kumar
7e24215b3a
Merge pull request #35107 from ruthra-kumar/fix_incorrect_paid_amount_if_bank_cash_account_missing
...
fix: incorrect paid_amount and exchange rate in Payment Entry
2023-05-02 15:07:36 +05:30
ruthra kumar
1d70183d8c
Merge pull request #35091 from ruthra-kumar/cost_center_allocation_splits_roundoff
...
refactor: button to toggle parent doc cost center preference for rounding adjustment amount
2023-05-02 14:07:22 +05:30
ruthra kumar
8f2302a7bf
Merge pull request #35061 from ruthra-kumar/refactor_pe_dont_book_gain_loss_for_sales_purchase_orders
...
refactor: don't book exchange gain/loss for sales/purchase orders
2023-05-02 14:03:17 +05:30
rohitwaghchaure
9aa646512a
Merge pull request #35123 from rohitwaghchaure/fixed-performance-issue-delivery-note
...
fix: timeout error while submitting delivery note
2023-05-01 23:30:14 +05:30
Rohit Waghchaure
2d5ccc07b1
fix: timeout error while submitting delivery note
2023-05-01 21:17:18 +05:30
rohitwaghchaure
a10aab35ff
Merge pull request #35118 from rohitwaghchaure/fixed-don-not-allow-to-repost-valuation
...
fix: don't allow to make reposting for the closed period
2023-05-01 20:41:14 +05:30
mergify[bot]
49674585a5
fix: handle expected_value_after_useful_life properly in asset value adjustment (backport #35117 ) ( #35119 )
...
fix: handle expected_value_after_useful_life properly in asset value adjustment (#35117 )
(cherry picked from commit 80230fec3ef079b75825447a61836f8a9ce64f57)
Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
2023-05-01 19:59:58 +05:30
Rohit Waghchaure
f751727149
fix: don't allow to make reposting for the closed period
2023-05-01 18:48:29 +05:30
ruthra kumar
ce4e18c8d2
test: Sales/Purchase Orders will not book Exchange gain/loss
2023-05-01 14:09:19 +05:30
ruthra kumar
effb34bbfa
refactor: don't book exch gain/loss for sales/purchase orders
2023-05-01 14:08:30 +05:30
Deepesh Garg
ea0b03ae9e
fix: Updates in process statement of Accounts ( #35064 )
2023-05-01 13:09:47 +05:30
Deepesh Garg
64be694087
fix: Patch for posting closing balances ( #35037 )
2023-05-01 10:56:46 +05:30
Deepesh Garg
f3b3dabb9a
fix: Naming series error in Journal Entry template ( #35084 )
2023-05-01 10:50:51 +05:30
ruthra kumar
123355392b
fix: incorrect paid_amount and exchange rate in PE
...
If Company master has no default cash or bank account set but Party has
default company bank account set. In this case, paid_amount and
conversion rate are not calculated correctly
2023-04-30 08:36:56 +05:30
Vishnu VS
9fd7a05b40
Merge branch 'develop' into develop
2023-04-29 21:02:54 +05:30
rohitwaghchaure
35ee8d19b0
Merge pull request #35092 from rohitwaghchaure/fixed-reserved-qty-issue-for-dn
...
fix: not able to create delivery note from sales order
2023-04-28 16:02:35 +05:30
Rohit Waghchaure
bdf2f7416a
fix: not able to create delivery note from sales order
2023-04-28 15:16:02 +05:30
ruthra kumar
4ccce93394
refactor: checkbox to toggle parent doc cost center preference
2023-04-28 14:20:50 +05:30
ruthra kumar
0f3b06cc8a
refactor: checkbox in Sales Invoice
2023-04-28 14:20:50 +05:30
ruthra kumar
ebe6787510
refactor: checkbox to toggle parent doc cost center preference
2023-04-28 14:20:48 +05:30
Vishnu VS
bb13c236b9
Merge branch 'develop' into develop
2023-04-28 14:06:12 +05:30
ruthra kumar
b44331c981
refactor: checkbox in purchase invoice
2023-04-28 14:06:04 +05:30
Vishnu VS
489f853ee2
Merge branch 'develop' into develop
2023-04-27 21:17:47 +05:30
Nihantra Patel
72dd7884a8
fix: Hyperlink in Quality Inspection Summary
2023-04-27 17:04:39 +05:30
Nihantra Patel
6dfca79af3
fix: Report link, option, and added a link for Sales Person in GP
2023-04-27 15:04:50 +05:30
Vishnu VS
06e458c745
Merge branch 'develop' into develop
2023-04-27 12:24:29 +05:30
rohitwaghchaure
01bfd2ab67
Merge pull request #35066 from rohitwaghchaure/fixed-delivered-qty-issue-while-making-mr
...
fix: don't create material request from sales order against delivered items
2023-04-27 09:05:36 +05:30
Rohit Waghchaure
1e2deee579
fix: don't create material request from sales order against the delivered items
2023-04-26 20:30:53 +05:30
