Deepesh Garg
42a59d5c17
chore: Remove raw SQL query
2022-11-12 17:32:04 +05:30
ruthra kumar
2c8b0b17a7
test: buying amount of invoices
...
1. Invoice with unset `update_stock`, with and without Delivery Notes
2022-11-11 08:33:54 +05:30
ruthra kumar
e4d16c31da
fix: GP incorrect buying amount if no upd on SI and Delivery Note
2022-11-11 08:33:48 +05:30
rohitwaghchaure
8ae9c1d192
Merge pull request #32895 from rohitwaghchaure/fixed-performance-issue-for-purchase-receipt
...
fix: Purchase Receipt timeout error
2022-11-10 22:41:54 +05:30
Deepesh Garg
f4920d6475
Merge pull request #32880 from ernestoruiz89/patch-7
...
fix: add translate function to valitate company msg in chart of accounts importer
2022-11-10 20:07:52 +05:30
Deepesh Garg
e559fea8ff
Merge pull request #32921 from deepeshgarg007/netvalues_psoa
...
feat: Add net value filter on PSOA
2022-11-10 19:51:56 +05:30
Deepesh Garg
51521fc19f
feat: Add net value filter on PSOA
2022-11-10 17:48:25 +05:30
Ernesto Ruiz
a007f1da9d
Merge branch 'develop' into patch-7
2022-11-09 15:53:36 -06:00
Ankush Menat
7e1742956c
refactor: Remove usage of deprecated methods ( #32914 )
...
Warn: Just used regex to replace all usage.
```regex
s/frappe.db.set(\(.*\),\(.*\),\(.*\))/\1.db_set(\2, \3)/g
```
Required after: https://github.com/frappe/frappe/pull/18815
2022-11-09 20:09:06 +05:30
Deepesh Garg
ff51f3b95e
Merge branch 'develop' into patch-7
2022-11-09 14:34:39 +05:30
Deepesh Garg
5f1b226362
Merge pull request #32742 from ruthra-kumar/ple_repost
...
feat: Tool to repost PLE manually
2022-11-09 14:26:37 +05:30
Rohit Waghchaure
4082149f0e
fix: Purchase Receipt timeout error
2022-11-08 20:59:20 +05:30
ruthra kumar
0448c0fa36
feat: Repost Payment Ledger entries for vouchers
...
primarily intended to manually correct PLE entries for vouchers
affected by Item Value repost-https://github.com/frappe/erpnext/pull/32567
2022-11-08 07:47:47 +05:30
Ernesto Ruiz
637c08d189
fix: add translate function to valitate company msg in chart of accounts importer
2022-11-07 09:22:38 -06:00
Deepesh Garg
e29f756146
chore: Validate for deferred revenue invoices
2022-11-07 16:42:45 +05:30
Deepesh Garg
5fe55176ec
chore: Enable no-copy for repost required field
2022-11-07 16:42:12 +05:30
ruthra kumar
9209ec59c2
refactor: split delete gl utility function into two
2022-11-06 11:39:44 +05:30
Deepesh Garg
be0f6b3e6e
Merge branch 'develop' of https://github.com/frappe/erpnext into editable_inovice
2022-11-05 16:35:55 +05:30
Deepesh Garg
0966867c08
chore: Reset repost_required_flag on cancel
2022-11-05 16:35:43 +05:30
Deepesh Garg
cbf82872fb
Merge pull request #32646 from niralisatapara/tds_purchase_invoice
...
feat: Item Wise TDS Calculation
2022-11-04 13:08:10 +05:30
Deepesh Garg
159b511d16
Merge pull request #32809 from monolithon/develop
...
feat: Optional Hungarian COA for microenterprises
2022-11-04 13:00:13 +05:30
rohitwaghchaure
441f082fcb
Merge pull request #32799 from rohitwaghchaure/fix-scan-qrcode-functionality
...
fix: Scan Barcode UX
2022-11-04 11:04:40 +05:30
Ernesto Ruiz
ad0dd693ac
chore: add translation function to Bank Reconciliation Tool related files
...
chore: add translation function to Bank Reconciliation Tool related files
2022-11-04 01:06:01 +05:30
Deepesh Garg
e2ad785422
chore: Hide tax withholding net total field
2022-11-04 01:03:20 +05:30
Daizy Modi
010bd9c558
fix: remove cache param
2022-11-03 14:36:48 +05:30
Daizy Modi
27df455b98
perf: use get_cached_value instead of db.get_value in accounts module
2022-11-03 13:38:48 +05:30
niralisatapara
12456f9850
feat: item wise tds calculation
2022-11-03 10:46:30 +05:30
Deepesh Garg
8581b7820d
Merge pull request #32713 from ernestoruiz89/patch-9
...
fix: add missing translation function on report related documents
2022-11-03 09:46:43 +05:30
Rohit Waghchaure
e1f9ba78e5
fix: Scan Barcode UX
2022-11-02 15:37:46 +05:30
niralisatapara
ea387937d0
feat: item wise tds calculation
2022-11-02 12:30:58 +05:30
niralisatapara
2ca0cf6fc4
feat: item wise tds calculation
2022-11-02 12:19:51 +05:30
niralisatapara
4aff2a32ad
Merge branch 'develop' of https://github.com/niralisatapara/erpnext into develop
2022-11-02 11:21:02 +05:30
Muvuk
579afed460
feat: Optional Hungarian COA for microenterprises #32688
2022-11-01 19:36:42 +01:00
Deepesh Garg
e0a705afe7
Merge pull request #32779 from deepeshgarg007/sales_invoice_default_mop
...
fix: Mode of payment for returns in POS Sales Invoice
2022-11-01 21:28:54 +05:30
Deepesh Garg
62ae329be3
Merge pull request #32801 from deepeshgarg007/purchase_invoice_cancel_amend
...
fix: Issues while cancel/amending Purchase Invoice with TDS enabled
2022-11-01 20:47:55 +05:30
Deepesh Garg
a4f7079270
Merge branch 'develop' of https://github.com/frappe/erpnext into sales_invoice_default_mop
2022-11-01 20:17:43 +05:30
Deepesh Garg
5b74161195
chore: Update tests
2022-11-01 20:17:34 +05:30
Deepesh Garg
f7c9258770
fix: Issues while cancel/amending Purchase Invoice with TDS enabled
2022-11-01 19:54:41 +05:30
Dany Robert
1d83fb20d6
feat(pricing rule): free qty rounding and recursion qty ( #32577 )
...
Option to specify recursion start qty and repeating qty
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
2022-11-01 16:39:32 +05:30
Maharshi Patel
cc6dfd91cf
Merge branch 'develop' into fix-pricing-rule-item-group-uom
2022-11-01 15:06:22 +05:30
Maharshi Patel
935f31eff9
fix: test cases added for item group
2022-11-01 12:55:46 +05:30
Deepesh Garg
5b150abdcb
Merge pull request #32768 from deepeshgarg007/cc_main_allocation
...
fix: Budget validation for main cost center
2022-10-31 22:18:50 +05:30
Deepesh Garg
4e26d42d17
fix: Budget validation for main cost center
2022-10-30 19:33:27 +05:30
Deepesh Garg
49343e9f68
chore: column name
2022-10-28 22:03:09 +05:30
Deepesh Garg
323e45374f
Merge pull request #32620 from rtdany10/psa_pdf_issue
...
feat: page break in SoA pdf
2022-10-28 21:00:01 +05:30
Deepesh Garg
aee4fe9f7b
Merge pull request #32722 from deepeshgarg007/reference_due_date
...
fix: Reference due date field type in Journal Entry Accounts table
2022-10-28 20:55:36 +05:30
Deepesh Garg
50652be6e3
Merge branch 'develop' of https://github.com/frappe/erpnext into editable_inovice
2022-10-28 20:48:26 +05:30
Deepesh Garg
9ac1c4bc4f
Merge pull request #32699 from deepeshgarg007/general_ledeger_print
...
fix: Curreny in SOA print for multi-currency party
2022-10-28 20:41:49 +05:30
Deepesh Garg
c3275c3f3c
Merge pull request #32692 from deepeshgarg007/opening_invoice_creation_tool_ux
...
fix: Clear invoice table post importing invoices
2022-10-28 20:40:52 +05:30
Deepesh Garg
d9eda45b0b
chore: Minor updates
2022-10-28 20:19:13 +05:30
Deepesh Garg
fb41bdd700
Merge branch 'develop' of https://github.com/frappe/erpnext into tds_purchase_invoice
2022-10-28 17:18:11 +05:30
Deepesh Garg
09fa2298ba
Merge pull request #32716 from deepeshgarg007/bank_account_filter
...
fix: Company bank account filter in Bank Clearance
2022-10-28 12:53:53 +05:30
Deepesh Garg
16959c0a8c
Merge pull request #32717 from deepeshgarg007/discount_section_collapse
...
fix: Add condition for discount section collapse
2022-10-28 11:24:25 +05:30
Dany Robert
de20dfe459
chore: remove commented line
2022-10-27 09:33:49 +05:30
Deepesh Garg
a5a73ba857
fix: Filter fixes in Accounts Payable report
2022-10-26 21:18:50 +05:30
Deepesh Garg
e7caa48e2f
fix: Reference due date field type in Journal Entry Accounts table
2022-10-26 20:21:36 +05:30
Deepesh Garg
4cd65027c4
fix: Add condition for discount section collapse
2022-10-26 16:48:24 +05:30
Deepesh Garg
f9f78c1086
fix: Company bank account filter in Bank Clearance
2022-10-26 11:02:14 +05:30
Ernesto Ruiz
2012bdf4bd
fix: add translate function to string on budget_variance_report.js to match the variance word translated
2022-10-25 22:24:33 -06:00
Ernesto Ruiz
48ed6381b3
fix: add translate function to name of chart labels in budget_variance_report.py
2022-10-25 22:18:47 -06:00
Ernesto Ruiz
a671652ab2
fix: refactor code for better translatable string
2022-10-25 22:00:46 -06:00
Ernesto Ruiz
a963618b08
fix: add translate function to name of chart labels in deferred_revenue_and_expense.py
2022-10-25 21:54:55 -06:00
niralisatapara
397e3b1ade
feat: item wise tds calculation
...
item wise tds calculation
2022-10-25 15:09:59 +05:30
Deepesh Garg
a18a715bb4
chore: Use account currency as fallback
2022-10-24 19:13:02 +05:30
Deepesh Garg
49ee873655
fix: Curreny in SOA print for multi-currency party
2022-10-24 17:34:12 +05:30
Deepesh Garg
267e7c3a90
fix: Clear invoice table post importing invoices
2022-10-24 11:45:24 +05:30
Deepesh Garg
1a980123a2
chore: Update tests
2022-10-24 10:08:55 +05:30
Deepesh Garg
ed98015a56
test: Add unit tests
2022-10-23 23:03:50 +05:30
Deepesh Garg
1105e52031
chore: Update allow on submit fields
2022-10-23 22:55:08 +05:30
ruthra kumar
eedf7e44a2
Merge pull request #32651 from ruthra-kumar/report_payment_ledger
...
feat: Payment Ledger report
2022-10-21 11:25:24 +05:30
Deepesh Garg
1ca472cc8a
chore: Linting issues
2022-10-20 12:09:42 +05:30
Deepesh Garg
b4d008b743
Merge branch 'develop' into subscription-plan-fix-months
2022-10-20 12:07:44 +05:30
Deepesh Garg
796f2d3c09
fix: Billing Address for inter-company purchase docs
2022-10-19 23:50:39 +05:30
ruthra kumar
6e55b419a6
test: invoice outstandings and payments
2022-10-19 21:49:13 +05:30
ruthra kumar
8f60f0a0cf
feat: Basic Payment Ledger report
2022-10-19 21:49:08 +05:30
Deepesh Garg
430492152f
fix: Advance paid amount in orders ( #32642 )
2022-10-19 15:37:13 +05:30
niralisatapara
21d09c5bf2
Item Wise TDS Calculation
2022-10-19 14:33:02 +05:30
Maharshi Patel
d100e68fd0
Merge branch 'frappe:develop' into fix-pricing-rule-item-group-uom
2022-10-19 11:08:05 +05:30
ruthra kumar
f844097f8e
Merge pull request #32635 from ruthra-kumar/fix_tax_or_charges_acc_updating_voucher_outstanding
...
fix: Integrity Error on PLE while submitting sales invoice
2022-10-19 09:43:24 +05:30
Maharshi Patel
96b4211ea1
fix: pricing rule for non stock UOM and conversions
...
* fix: pricing rule for non stock UOM and conversions
2022-10-18 22:26:11 +05:30
ruthra kumar
8f42e7f703
test: use payable account in tax and to trigger party validation
2022-10-18 17:27:46 +05:30
ruthra kumar
43b80683eb
fix: party type and party mandatory on updating outstanding
2022-10-18 09:33:37 +05:30
Deepesh Garg
42e4c37f15
chore: Break into smaller functions
2022-10-17 20:09:07 +05:30
Deepesh Garg
32117c030a
Merge pull request #32622 from deepeshgarg007/ignore_pi_reference
...
fix: Ignore linked purchase invoice on cancel
2022-10-17 19:38:26 +05:30
Dany Robert
9df9915600
fix: query condition change
2022-10-17 15:54:46 +02:00
Deepesh Garg
faadf78332
fix: Ignore linked purchase invoice on cancel
2022-10-17 18:50:54 +05:30
ruthra kumar
9b50221bf0
refactor: split ple creation function into two
...
refactor create_payment_ledger_entry function into 2.
one for generating ple map and one for DB entry creation
2022-10-17 18:02:52 +05:30
Dany Robert
2665d7d293
feat: page break in SoA pdf
2022-10-17 14:29:03 +02:00
Deepesh Garg
e626107d3d
chore: Update allow on submit for Sales Invoice fields
2022-10-17 16:48:13 +05:30
Deepesh Garg
dc3fe85921
chore: Remove HRMS related code ( #32607 )
...
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2022-10-17 11:37:50 +05:30
Deepesh Garg
30da6ab2c1
feat: Editable Sales Invoice
2022-10-17 11:10:38 +05:30
ruthra kumar
2d0217abd5
Merge pull request #32567 from ruthra-kumar/remove_duplicate_ple_on_item_value_repost
...
fix: deduplicate Payment Ledger on Item value repost
2022-10-13 14:01:59 +05:30
Maharshi Patel
edc93ab6aa
fix: pricing rule item group uom
...
Handle use case where pricing rule is applied on item group and user have selected UOM. pricing rule was applied on all UOM's even after specifying UOM. i have added condition in sql to fix this.
2022-10-13 12:00:30 +05:30
Deepesh Garg
43c2bd1351
Merge pull request #32272 from deepeshgarg007/internal_transfer_precision_fixes
...
fix: Incoming rate precision fixes for intra company transfer
2022-10-12 16:23:16 +05:30
Rohit Waghchaure
98bf8e1304
fix: test case
2022-10-12 15:45:36 +05:30
Rohit Waghchaure
683a47f7a1
fix: consider sales rate as incoming rate for transit warehouse in purchase flow
2022-10-12 15:44:53 +05:30
ruthra kumar
65992304bc
fix: delete old ple's on item value repost
2022-10-12 15:34:50 +05:30
Deepesh Garg
c8d2181498
chore: Increase precision for other doc fields
2022-10-12 14:17:55 +05:30
Deepesh Garg
38b34f2a45
Merge pull request #32408 from nabinhait/sales-purchase-tab-break
...
feat: Tab Breaks in all Sales and Purchase cycle transactions
2022-10-11 16:02:45 +05:30
Deepesh Garg
dc20b21fb5
test: Internal tranfer precision loss test
2022-10-11 14:54:27 +05:30
Deepesh Garg
b31c3bd35d
chore: Increase incoming_rate field precision to 6
2022-10-11 14:53:26 +05:30
ruthra kumar
633c2a289e
Merge pull request #32557 from ruthra-kumar/value_error_on_pos_save
...
fix: Value error on validation of POS invoices with Serial Nos
2022-10-11 14:42:47 +05:30
Nabin Hait
e71c417f7e
fix: minor cleanup
2022-10-11 13:21:27 +05:30
Nabin Hait
5389a35798
fix: more fields reordering related to Tab Break
2022-10-11 13:21:07 +05:30
Nabin Hait
aaf3c2b329
feat: Tab Break in Purchase Invoice
2022-10-11 13:20:41 +05:30
Nabin Hait
f6613e1e4c
feat: Tab Break in Sales Order, Delivery Note, Sales Invoice and Purchase Order
2022-10-11 13:18:21 +05:30
ruthra kumar
9e2bd10d03
test: value error on serial no validation on pos
2022-10-11 12:54:50 +05:30
Deepesh Garg
b99b2b75ca
Merge pull request #32477 from rasos/patch-1
...
Austria chart of accounts update
2022-10-11 10:20:49 +05:30
Anand Baburajan
ba754825b9
Merge branch 'develop' into fix_budget_autoname
2022-10-10 23:17:18 +05:30
anandbaburajan
e4d7d8c42d
fix: use naming_series in budget
2022-10-10 23:04:34 +05:30
codezart
2d30b36cca
fix: number of months subscription plan
2022-10-10 11:24:42 -04:00
ruthra kumar
65194efa97
Merge pull request #32548 from ruthra-kumar/suppress_linked_doc_valdiation_on_delete
...
fix: allow deletion of cancelled Invoices once payments are unlinked
2022-10-10 16:41:07 +05:30
ruthra kumar
143f905838
test: update ple on payment unlink for SI's and SO's
2022-10-10 15:57:38 +05:30
ruthra kumar
537d953f4c
fix: unlink payment on invoice cancellation
2022-10-10 10:17:19 +05:30
Deepesh Garg
17201facf1
Merge pull request #32522 from deepeshgarg007/tax_withholding_related_fixes
...
fix: Tax withholding related fixes
2022-10-07 16:32:18 +05:30
Deepesh Garg
781d160c68
fix: Do not add tax withheld vouchers post tax withheding in one document
2022-10-07 14:22:40 +05:30
Deepesh Garg
abf5b6be3e
fix: Tax withholding related fixes
2022-10-07 14:04:36 +05:30
Ankush Menat
8d1db0ea3d
fix: single column indexes ( #32425 )
...
refactor: move single column indexes to doctypes
2022-10-06 11:28:26 +05:30
Dany Robert
c35adcf5a1
feat(JE): trigger account field when fetched from template
...
Closes #32409
2022-10-03 19:31:20 +05:30
Roland
7d84cca431
Austria chart of accounts update
...
improved mapping of VAT accounts
2022-10-03 14:13:27 +02:00
niralisatapara
e758a753f8
Item Wise TDS Calculation
...
For calculating Item wise TDS in Purchase Invoice.
2022-10-03 16:39:35 +05:30
rohitwaghchaure
1c5ae80029
Merge pull request #32466 from rohitwaghchaure/allow-to-return-expired-batches
...
fix: not able to return sold expired batches
2022-10-03 13:14:59 +05:30
Deepesh Garg
8c23b19da1
Merge pull request #32394 from maharshivpatel/fix-payment-request-fetch-swift-number
...
fix: fetch swift number in payment request from bank doctype
2022-10-03 12:55:02 +05:30
Rohit Waghchaure
0b1727cf79
fix: not able to return sold expired batches
2022-10-03 12:06:32 +05:30
Shridhar Patil
69efd2ee24
fix: fixes query builder order by issue in postgres ( #32441 )
...
* fix: fixes query builder order by issue in postgres
* fix: linter
2022-10-03 11:07:24 +05:30
Deepesh Garg
1c560a967c
Merge branch 'develop' into fix-payment-request-fetch-swift-number
2022-10-01 16:14:27 +05:30
Maharshi Patel
62c5b28690
fix: typo in sales_register's filter mode_of_payment ( #32371 )
...
* fix: typo in sales_register's filter mode_of_payment
2022-10-01 11:04:53 +05:30
Maharshi Patel
dc8d49260c
fix: payment request make bank field Link instead of Read Only
2022-09-30 16:22:57 +05:30
Deepesh Garg
cceb29c005
Merge pull request #32412 from deepeshgarg007/tcs_deduction_issue
...
fix: Incorrect TCS amount deducted in Sales Invoice
2022-09-30 16:05:30 +05:30
Maharshi Patel
9245d3b5cd
Revert "fix: fetch swift_number in payment_request"
...
This reverts commit f42a8e4e03
2022-09-30 15:35:12 +05:30
Sagar Sharma
b1edd911f9
Merge branch 'develop' into remove_code_for_buying_side_discount_accounting
2022-09-30 12:39:29 +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
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
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
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
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
Maharshi Patel
c760ca2323
fix: Scrap Asset Accounting Dimensions ( #31949 )
...
* fix: Scrap Asset Accounting Dimensions
2022-09-27 15:31:36 +05:30
Rohit Waghchaure
a4a86ee23f
fix: allow to return expired batches using purchase return
2022-09-27 13:55:27 +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
rohitwaghchaure
106ee1bf4d
Merge pull request #32339 from rohitwaghchaure/fixed-opening-entry-trial-balance-issue
...
fix: opening entry causing discrepancy between stock and trial balance
2022-09-26 20:32:41 +05:30
ruthra kumar
8b21d27f04
Merge pull request #32310 from nishibakabeer/patch-4
...
fix: total value in all keys
2022-09-26 11:27:47 +05:30
nishibakabeer
6919f389aa
fix: total value in all keys
...
Gross and net profit report showing wrong values in monthly quarterly and half yearly filters which is the total value
@ruthra-kumar added in develop branch as suggested ( https://github.com/frappe/erpnext/pull/32020 )
2022-09-26 10:40:55 +05:30
Rohit Waghchaure
bc3ab45af2
fix: opening entry causing discepancy between stock and trial balance
2022-09-23 15:21:09 +05:30
