ruthra kumar
dda4002da4
fix: typeerror on Payment Entry
...
(cherry picked from commit e9cf8937cd
2024-08-28 06:57:56 +00:00
ruthra kumar
23c5edaf08
Merge pull request #42788 from kurogeek/fix-share_transfer-amount-currency-symbol
...
fix: share_transfer amount currency symbol field
2024-08-28 10:05:19 +05:30
Raffael Meyer
35c10fa97f
Merge pull request #42671 from frappe/mergify/bp/version-14-hotfix/pr-42669
...
fix: german translations for incoterms (backport #42669 )
2024-08-27 16:54:22 +02:00
ruthra kumar
10025a2c8d
Merge pull request #42946 from frappe/mergify/bp/version-14-hotfix/pr-42923
...
fix: get amount with taxes and charges from payment entry (backport #42923 )
2024-08-27 17:39:22 +05:30
ruthra kumar
813b699d5e
Merge pull request #42948 from frappe/mergify/bp/version-14-hotfix/pr-42936
...
fix: remove unnecessary condition on 'voucher_no' (backport #42936 )
2024-08-27 17:09:06 +05:30
ruthra kumar
94b09bb836
Merge pull request #42945 from frappe/mergify/bp/version-14-hotfix/pr-42453
...
fix: Update get_amount to return currency precision grand total (backport #42453 )
2024-08-27 17:07:24 +05:30
ruthra kumar
ff14d72a46
fix: use of incorrect attribute
...
(cherry picked from commit fb32d2cafb
2024-08-27 11:05:50 +00:00
Syed Mujeer Hashmi
0c2d7f2d9a
fix: Update get_amount to return currency precision grand total
...
In case of multi-currency purchase invoice, we are getting the error "Total Payment Request amount cannot be greater than Purchase Invoice amount" because of rounding difference.
(cherry picked from commit 976abf7b3c
2024-08-27 16:31:56 +05:30
venkat102
094411f5f0
fix: get amount with taxes and charges from payment entry
...
(cherry picked from commit b3a901b631
2024-08-27 11:01:27 +00:00
mergify[bot]
c0b5f7c8eb
fix: same posting date and time, creation causing incorrect balance qty (backport #42904 ) ( #42919 )
...
* fix: same posting date and time, creation causing incorrect balance qty (#42904 )
fix: same posting date and time, creation causing incorrect balance quantity
(cherry picked from commit 27364b7e6brohitw1991@gmail.com >
2024-08-27 14:33:56 +05:30
mergify[bot]
73eab91631
fix: timeout while submitting stock entry (backport #42929 ) ( #42930 )
...
* fix: timeout while submitting stock entry (#42929 )
(cherry picked from commit ca2fde891erohitw1991@gmail.com >
2024-08-27 14:29:41 +05:30
mergify[bot]
2f4f2a8eec
fix: unsupported operand type(s) for *: 'float' and 'NoneType' (backport #42916 ) ( #42917 )
...
fix: unsupported operand type(s) for *: 'float' and 'NoneType' (#42916 )
(cherry picked from commit 10434742e9rohitw1991@gmail.com >
2024-08-27 09:30:01 +05:30
ruthra kumar
6a2210e46a
Merge pull request #42914 from frappe/mergify/bp/version-14-hotfix/pr-42887
...
fix: update dimesions in exchange_gain_loss jv based on base document (backport #42887 )
2024-08-26 17:56:18 +05:30
ljain112
820dcd79bb
fix: update dimesions in exchange_gain_loss jv based on base document
...
(cherry picked from commit 96df19149d
2024-08-26 12:01:01 +00:00
ruthra kumar
97205ce355
Merge pull request #42906 from frappe/mergify/bp/version-14-hotfix/pr-42905
...
refactor: better err msg on clearance tool (backport #42905 )
2024-08-26 16:34:06 +05:30
ruthra kumar
8207b12f11
Merge pull request #42911 from frappe/mergify/bp/version-14-hotfix/pr-42910
...
feat: utility report to better diagnose incorrectly cleared Cheques and Deposits (backport #42910 )
2024-08-26 16:32:41 +05:30
ruthra kumar
09946c7ea7
refactor: build dictionary for Journal
...
remove redundant filter
(cherry picked from commit 2144e0337d
2024-08-26 10:11:09 +00:00
ruthra kumar
15aeec8a2d
chore: remove redundant column
...
(cherry picked from commit 74b36db24e
2024-08-26 10:11:09 +00:00
ruthra kumar
29fe7bea6d
refactor: build dict for payment entry
...
(cherry picked from commit 784dec24c8
2024-08-26 10:11:09 +00:00
ruthra kumar
c58987ba38
refactor: working state with minimum functions
...
(cherry picked from commit 4cd023444a
2024-08-26 10:11:09 +00:00
ruthra kumar
ef93c96f43
refactor: barebones functions
...
(cherry picked from commit ceaa1be729
2024-08-26 10:11:08 +00:00
ruthra kumar
c29b95e306
feat: report to identify incorrectly cleared cheques
...
(cherry picked from commit 28890fa833
2024-08-26 10:11:08 +00:00
ruthra kumar
e6438b293d
chore: resolve conflict
2024-08-26 15:30:53 +05:30
ruthra kumar
18a75fef9a
refactor: better err msg on clearance tool
...
(cherry picked from commit 092411b54f
2024-08-26 08:55:01 +00:00
mergify[bot]
12d5e247c5
perf: data import for stock entries (backport #42711 ) ( #42903 )
...
* perf: data import for stock entries (#42711 )
(cherry picked from commit 1511280464rohitw1991@gmail.com >
2024-08-26 13:53:23 +05:30
Smit Vora
72cc42997b
Merge pull request #42891 from frappe/mergify/bp/version-14-hotfix/pr-42848
...
fix: do not copy date fields in opportunity doctype (backport #42848 )
2024-08-24 13:12:27 +05:30
Smit Vora
3a02800fbc
chore: resolve conflicts
2024-08-24 12:38:11 +05:30
ruthra kumar
6cf248578f
Merge pull request #42817 from frappe/mergify/bp/version-14-hotfix/pr-39481
...
fix: specify precision for net_amount (backport #39481 )
2024-08-24 07:53:43 +05:30
ljain112
5186872b9b
fix: do not copy date fields in opportunity doctype
...
(cherry picked from commit 74afa57a9f
2024-08-23 08:48:29 +00:00
rohitwaghchaure
54842ea0b3
fix: stock reco with incorrect serial numbers ( #42865 )
2024-08-22 19:33:44 +05:30
ruthra kumar
a95a0524d9
Merge pull request #42870 from frappe/mergify/bp/version-14-hotfix/pr-42867
...
fix: call 'process' directly instead of creating 'process_subscription' (backport #42867 )
2024-08-22 17:51:25 +05:30
ruthra kumar
dffd5f291d
Merge pull request #42868 from frappe/mergify/bp/version-14-hotfix/pr-42851
...
refactor: Allow equity type Account in Payment Entry for shareholders (backport #42851 )
2024-08-22 17:50:51 +05:30
ruthra kumar
164b417136
chore: resolve conflict
2024-08-22 17:34:31 +05:30
ruthra kumar
8412938442
fix: call 'process' directly instead of creating 'process_subscripti
...
reason: 'process' follows simple DB transaction model.
(cherry picked from commit b4d22c2936
2024-08-22 11:53:32 +00:00
ruthra kumar
30ad25d86c
refactor: filter shareholder on company
...
(cherry picked from commit 63ad9f4f86
2024-08-22 11:40:37 +00:00
ruthra kumar
651e853156
refactor: allow equity types on Payment Entry
...
(cherry picked from commit 6cbf98294a
2024-08-22 11:40:37 +00:00
ruthra kumar
c2fdef4d5b
refactor(test): update grand total
2024-08-21 17:36:11 +05:30
ruthra kumar
678f08898a
refactor(test): update tast case of rounding value
2024-08-21 15:26:47 +05:30
ruthra kumar
c5dedab304
chore: resolve conflicts
2024-08-19 13:53:29 +05:30
Dany Robert
cf34219c71
fix: specify precision for net_amount ( #39481 )
...
* fix: specify precision for net_amount
* fix: correct existing test to account for precision
* fix: rounding issue in test cases
* fix: optional grand total manipulation
* fix: use `grand_total_diff` for manipulation
* fix: patch to set default for grand total manipulation
* fix: wrong rounding assertion for USD
* fix: undefined this.frm error
* chore: linters
* fix: `net_amount` percision and method rename
* fix: missing frm reference
* chore: minor cleanups and depr message
* refactor: remove optional adjusting of grand total
(cherry picked from commit 50d56db0c2
2024-08-19 04:36:52 +00:00
ruthra kumar
752f93c630
Merge pull request #42793 from frappe/mergify/bp/version-14-hotfix/pr-42791
...
fix(patch): Use sql to update 'against_voucher' rather than reposting (backport #42791 )
2024-08-16 15:55:22 +05:30
ruthra kumar
d14e386e18
chore: resolve conflict
2024-08-16 15:34:48 +05:30
ruthra kumar
9f687eee4e
chore: update patches.txt
...
(cherry picked from commit 1721175a20
2024-08-16 10:02:34 +00:00
ruthra kumar
c98ab15a44
fix(patch): replace repost with direct sql to update 'against_voucher
...
(cherry picked from commit 13bb48434f
2024-08-16 10:02:33 +00:00
kurogeek
333c7577eb
fix: currency symbol on amount field suppose to show as Company's currency not as default company's currency
2024-08-16 13:52:54 +07:00
Nihantra C. Patel
54815b44e7
Merge pull request #42770 from frappe/mergify/bp/version-14-hotfix/pr-42769
...
fix: disable rename from warehouse (backport #42769 )
2024-08-14 17:15:39 +05:30
Nihantra C. Patel
ed568fb01d
fix: disable rename from warehouse
2024-08-14 16:35:34 +05:30
Nihantra C. Patel
a520d06c3f
fix: disable rename from warehouse
...
(cherry picked from commit c1812f74e8
2024-08-14 11:03:41 +00:00
ruthra kumar
695297b917
Merge pull request #42760 from frappe/mergify/bp/version-14-hotfix/pr-42720
...
fix: incorrect 'against_voucher' for Pos return with 'Update Outstanding for Self' disabled. (backport #42720 )
2024-08-14 12:27:13 +05:30
ruthra kumar
8882b85888
chore: resolve conflict
2024-08-14 12:04:30 +05:30
