ruthra kumar
b43e068852
Merge pull request #35659 from ruthra-kumar/fix_attribute_error_in_payment_reconciliation
...
fix: attribute error on payment reconciliation tool
2023-06-13 10:16:26 +05:30
ruthra kumar
b672616617
Merge pull request #35620 from ruthra-kumar/err_higher_allowance_for_debit_credit_diff
...
fix: allow custom rounding loss allowance in Exchange Rate Revaluation
2023-06-13 09:46:08 +05:30
ruthra kumar
bada5796fa
fix: attribute error on payment reconciliation tool
2023-06-13 09:32:24 +05:30
rohitwaghchaure
4ee08b92ae
Merge pull request #35629 from rohitwaghchaure/fixed-process-loss-in-job-card
...
fix: added process loss in job card
2023-06-12 23:29:15 +05:30
ruthra kumar
96a0132501
fix: allow user to set rounding loss allowance for accounts balance
2023-06-12 22:05:08 +05:30
Ankush Menat
f957a84830
build!: update deps and drop setup.py
( #35653 )
2023-06-12 21:46:06 +05:30
rohitwaghchaure
64586187de
Merge branch 'develop' into fixed-process-loss-in-job-card
2023-06-12 21:39:29 +05:30
rohitwaghchaure
62011410b2
fix: test case PyPDF2 ( #35652 )
...
fix: test case
2023-06-12 19:22:55 +05:30
Ankush Menat
1e8ee9354a
fix(DX): Check Frappe and ERPNext major versions ( #35651 )
2023-06-12 19:20:52 +05:30
rohitwaghchaure
93fe923e2a
Merge branch 'develop' into fixed-process-loss-in-job-card
2023-06-12 19:04:19 +05:30
mergify[bot]
4f3d531f35
fix: don't set default payment amount in case of invoice return (backport #35645 ) ( #35647 )
...
fix: don't set default payment amount in case of invoice return (#35645 )
(cherry picked from commit 79483cc90eb71fa82d645b2cf54d9731502cf6c7)
Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
2023-06-12 18:43:26 +05:30
Sagar Sharma
f1e902be5c
Merge pull request #35646 from s-aga-r/FIX-ISS-23-24-01138-1
...
fix: Stock Reconciliation document update while reposting
2023-06-12 18:42:34 +05:30
s-aga-r
db159dd11f
fix: Stock Reconciliation document update while reposting
2023-06-12 18:28:16 +05:30
Rohit Waghchaure
0382eecff4
fix: test case
2023-06-12 18:20:38 +05:30
ruthra kumar
42f4f80e0c
fix: Payment against credit notes will be considered as payment against parent invoice in Accounts Receivable/Payable report ( #35642 )
...
* fix: payment against credit note should be linked to parent invoice
* test: AR/AP report for payment against cr note scenario
* fix: cr_note shows up as outstanding invoice
Payment made against cr_note causes it be reported as outstanding invoice
2023-06-12 17:35:13 +05:30
Deepesh Garg
2f24546b21
fix: Make difference entry button not working ( #35622 )
2023-06-12 15:20:28 +05:30
s-aga-r
c9923e4996
fix: 'NoneType' object has no attribute 'precision'
2023-06-12 12:33:13 +05:30
s-aga-r
c6acb0d200
fix: DocType not found
2023-06-12 12:33:13 +05:30
s-aga-r
0b009da122
fix(ux): only list related DocTypes
2023-06-12 12:33:13 +05:30
s-aga-r
9a12545ac3
fix(ux): add filter disabled=0
for batch no
2023-06-12 12:33:07 +05:30
David Arnold
c1b42b858d
fix: set Phone and Email option in doctypes ( #35549 )
2023-06-11 19:34:41 +05:30
ruthra kumar
dcbd7d5f1f
fix: incorrect TCS amount while customer has advance payment ( #35397 )
...
* fix: incorrect TCS amount while customer has advance payment
* test: only unallocated advance should for threshold breach validation
2023-06-10 20:55:30 +05:30
Rohit Waghchaure
e9a6191af9
fix: added process loss in job card
2023-06-09 20:33:46 +05:30
Sagar Sharma
e3802d1c3f
Merge pull request #35618 from s-aga-r/FIX-SBB-SERIAL-NO-QTY
...
fix: reset entries qty to `1` for serial item
2023-06-09 13:01:01 +05:30
Anand Baburajan
7bd369c49b
fix: calculate wdv depr schedule properly for existing assets [dev] ( #35614 )
...
* fix: calculate wdv depr schedule properly for existing assets
* fix: calculate wdv depr schedule properly for existing assets properly
* chore: properly call _get_pro_rata_amt
2023-06-09 12:53:10 +05:30
s-aga-r
b5c5a90f71
fix(ux): set warehouse for new row
2023-06-09 12:22:24 +05:30
s-aga-r
1f28ca717e
fix(ux): set entries qty to 1
before making the field read-only
2023-06-09 12:06:46 +05:30
s-aga-r
1d904c0a86
fix(ux): make qty field read-only for serial item
2023-06-09 12:05:02 +05:30
Sagar Sharma
9a819103a7
Merge pull request #35617 from s-aga-r/FIX-CBAL-TypeError
...
fix: `TypeError` in Closing Stock Balance
2023-06-09 11:36:20 +05:30
s-aga-r
93e3fe8445
fix: reset entries qty to 1
for serial item
2023-06-09 11:10:47 +05:30
s-aga-r
446253ff39
fix: TypeError
in Closing Stock Balance
2023-06-09 09:30:24 +05:30
Christian Werner
65b2e1fc33
fix: set parent_project when creating a new timesheet ( #35607 )
...
fix "When Creating a new Timesheet from an Task - parent_project is empty" #35578
2023-06-08 20:00:40 +05:30
Raffael Meyer
b91bb17779
refactor: get default contact or address ( #35248 )
...
* refactor: get_party_shipping_address
* refactor: get_default_contact
* chore: adding docstrings
* fix: keep original order
* fix: use get_all instead of get_list
---------
Co-authored-by: ruthra kumar <ruthra@erpnext.com>
2023-06-08 19:49:09 +05:30
ruthra kumar
9cd982aa54
Merge pull request #35610 from ruthra-kumar/fix_travis
...
chore: fix travis
2023-06-08 15:53:50 +05:30
ruthra kumar
992d61bd90
chore: fix travis
2023-06-08 15:11:46 +05:30
Didiman1998
0c12d4d3c5
fix: remove code that causes upscrolling ( #35140 )
...
Co-authored-by: Dietmar Fischer <fischer@kk-software.de>
2023-06-07 22:35:44 +05:30
Trusted Computer
781548e46e
Fix: CSS not applied to product title ( #35582 )
...
In an erpnext website, the /all-products route shows website items that have been published to the web site.
In the list view (erpnext/e_commerce/product_ui/list.js), the css class is null for the product title. Instead, inline style statements have been added in that can not be modified by overriding CSS.
This fix uses a similar approach to that which is taken in the grid view (erpnext/e_commerce/product_ui/grid.js). It removes the null CSS parameter in the product title link as well as the inline style statement. Then, as in the grid view, the product title is wrapped in a div tag with the product_title CSS class.
This makes it possible to style the product title as desired with a CSS override.
Closes #35580
2023-06-07 22:11:49 +05:30
Deepesh Garg
f732cac678
fix: Project in item-wise sales register ( #35596 )
2023-06-07 22:06:05 +05:30
Raffael Meyer
0dde4d4c69
refactor: use delete_contact_and_address ( #34497 )
...
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
2023-06-07 22:02:38 +05:30
Dirk van der Laarse
3b409af9a0
fix: exclude disabled customers when fetching customers on process statement of accounts ( #35539 )
...
fix: exclude disabled when fetching customers
2023-06-07 22:01:44 +05:30
Raffael Meyer
e9d7b9f0f4
fix: column formatting in Bank Reconciliation Tool ( #35540 )
...
* fix(Bank Reconciliation): format Date column
* fix(Bank Reconciliation): format Party column
* fix(Bank Reconciliation): actions button
- wrong closing tag
- explicitly quote data-name
* fix(Bank Reco): format date and link in dialog
2023-06-07 21:51:49 +05:30
Raffael Meyer
e1f3b7cbc8
fix: pass translated label to change button type ( #35564 )
...
fix: change button type for translated labels
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2023-06-07 21:49:02 +05:30
HarryPaulo
a9a47a51e4
fix: based on status_update.py update opportunity status to converted… ( #35145 )
...
fix: based on status_update.py update opportunity status to converted on sales submit
2023-06-07 21:35:52 +05:30
Deepesh Garg
0108b1abe2
fix: Improve validation message ( #35489 )
...
* fix: Improve validation message
* Update erpnext/selling/doctype/customer/customer.py
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
---------
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
2023-06-07 21:33:36 +05:30
Ankush Menat
0166f69b31
chore: extend default role profiles
2023-06-07 15:09:49 +05:30
rohitwaghchaure
930a107af8
Merge pull request #35567 from s-aga-r/FIX-SBB-STATUS
...
fix(ux): serial and batch bundle status
2023-06-07 14:49:43 +05:30
Ankush Menat
4507cb3cd7
fix: enqueue_after_commit
wherever it makes sense ( #35588 )
2023-06-07 11:58:36 +05:30
Deepesh Garg
76197cc437
chore: Default role profiles ( #35584 )
2023-06-07 10:11:32 +05:30
Deepesh Garg
2ffcca6f10
fix: Interest Accrual on Loan Topup ( #35555 )
...
* fix: Interest Accrual on Loan Topup
* chore: CI
* chore: Ignore test
2023-06-07 10:06:13 +05:30
Nabin Hait
1cf1c7943f
Merge pull request #35572 from nabinhait/quotation-fix
...
feat: ability to create quotation against a prospect
2023-06-06 21:54:24 +05:30