artykbasar
d512919f5c
Subscription Cost center value is fixed to Default value(Bug fix)
...
self.cost_center
field value keeps changing to
erpnext.get_default_cost_center(self.get("company"))
after validation of this doctype. This overrides the user input.
simple fix, it will first check if the field is empty, if empty then puts the company's default cost center value if not then user input will be saved.
2022-12-11 08:51:34 +00:00
anandbaburajan
90e1b9cb3d
chore: fix asset depr schedule notes
2022-12-09 16:18:40 +05:30
anandbaburajan
16365bfca3
chore: more refactoring
2022-12-09 14:04:00 +05:30
Devin Slauenwhite
2010b1b6e8
fix: use highest precision for exchange rate.
2022-12-08 16:26:07 -05:00
anandbaburajan
1fd73af744
chore: refactor some reports
2022-12-09 00:28:34 +05:30
Deepesh Garg
6db52930d8
Merge branch 'develop' of https://github.com/frappe/erpnext into buying_selling_pricing_rule
2022-12-08 18:05:05 +05:30
Deepesh Garg
6192af5cf0
chore: Update tests
2022-12-08 18:04:40 +05:30
sonali
8e7c8a6482
Update bank_reconciliation_tool.json
...
Adding fields in bank reconciliation tool
2022-12-08 17:23:08 +05:30
Ankush Menat
0b86b1baca
refactor: make payments app a soft dependency ( #33245 )
...
refactor: make payment app a soft dependency
2022-12-08 16:40:13 +05:30
sonali
447272aa4d
Filters on Bank Reconciliation
...
Applying date filter on transactions and all the bank entries and also gives the filter the bank entries as per reference date. Sorted all transactions and entries as per date in ascending order. Also added posting date columns in all bank entries and default checkbox tick of journal entry, hide the sales invoice and purchase invoice checkbox.
2022-12-08 16:11:53 +05:30
sonali
e5a1189bec
Update bank_reconciliation_tool.py
...
Applying date filter on transactions and all the bank entries and also gives the filter the bank entries as per reference date. Sorted all transactions and entries as per date in ascending order.
Also added posting date columns in all bank entries and default checkbox tick of journal entry, hide the sales invoice and purchase invoice checkbox.
2022-12-08 13:29:28 +05:30
anandbaburajan
18fc2b5695
chore: fix bug in unlink_asset_reference
2022-12-06 23:34:56 +05:30
Deepesh Garg
c1a82dc9e5
Merge pull request #33191 from ruthra-kumar/key_error_in_profit_loss_report
...
fix: key error while filtering on date range and reporting on foreign currency
2022-12-06 15:42:53 +05:30
ruthra kumar
a6794c3606
fix: key error on p/l and balance sheet reports on foreign currency
2022-12-06 13:48:46 +05:30
ruthra kumar
19db7e2989
fix: replace sql code with fields list in get_cached_value
2022-12-06 13:48:46 +05:30
Deepesh Garg
3aa6f97420
Merge pull request #33216 from barredterra/validate-accounts-dates
...
refactor: validate dates in accounts module
2022-12-06 12:33:01 +05:30
Deepesh Garg
921f8edde8
Merge pull request #33219 from deepeshgarg007/internal_transfer_editable_rate
...
fix: Allow item rate updates for non-stock invoices
2022-12-06 09:12:24 +05:30
Raffael Meyer
8301d3b13f
Merge branch 'develop' into key_error_in_profit_loss_report
2022-12-06 02:08:47 +01:00
barredterra
a26a29f33b
fix: incorrect dates in test records
2022-12-05 19:49:05 +01:00
Raffael Meyer
e526a0e282
Merge branch 'develop' into validate-accounts-dates
2022-12-05 19:37:54 +01:00
ruthra kumar
3814db02eb
fix: data import mandatory account_head, charge_type
2022-12-05 16:24:05 +05:30
Deepesh Garg
5f821b93a5
chore: Add POS Invoices
2022-12-05 15:43:03 +05:30
Deepesh Garg
ef9d126254
fix: Allow item rate udpates for non-stock invoices
2022-12-05 10:17:19 +05:30
barredterra
eb66b749b2
refactor: validate dates in accounts module
2022-12-04 14:41:21 +01:00
Deepesh Garg
b741ae143c
fix: Reapply pricing rule on qty change
2022-12-02 17:14:06 +05:30
Deepesh Garg
f54838ab56
fix: Buying and selling check in pricing rule
2022-12-01 21:23:17 +05:30
anandbaburajan
f20238fa3e
chore: use make_new_active_asset_depr_schedules_and_cancel_current_ones instead of prepare_depreciation_data
2022-12-01 15:15:32 +05:30
ruthra kumar
9b8d6fe411
fix: key error while filtering on date range and different currency
2022-12-01 13:38:41 +05:30
Deepesh Garg
3eb1ed19a1
fix: Tax withholding net total for PI in reports
2022-11-29 13:10:31 +05:30
Deepesh Garg
8253f4379f
Merge pull request #33098 from ssiyad/fix/pos/warehouse_selection
...
fix(pos): warehouse selection
2022-11-29 10:15:31 +05:30
Deepesh Garg
bdb15c3331
Merge pull request #33112 from ssiyad/fix/pos/customer_group_filter
...
fix(pos): filter on customer groups
2022-11-29 09:55:56 +05:30
Deepesh Garg
8112493c3c
Merge pull request #33138 from deepeshgarg007/bank_reco_button_fix
...
fix(ux): Action buttons in Bank Reconciliation
2022-11-29 09:23:21 +05:30
Deepesh Garg
6ebe8ad60d
fix(ux): Action buttons in Bank Reconciliation
2022-11-28 17:37:41 +05:30
Deepesh Garg
f6126069ee
Merge pull request #33129 from deepeshgarg007/accounts_settings_fix
...
chore: Supplier invoice no field description
2022-11-28 13:05:12 +05:30
Deepesh Garg
4f2ece34df
chore: Supplier invoice no field description
2022-11-27 21:50:26 +05:30
Raffael Meyer
905a50cbb2
Merge branch 'develop' into incoterms
2022-11-25 16:50:55 +01:00
anandbaburajan
7d09440579
chore: more refactoring
2022-11-25 16:49:44 +05:30
Sabu Siyad
cc63415887
fix(pos): filter on customer groups
...
Signed-off-by: Sabu Siyad <hello@ssiyad.com>
2022-11-25 15:10:01 +05:30
anandbaburajan
4e63ba3ac6
chore: refactor schedules in journal_entry
2022-11-24 17:39:11 +05:30
Sabu Siyad
4ad0e2ed7e
feat(pos): invoice: fitler warehouse by company
...
Signed-off-by: Sabu Siyad <hello@ssiyad.com>
2022-11-24 16:11:26 +05:30
Sabu Siyad
95a620a30d
fix(pos): warehouse should be in company
...
Signed-off-by: Sabu Siyad <hello@ssiyad.com>
2022-11-24 15:40:05 +05:30
Deepesh Garg
3724f2287c
Merge pull request #33092 from deepeshgarg007/debit_credit_issue
...
fix: Debit and Credit not equal while submitting PI containing asset item
2022-11-24 14:42:56 +05:30
Deepesh Garg
dc8d635120
fix: Debit and Credit not equal while submitting PI containing asset item
2022-11-23 20:29:12 +05:30
Deepesh Garg
7a7b8c2284
Merge pull request #32836 from resilient-tech/perf-fix-get-cached-value-for-accounts
...
perf: use `get_cached_value` instead of `db.get_value` in accounts module
2022-11-23 18:20:48 +05:30
Deepesh Garg
a3c81da890
Merge pull request #33062 from nabinhait/pcv-rounding-issue
...
fix: create rounding gl entry for PCV during gle post processing
2022-11-23 10:36:04 +05:30
Deepesh Garg
06c9c679e6
Merge pull request #33063 from niralisatapara/tds_purchase_order
...
feat: item wise tds in purchase order
2022-11-23 09:52:00 +05:30
Deepesh Garg
34e775136d
Merge pull request #33069 from deepeshgarg007/jv_filter
...
fix: Remove unnecessary filters from Journal Entry
2022-11-22 20:15:12 +05:30
Deepesh Garg
eb74362263
Merge pull request #33068 from deepeshgarg007/payment_button_visibility
...
fix: Don't show payment button for invoices on hold
2022-11-22 20:14:41 +05:30
niralisatapara
46e8cdf31a
feat: item wise tds calculation for purchase order.
2022-11-22 14:15:36 +05:30
Deepesh Garg
e96be712b8
chore: Rearrange supplier invoice section in Purchase Invoice
2022-11-22 12:50:00 +05:30
Deepesh Garg
cd88a53533
fix: Remove unnecessary filters from Journal Entry
2022-11-21 22:21:03 +05:30
Deepesh Garg
1b9e83251f
fix: Don't show payment button for invoices on hold
2022-11-21 21:50:55 +05:30
Nabin Hait
022d8d5d79
fix: create rounding gl entry for PCV during gle post processing
2022-11-21 15:16:53 +05:30
Deepesh Garg
15e74c5d7b
fix: Viewing account ledger from party master
2022-11-20 20:30:24 +05:30
Deepesh Garg
26dcde2931
Merge pull request #32999 from ruthra-kumar/exchange_rate_reval_company_currency
...
fix: incorrect currency in Exchange rate revaluation
2022-11-19 18:30:03 +05:30
Deepesh Garg
f96c66bbc0
Merge pull request #33032 from deepeshgarg007/dimension_report_filtering
...
fix: Accounting Dimension filtering for Sales and Purchase Report
2022-11-19 18:19:37 +05:30
gavin
dd2493a541
fix(realtime): Restrict updates to only last modified or current user ( #33034 )
2022-11-18 17:17:54 +05:30
ruthra kumar
5caaccc94b
fix: always send account currency in response
2022-11-18 17:10:39 +05:30
ruthra kumar
68b04e2577
fix: incorrect currency in Exchange rate revaluation
2022-11-18 17:10:39 +05:30
Deepesh Garg
df096688f7
Merge pull request #33014 from deepeshgarg007/multi_invoice_payment
...
fix: Bulk payment generation against invoices
2022-11-18 15:10:35 +05:30
Deepesh Garg
8b394afaa9
fix: Accounting Dimension filtering for Sales and Purchase Report
2022-11-18 15:07:12 +05:30
barredterra
77105306f2
feat: add incoterm to purchasing transactions
2022-11-17 22:18:26 +01:00
barredterra
029f22c549
feat: add incoterm to sales transactions
2022-11-17 22:17:59 +01:00
Sagar Vora
48413b0778
fix: reduce function call
2022-11-18 02:22:43 +05:30
Sagar Vora
66ac65482d
fix: add missing comma
2022-11-18 02:16:56 +05:30
Sagar Vora
8ae58ed427
fix: use doc_before_save and other changes
2022-11-18 02:13:16 +05:30
Daizy Modi
fdfe5cbf93
fix: use get_cached_value to avoid db call with db.exists
2022-11-17 19:14:10 +05:30
Daizy Modi
678a4c33da
fix: resolved merge conflicts
2022-11-17 19:13:10 +05:30
Sagar Sharma
29a8d9a9b4
Merge branch 'develop' into internal_transfer
2022-11-17 16:42:18 +05:30
Deepesh Garg
2dfe849c7d
fix: Bulk payment generation against invoices
2022-11-17 15:53:56 +05:30
Deepesh Garg
3a523b56bf
Merge pull request #32983 from deepeshgarg007/journal_entry_template_fix
...
fix: Opening journal entry templates
2022-11-16 20:41:07 +05:30
Vishal
71412f6877
fix: Internal Transfer Material Request cycle and tracking fixed till purchase receipt
2022-11-16 13:53:21 +05:30
Nabin Hait
b89b07d0ff
fix: Validate for deferred revenue only if sales invoice needs repost
2022-11-16 12:16:23 +05:30
Deepesh Garg
33b61aef5a
fix: Opening journal entry templates
2022-11-16 11:57:17 +05:30
Gavin D'souza
35088bb4c4
chore(payment_entry): Remove dead validations
...
(cherry picked from commit e1ecc9a81973d20084f5a053d8d0155354079b2e)
2022-11-15 08:34:08 +00:00
Deepesh Garg
a0d9e1bd57
Merge pull request #32962 from deepeshgarg007/return_write_off
...
fix: Write Off section visibility for non POS Invoices
2022-11-15 13:01:06 +05:30
Deepesh Garg
9f5d613c78
fix: Write Off section visibility for non POS Invoices
2022-11-15 09:45:39 +05:30
Deepesh Garg
a1a992b0dd
Merge pull request #32956 from deepeshgarg007/acc_dimension_filter_label
...
fix: Label for applicable dimension table
2022-11-15 09:24:30 +05:30
Deepesh Garg
8c13f70fc5
fix: Label for applicable dimension table
2022-11-14 20:39:40 +05:30
Sagar Vora
b06345af46
fix: check type for reference name
2022-11-13 19:58:49 +05:30
Deepesh Garg
a2260a3dc2
Merge branch 'develop' into bg_query
2022-11-13 19:47:43 +05:30
Deepesh Garg
6b93b3f12a
Merge pull request #32866 from ruthra-kumar/gross_profit_fix_buying_amount
...
fix: incorrect buying amount on Gross Profit
2022-11-13 19:15:03 +05:30
Deepesh Garg
4b9921782b
chore: Remove qb doc reference
2022-11-13 18:48:32 +05:30
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
ruthra kumar
122d5f2729
fix: difference amount calculation on payment reconciliation
2022-09-21 08:36:09 +05:30
Deepesh Garg
d4b01f6ffd
Merge branch 'develop' of https://github.com/frappe/erpnext into fix-remove-no-copy-for-ignore_pricing_rule
2022-09-20 14:58:48 +05:30
Deepesh Garg
ef7d7e7d71
Merge pull request #32204 from deepeshgarg007/pending_tds_vouchers
...
fix(UX): More predictable tax withholding application in invoices
2022-09-20 14:35:16 +05:30
Deepesh Garg
3d356763d0
Merge pull request #32217 from ruthra-kumar/bug_in_tax_on_multi_currency_payment_entry
...
fix: incorrect gl if tax on multi currency payment entry
2022-09-20 09:59:47 +05:30
Deepesh Garg
49538e81de
Merge pull request #32235 from maharshivpatel/fix-payment-schedule-description
...
fix: fetch description only if empty on the payment schedule
2022-09-20 09:13:43 +05:30
Deepesh Garg
1f4932966a
Merge branch 'develop' of https://github.com/frappe/erpnext into pending_tds_vouchers
2022-09-20 09:06:35 +05:30
Deepesh Garg
9aa1f84d45
chore: fix tests
2022-09-20 09:06:18 +05:30
rohitwaghchaure
3c01bf3a12
Merge pull request #32238 from rohitwaghchaure/fix-pricing-rules-issues
...
fix: suggestion threshold label and rule was not working for other item with min and max amount
2022-09-17 12:11:24 +05:30
Maharshi Patel
8c5b420aea
fix: remove no_copy for ignore_pricing_rule
2022-09-16 18:26:00 +05:30
ruthra kumar
5bd5dd7262
test: gl entries of payments with advance tax
2022-09-16 16:22:21 +05:30
Rohit Waghchaure
f5bd3fa952
fix: suggestion threshold label and rule was not working for other items with min and max amount
2022-09-16 16:03:08 +05:30
Maharshi Patel
f4b64686ae
fix: fetch description only if empty on the payment schedule
...
added fetch_if_empty on description field of payment_schedule.
2022-09-16 14:14:14 +05:30
Deepesh Garg
36d0906ea2
fix: TDS deduction via journal entry
2022-09-16 13:50:37 +05:30
ruthra kumar
f0ae77b23b
fix: incorrect gl if tax on multi currency payment entry
2022-09-16 12:40:40 +05:30
Deepesh Garg
0a6462e627
Merge branch 'develop' of https://github.com/frappe/erpnext into pending_tds_vouchers
2022-09-16 12:35:39 +05:30
Deepesh Garg
38d00f407e
Merge pull request #32225 from nabinhait/dunning-fix
...
fix: create dunning from sales invoice
2022-09-16 11:04:55 +05:30
Deepesh Garg
e4ef6c9645
Merge pull request #32219 from nabinhait/bank-clearnance-perm-issue
...
fix: No permission to read doctype
2022-09-16 11:04:42 +05:30
Nabin Hait
0286f2da78
Merge branch 'develop' into dunning-fix
2022-09-16 09:40:18 +05:30
anandbaburajan
ff5cad1cd6
fix: calculate depreciation properly on asset sale entry and scrap entry
2022-09-15 13:15:34 +05:30
Nabin Hait
29db084dc3
fix: create dunning from sales invoice
2022-09-15 13:11:53 +05:30
Nabin Hait
af21a11e1e
fix: abbreviation issue on renaming cost center
2022-09-15 12:09:18 +05:30
Nabin Hait
c0da948a4e
fix: No permission to read doctype
2022-09-15 11:27:35 +05:30
Deepesh Garg
b6184ce471
test: Add tests
2022-09-14 09:13:02 +05:30
Deepesh Garg
b6d87ae25b
Merge branch 'develop' of https://github.com/frappe/erpnext into pending_tds_vouchers
2022-09-13 22:31:21 +05:30
Deepesh Garg
3fb1595a4e
fix: Fetch vouchers to show in Invoice
2022-09-13 20:31:31 +05:30
Deepesh Garg
246c1a9380
fix: Add child table for tax withheld vouchers
2022-09-13 20:05:20 +05:30
Nabin Hait
e24a4b18c4
Merge branch 'SaiFi0102-asset-capitalization' into develop
2022-09-13 15:00:21 +05:30
Maharshi Patel
62163ab3d3
fix: item wise sales register taxes and charges
...
i have added separate column for other charges. Instead of adding all values to tax_total, it checks if account_type is tax, and then only it adds to total_tax otherwise it adds to the total_other_charges.
2022-09-12 23:44:56 +05:30
rohitwaghchaure
b3b1df7184
Merge pull request #32181 from rohitwaghchaure/fix-min-max-amount-configuration
...
fix: promotional scheme min and max amount configuration
2022-09-12 18:30:01 +05:30
Rohit Waghchaure
a8fd92ddc1
fix: promotional scheme min and max amount configuration
2022-09-12 16:53:52 +05:30
Nihantra C. Patel
e2b4ae13fa
fix: Set filter condition and spell in AR
2022-09-12 14:09:42 +05:30
Ankush Menat
12d99b3292
refactor: use util method for checking if job is queued
2022-09-12 13:14:48 +05:30
ruthra kumar
0aeb7c6484
Merge pull request #32156 from ruthra-kumar/bug_multiple_call_to_ple_creation
...
fix: remove duplicate call to ple creation
2022-09-11 12:21:01 +05:30
ruthra kumar
4adc372f9a
fix: remove multiple call to ple creation
2022-09-11 11:52:17 +05:30
Nabin Hait
fefe95052d
fix: resolved merge conflict
2022-09-09 14:40:36 +05:30
Deepesh Garg
33d0e09497
Merge pull request #32117 from deepeshgarg007/psoa_fontsize
...
fix: Reduce font size for Process Statement of accounts print/pdf
2022-09-09 11:18:13 +05:30
Deepesh Garg
6bfd193b0d
fix: Reduce font size for Process Statement of accounts print/pdf
2022-09-07 16:34:10 +05:30
ruthra kumar
741b5b4978
Merge pull request #32110 from ruthra-kumar/bank_import_statement_bug
...
fix: error on bank statement import
2022-09-07 15:22:14 +05:30
Rohit Waghchaure
b4a102d119
fix: internal transfer flow
2022-09-07 12:48:18 +05:30
ruthra kumar
a6fbb80b94
fix: import error on bank statement import
...
Name collision between frameworks file importer's internal log and
doctype fieldname - import_log.
Frameworks internal log overrode, doctypes field which caused failure
in basic fieldtype validation.
2022-09-07 11:19:54 +05:30
Deepesh Garg
10d94ed539
Merge pull request #32045 from SolufyPrivateLimited/Solufy-JET
...
fix: Naming series in Journal Entry Template
2022-09-04 16:34:05 +05:30
Deepesh Garg
acb88e5c57
Merge pull request #31850 from HarryPaulo/add-two-new-filters-gross-profit
...
feat: two new filters for gross profit
2022-09-04 15:56:54 +05:30
Deepesh Garg
1a61d4e8a8
Merge branch 'develop' into fix-consolidation-precision-error
2022-09-04 13:18:10 +05:30
Deepesh Garg
ad8d0efa29
chore: Linting Issues
2022-09-04 13:15:59 +05:30
ruthra kumar
e424ad5ff2
Merge pull request #32054 from ruthra-kumar/bug_in_process_deferred_accounting
...
fix: type error on cancellation of Process Deferred Accounting
2022-09-02 16:20:31 +05:30
ruthra kumar
64f8010a25
Merge pull request #32052 from ruthra-kumar/key_error_on_consolidate_financial_report
...
fix: key error on consolidated financial report
2022-09-02 16:13:19 +05:30
ruthra kumar
1c385541fa
test: pda document submission and cancellation
2022-09-02 12:34:02 +05:30
ruthra kumar
08f2e4edc3
fix: incorrect import parameter for cancel PDA
2022-09-02 10:51:51 +05:30
ruthra kumar
6e8395cccd
fix: key error on consolidated financial report
...
accounts with same name but different account number will throw key
error on consolidated report
2022-09-02 09:55:24 +05:30
Solufyin
2085626390
fix: Naming series in Journal Entry Template
2022-09-01 11:49:13 +05:30
ruthra kumar
25072e5d32
Merge pull request #32009 from ruthra-kumar/add_remarks_to_payment_ledger
...
refactor: readd remarks field to payment ledger
2022-08-29 19:48:36 +05:30
ruthra kumar
5782c4469a
refactor: re-add remarks field to payment ledger and AR/AP report
2022-08-29 15:59:37 +05:30
Deepesh Garg
87ca23736d
Merge pull request #31988 from ruthra-kumar/remove_precision_discount_percentage
...
chore: remove precision on discount_percentage of Sales Invoice Item
2022-08-26 16:03:57 +05:30
ruthra kumar
c42fef541a
chore: remove precision on discount_percentage of Sales Invoice Item
2022-08-26 13:15:55 +05:30
ruthra kumar
6aa8fd0f7b
fix: restrict party types to Supplier/Customer for AR/AP report
2022-08-25 15:50:06 +05:30
Deepesh Garg
e9b0c7177f
Merge branch 'develop' into fix-consolidation-precision-error
2022-08-25 11:41:20 +05:30
Deepesh Garg
77906ea4ab
Merge pull request #31934 from ruthra-kumar/disable_discount_accounting_for_buying
...
refactor: disable discount accounting on Buying module(PI)
2022-08-25 10:34:30 +05:30
ruthra kumar
e5b04d54ff
fix: display amount in account currency if party is supplied
2022-08-25 10:05:25 +05:30
ruthra kumar
ee889afd4c
Merge pull request #31942 from ruthra-kumar/bug_ar_ap_report_include_payment_against_po
...
fix: include payment against PO in AR/AP report
2022-08-25 09:40:45 +05:30
ruthra kumar
36f5883dda
test: payments against so/po will show up as outstanding amount
...
1. Class will use FrappeTestCase fixture
2. setup and teardown methods are introduced
3. test for payments against SO
2022-08-24 13:59:42 +05:30
ruthra kumar
fdd167cac1
fix: include payment against PO in AR/AP report
2022-08-24 12:24:55 +05:30
ruthra kumar
277ef04b60
test: remove discount accounting tests
2022-08-23 15:17:27 +05:30
ruthra kumar
a956e20f29
refactor: disable discount accounting on Buying module(PI)
2022-08-23 11:36:00 +05:30
Deepesh Garg
9fd0c25c9f
Merge pull request #31910 from deepeshgarg007/cash_and_non_trade_discount_fix
...
fix: Cash and non trade discount calculation
2022-08-23 10:19:09 +05:30
Maharshi Patel
42de9ca49e
fix: TDS calculation for advance payment
...
"against_voucher": ["is", "not set"] was used in query due to which if TDS was added on "advance" payment vouchers and then reconciled against purchase invoice. it will not find those vouchers and consider this as first-time threshold due to which it will calculate Tax for all transactions.
(cherry picked from commit a4521437825a960e14556fa3963bd1bd1a55a2dc)
2022-08-22 03:29:46 +00:00
Deepesh Garg
3b15966cc9
fix: Cash and non trade discount calculation
2022-08-21 17:51:05 +05:30
Saqib Ansari
756fe4b375
fix(pos): edge case while closing pos ( #31748 )
...
* fix(pos): edge case while closing pos
* fix: linter
* fix: setting posting_time in pos invoice merge log
2022-08-19 10:22:00 +05:30
ruthra kumar
72a7ed5b58
Merge pull request #31871 from ruthra-kumar/fix_gross_profit_valuation_rate
...
fix: incorrect buying amount in Gross Profit rpt
2022-08-18 16:08:19 +05:30
ruthra kumar
967dd398e7
fix: incorrect buying amount in Gross Profit rpt
2022-08-17 16:21:03 +05:30
ruthra kumar
ea84c157e0
Merge pull request #31856 from ruthra-kumar/incorrect_tax_due_to_exchange_rate
...
fix: incorrect tax amt due to different exchange rate in PR and PI
2022-08-17 15:05:57 +05:30
ruthra kumar
5fd0770372
fix: incorrect tax amt due to different exchange rate in PR and PI
2022-08-16 16:41:33 +05:30
hrzzz
3ef551872a
fix: remove spaces and order import
2022-08-15 09:23:56 -03:00
hrzzz
27891ecb77
feat: two new filters for gross profit
2022-08-15 09:14:23 -03:00
Deepesh Garg
79ac50d0f7
fix: Unable to make payment entry against Fees using education app
2022-08-11 19:31:31 +05:30
Saqib Ansari
33762dbbac
fix(pos): error while consolidating pos invoices
2022-08-10 14:17:28 +05:30
Akash Krishna
32b30bc5de
Tds report ( #31801 )
...
* fix: TDS Computation Summary Report not loading, too many values to unpack
2022-08-09 17:41:02 +05:30
Raffael Meyer
6b510546ae
fix: german translations ( #31732 )
2022-08-09 15:11:52 +05:30
Deepesh Garg
b85dbdc3c1
Merge pull request #31777 from ruthra-kumar/intercompany_po_bug
...
fix: intercompany SO created from Purchase Order throws exception
2022-08-08 16:06:09 +05:30
Sagar Vora
a3625b3817
fix: set billing_address for purchases in get_party_details
2022-08-08 06:04:10 +00:00
ruthra kumar
af0a353b79
fix: intercompany SO throws exception
2022-08-04 14:01:23 +05:30
ruthra kumar
ef312b8fc4
test: posting_date should not affect outstanding amount calculation
2022-08-04 09:38:01 +05:30
ruthra kumar
5f1562c5b2
fix: posting_date of linked vouchers should not affect outstanding
...
posting_date filter should not be applied for linked vouchers.
2022-08-04 09:38:01 +05:30
HarryPaulo
ea88451875
fix: getting error to show sales invoice group or print rep… ( #31756 )
...
fix: formatter getting error to show sales invoice group or print report.
1 - When I view the Gross Profit report in Sales Invoice mode, the table is all broken.
Error on browser console:
TypeError: Cannot read properties of undefined (reading 'indent')
2 - When I try to print, no matter the Group (Sales Invoice, Item Code, Item Group...) nothing happens. in browser log console I have the following error:
TypeError: Cannot read properties of undefined (reading 'content')
i fixed both errors and all working perfectly.
2022-08-03 11:21:30 +05:30
Devin Slauenwhite
9c580dde39
fix: linter ( #31763 )
2022-08-03 11:16:59 +05:30
Suraj Shetty
273c6ff598
Merge pull request #31690 from phot0n/fix-payments-stuff
2022-07-27 14:37:15 +05:30
phot0n
0048bcb067
chore: fix linter
2022-07-27 12:34:52 +05:30
Deepesh Garg
1e3918d637
Merge pull request #31286 from SolufyPrivateLimited/solufy_rec_pay_report
...
fix: Added total of future amount, Remaining Balance in Payable and Receivable reports
2022-07-27 08:26:16 +05:30
Deepesh Garg
98b42ce786
Merge pull request #31676 from ruthra-kumar/fix_tax_withholding_checkbox_on_PI
...
fix: enable tax withholding checkbox in PI with supplier_tds
2022-07-25 12:56:29 +05:30
Gavin D'souza
cb73528c9c
test: Use assertSequenceEqual for comparision between Tuple / Lists
...
Use AssertSequence for type agnostic checks
2022-07-25 11:54:49 +05:30
phot0n
ef14da21bc
fix: payment utils import paths
...
Since we're splitting payments app from frappe, updating
ERPnext paths as well
2022-07-25 10:38:09 +05:30
ruthra kumar
b461724416
fix: enable tax withholding checkbox in PI with supplier_tds
2022-07-22 14:32:14 +05:30
ruthra kumar
04c1019242
fix: update SO's percentage billed on credit note
...
Credit Note created from Sales Return will update precentage billed in
Sales Order accordingly
2022-07-21 13:05:34 +05:30
ruthra kumar
739d328412
Merge pull request #31537 from ruthra-kumar/add_index_to_payment_ledger
...
refactor: create index for payment ledger
2022-07-21 12:50:39 +05:30
Saqib Ansari
d578afab55
fix: rounding errors while closing pos ( #31654 )
2022-07-21 12:18:28 +05:30
Saqib Ansari
2eaa8b17bd
fix(pos): validate product bundles while submitting pos invoice ( #31615 )
2022-07-21 12:17:58 +05:30
Rucha Mahabal
f222284c33
Merge branch 'develop' into hr-separation
2022-07-20 15:47:40 +05:30
Rucha Mahabal
f2532a6aaa
Merge branch 'develop' into hr-separation
2022-07-20 14:22:27 +05:30
Nabin Hait
516be870df
fix: Renamed status field to gle_processing_status
2022-07-20 11:07:02 +05:30
Rucha Mahabal
b30f66c029
chore: use get_single_value in place of get_value
2022-07-19 17:51:03 +05:30
Nabin Hait
69b906438d
fix: set status on submit/cancel
2022-07-19 15:05:56 +05:30
Nabin Hait
914a388ee3
test: Added test for PCV cancellation
2022-07-19 14:34:01 +05:30
Nabin Hait
4caaab32d1
perf: Optimization of gl entry processing logic in period closing voucher
2022-07-19 14:33:49 +05:30
Deepesh Garg
a6ff4db2ec
fix: Supplier details in TDS monthly report ( #31599 )
2022-07-19 10:14:44 +05:30
Rucha Mahabal
db586afc7b
chore: Remove Salary Component Accounts doctype from Accounts module
2022-07-13 13:38:58 +05:30
Rucha Mahabal
d8aa1c59f1
Merge branch 'develop' into hr-separation
2022-07-12 19:27:19 +05:30
Deepesh Garg
9b40f70ac2
Merge branch 'develop' into add_index_to_payment_ledger
2022-07-11 21:18:10 +05:30
Deepesh Garg
0b822dade0
Merge pull request #31566 from deepeshgarg007/ignore_account_currency
...
fix: Allow multi currency invoice against single party account
2022-07-11 21:14:02 +05:30
Rucha Mahabal
5a51951224
test: Basic Payment Entry for Employee
2022-07-11 14:36:33 +05:30
Deepesh Garg
c83fbd5c50
fix: Allow multi currency invoice against single party account
2022-07-11 13:43:01 +05:30
Rucha Mahabal
cd9a01be5f
test: Loan entries in Bank Reco Statement report
2022-07-11 11:57:25 +05:30
ruthra kumar
74d9fc2155
refactor: create index for payment ledger
2022-07-11 11:17:27 +05:30
Rucha Mahabal
f6fb00b59d
test: Matching Loan Repayment query in Bank Reco
2022-07-08 19:28:38 +05:30
Rucha Mahabal
108cce2785
refactor: rewrite raw sql queries with frappe.qb and database API
2022-07-07 19:00:19 +05:30
Rucha Mahabal
ef02e58859
Merge branch 'develop' into hr-separation
2022-07-07 13:46:54 +05:30
Sagar Sharma
f9885746a8
Merge branch 'develop' into subcontracting
2022-07-07 09:56:23 +05:30
Nihantra C. Patel
3e670eda68
fix: Set the condition to create a purchase receipt
2022-07-05 21:19:50 +05:30
Deepesh Garg
37f7801cfb
Merge pull request #29884 from resilient-tech/remove-india
...
refactor: remove India specific code
2022-07-05 18:50:41 +05:30
Sagar Sharma
f75d35ed60
Merge branch 'develop' into subcontracting
2022-07-05 11:25:08 +05:30
ruthra kumar
104c45ecc4
fix: test pr output for amount and currency
2022-07-04 18:04:29 +05:30
Deepesh Garg
ac9d38aa1c
Merge pull request #31499 from ruthra-kumar/bug_use_account_currency_on_reconciliation_tool
...
fix: Use account currency on Payment Reconciliation tool
2022-07-03 19:20:29 +05:30
Sagar Vora
05351bee8b
Merge remote-tracking branch 'upstream/develop' into remove-india
2022-07-03 18:07:44 +05:30
Deepesh Garg
b168d2fc25
Merge branch 'develop' of https://github.com/frappe/erpnext into e_invoice_discounts
2022-07-03 11:02:32 +05:30
Deepesh Garg
38352b3e46
test: Add test for einvoice discounts
2022-07-02 22:27:20 +05:30
Deepesh Garg
b4f6429e32
Merge branch 'develop' of https://github.com/frappe/erpnext into e_invoice_discounts
2022-07-02 18:42:31 +05:30
Rucha Mahabal
466bf99835
fix: Remove Expense Claim from Bank Reconciliation
...
- add hooks `get_matching_queries` and `bank_reconciliation_doctypes` to extend the functionality in other apps
2022-07-01 19:01:17 +05:30
ruthra kumar
c9d67defd8
test: PR output should have account currency
2022-07-01 13:02:14 +05:30
ruthra kumar
219855311d
fix: wrong amount fetched in payment reconciliation tool
...
- fetch amount on account currency for outstanding invoices and
- unreconcilied dr/cr notes
- fix currency field name in payment ledger entry creation
2022-07-01 12:47:07 +05:30
Rucha Mahabal
3051f6e7f2
fix: Update triggers on Payment Reconciliation
2022-06-30 21:37:55 +05:30
Deepesh Garg
536e768ba9
fix: Internal PI link in Sales Invoice
2022-06-30 21:29:54 +05:30
Sagar Sharma
6589c5f5e9
Merge branch 'develop' into subcontracting
2022-06-29 17:29:24 +05:30
Rucha Mahabal
ef63c61ebd
Merge branch 'develop' into hr-separation
2022-06-29 12:35:51 +05:30
Deepesh Garg
3bbbf02ca8
Merge pull request #31460 from ruthra-kumar/bug_ar/ap_rpt_delivery_note
...
fix: 'attribute error' on AR/AP report with delivery note filter
2022-06-29 08:06:34 +05:30
Sagar Sharma
78ff1783b1
Merge branch 'develop' into subcontracting
2022-06-28 22:20:32 +05:30
Rucha Mahabal
6a65c8aff4
Merge branch 'develop' into hr-separation
2022-06-28 11:51:59 +05:30
Rucha Mahabal
2b255bdddb
fix: Bank Statement loan amount query
2022-06-27 19:18:13 +05:30
ruthra kumar
3cd34ebab6
fix: 'attribute error' on AR/AP report with delivery note filter
2022-06-27 17:29:25 +05:30
Sagar Vora
7f390fb755
Merge branch 'develop' into remove-india
2022-06-26 18:10:44 +05:30
Deepesh Garg
9c1eb770ba
Merge pull request #31442 from ruthra-kumar/incorrect_outstanding_on_multiple_cost_centers
...
fix: incorrect outstanding for invoice
2022-06-25 19:42:14 +05:30
Deepesh Garg
6acd0325be
fix: General Ledger and TB opening entries mismatch issues
2022-06-24 21:45:05 +05:30
ruthra kumar
321fea322c
test: invoice outstanding when gl's are split on cost center allocat
2022-06-24 17:47:11 +05:30
Sagar Vora
b6133c300e
test: create TDS payable account
2022-06-24 16:46:52 +05:30
Sagar Vora
4a2a02286a
test: create tax withholding category instead of updating
2022-06-24 15:49:19 +05:30
Sagar Vora
69ff61c838
fix: add Lower Deduction Certificate to the Accounting workspace for now
2022-06-24 15:12:43 +05:30
Sagar Vora
593147d337
test: move code to ensure fixtures get created
2022-06-24 14:37:11 +05:30
Sagar Vora
ff10f557c0
test: use Sales Expenses instead of VAT to test disabled account
2022-06-24 13:49:20 +05:30
ruthra kumar
71f6f78d94
fix: incorrect outstanding for invoice
2022-06-24 13:36:15 +05:30
Sagar Vora
0810674c8a
Merge remote-tracking branch 'upstream/develop' into remove-india
2022-06-24 13:08:40 +05:30
Rucha Mahabal
eac58abcc5
chore: Remove HR related reports from other modules
...
- Project Profitability report: Projects
- Employee Hours Utilization Based on Timesheet: Projects
- Unpaid Expense Claims: Accounts
2022-06-23 20:50:55 +05:30
Rucha Mahabal
1ff0e4519f
chore: Extract Expense Claim, FnF, Gratuity, Employee Advance related code from accounting
...
- Added hooks `advance_payment_doctypes`, `invoice_doctypes`, `period_closing_doctypes` for other apps to extend accounting functionality
- Removed `set_query` code from `journal_entry.js` and `payment_entry.js`
- removed `update_status_for_full_and_final_statement` trigger on JE submission/cancellation
- refactored `payment_entry.py`: split functions for validating reference doctypes for easy overriding, removed hrms references from `get_reference_details` and `get_payment_entry`
- removed dead code: functions `get_bill_no_and_update_amounts`, `get_total_amount_exchange_rate_base_on_currency`, `get_total_amount_exchange_rate_for_employee_advance`, `get_amounts_based_on_ref_doc`, `get_amounts_based_on_reference_doctype`
2022-06-23 16:17:34 +05:30
Deepesh Garg
79d5d35df9
Merge pull request #31395 from nihantra/bank_clear_summ
...
fix: filter set in Bank Clearance Summary
2022-06-23 10:54:56 +05:30
Rucha Mahabal
f6fbcc99a3
chore: Removed payroll dependencies from Loan Management, moved to hrms app
...
- Salary Slip Loan dt moved to hrms, removed from erpnext app
- Repay from Salary field removed from Loan and Loan Repayment, installed on hrms app setup
- fixed references to salary slip loan fields
2022-06-21 18:13:01 +05:30
s-aga-r
f6ef3068d7
Merge branch 'develop' into subcontracting
2022-06-20 23:10:31 +05:30
s-aga-r
6d89b2fa28
refactor: backport old subcontracting code
2022-06-20 23:10:02 +05:30
Deepesh Garg
46e6c2cd0f
Merge branch 'develop' of https://github.com/frappe/erpnext into sales_exchange_rate_validation
2022-06-20 22:00:49 +05:30
Deepesh Garg
8f37393044
test: Add test case
2022-06-20 22:00:32 +05:30
Sagar Vora
ec9861266e
Merge remote-tracking branch 'upstream/develop' into remove-india
2022-06-19 22:57:22 +05:30
Deepesh Garg
169ff5a0dd
feat: Cash and Non trade discounts in Sales Invoice
2022-06-19 21:18:12 +05:30
Nihantra C. Patel
0097a2b60c
Update bank_clearance_summary.py
2022-06-17 18:35:11 +05:30
ruthra kumar
3a238b4daa
docs: specification of payment ledger
2022-06-17 17:57:07 +05:30
ruthra kumar
7312f22f35
refactor: update voucher outstanding from payment ledger
...
Outstanding amount is updated from payment ledger, only for
receivable/payable accounts. For remaining account types, update happens
from GL Entry.
2022-06-17 17:57:07 +05:30
ruthra kumar
524c175cf0
refactor: delink gl entry from reconciliation
2022-06-17 17:57:07 +05:30
ruthra kumar
ae8aa8f3e7
refactor: 'get outstanding invoices' popup in payment entry
...
Payment entry has option to select outstanding invoices using a popup
form. This change refactors the pop to use payment ledger to fetch +ve
outstanding invoices.
2022-06-17 17:57:07 +05:30
ruthra kumar
8c87674c62
refactor: outstanding_invoice function and helper class
...
outstanding invoice function has been refactored to use payment ledger
2022-06-17 17:57:07 +05:30
ruthra kumar
9cdc388c97
test: payment reconciliation tool
...
unit test cases for partial reconciliation, return invoice against
invoice, invoice against journals and journal against journal have
been added
2022-06-17 17:57:07 +05:30
ruthra kumar
65f47bca31
refactor: payment reconciliation tool
...
PR uses payment ledger for outstanding invoice and unreconcilied
cr/dr notes.
2022-06-17 17:57:07 +05:30
ruthra kumar
7b383880c6
feat: helper class for quering Payment Ledger
2022-06-17 17:57:07 +05:30
ruthra kumar
05467ffce2
test: use fixture for payment entry test cases ( #31390 )
...
refactor: use fixture for payment entry test cases
2022-06-17 17:23:29 +05:30
Conor
74a782d81d
refactor: DB independent quoting and truthy/falsy values ( #31358 )
...
* refactor: DB independent quoting and truthy/falsy values
* style: reformat to black spec
* fix: ifnull -> coalesce
* fix: coalesce -> Coalesce
* fix: revert pypika comparison
* refactor: convert queries to QB
* fix: incorrect value types for query
`=` query makes no sense with list of values
* fix: remove warehouse docstatus condition
* fix: keep using base rate as rate
Co-authored-by: Ankush Menat <ankush@frappe.io>
2022-06-17 17:01:27 +05:30
s-aga-r
ca24b5287e
chore: make "is_subcontracted" field read-only in PR and PI
2022-06-17 16:47:49 +05:30
s-aga-r
5002f1f1e5
feat: Add hidden field "is_old_subcontracting_flow" in PO, PR and PI
2022-06-17 16:47:41 +05:30
Ankush Menat
74007c8e91
fix(UX): hide irrelevant UOM fields ( #31392 )
...
fix(UX): hide UOM-related fields if they are inconsequential
2022-06-17 15:10:21 +05:30
Ankush Menat
10583eb3ce
fix: UOM handling for transaction without item ( #31389 )
...
If invoice is made without item code then UOM, Stock UOM and
conversion_factor all need to be manually added, this is confusing and
leads missing them out leads to errors.
Simplest solution:
- if either UOM exists then set both to same uom conversion factor to
- also set conversion factor based on UOM conversions
2022-06-17 12:13:27 +05:30
Jingxuan He
b4a93da9f3
chore: Fix a potential variable misuse bug ( #31372 )
...
* Fix a potential variable misuse bug
* chore: Separate check (separate line) for empty table in Pricing Rule
* chore: Code readability & check for field in row (now row itself)
Co-authored-by: marination <maricadsouza221197@gmail.com>
2022-06-16 12:16:59 +05:30
Ankush Menat
86919d2a6d
test: silent test failure in stock assertions ( #31377 )
...
If actual values are not present then test is silently passing, # of
actual values should be at least equal to expected values.
2022-06-15 21:19:09 +05:30
Ankush Menat
5c6f22f275
refactor: simpler batching for GLE reposting ( #31374 )
...
* refactor: simpler batching for GLE reposting
* test: add "actual" test for chunked GLE reposting
2022-06-15 19:30:26 +05:30
Rushabh Mehta
c0f9b34ede
fix(minor): move variants to separate tab ( #31354 )
...
* fix(minor): move variants to separate tab
* fix(minor): variants tab
* fix(minor): add counts
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
Co-authored-by: Ankush Menat <ankush@frappe.io>
2022-06-15 16:08:05 +05:30
Rucha Mahabal
0f83e7af56
fix: removed expense claim, advance and salary slip updates from PE/JE events
...
- moved them to HRMS app hooks
2022-06-15 13:58:41 +05:30
Conor
b8f728a40a
refactor: use CURRENT_DATE instead of CURDATE() ( #31356 )
...
* refactor: use CURRENT_DATE instead of CURDATE()
* style: reformat to black spec
* refactor: use QB for auto_close queries
Co-authored-by: Ankush Menat <ankush@frappe.io>
2022-06-15 12:07:33 +05:30
Sagar Sharma
406114374b
Merge branch 'develop' into subcontracting
2022-06-14 06:44:29 -07:00
s-aga-r
9a68af36ec
Merge branch 'develop' into subcontracting
2022-06-14 19:13:10 +05:30
Ankush Menat
2535d5edd0
perf: GLE reposting with progress and chunking ( #31343 )
...
If stock voucher count goes >1000 then fetching all gles and reposting
them all at once requires much more memory and can cause crash.
- This PR ensures that GLE reposting is done in chunks of 100 vouchers.
- This PR also starts keeping track of how many such chunks were
processed so in future progress is resumed in event of timeout.
2022-06-14 18:20:33 +05:30
Deepesh Garg
d05d15346a
fix: Conversion rate validation for multi-currency invoices
2022-06-14 12:50:49 +05:30
Deepesh Garg
5b2ba087a3
Merge branch 'develop' of https://github.com/frappe/erpnext into quotation_issues
2022-06-14 10:50:47 +05:30
Conor
00ef499739
refactor: use db independent offset syntax ( #31345 )
...
* chore: use db independent offset syntax
* fix: typo
* style: reformat code to black spec
Co-authored-by: Ankush Menat <ankush@frappe.io>
2022-06-14 10:49:07 +05:30
Sagar Sharma
f755430098
Merge branch 'develop' into subcontracting
2022-06-13 03:00:53 -07:00
Ankush Menat
697fbe946a
Merge pull request #31337 from gavindsouza/get_fiscal_years-refactor
...
refactor: get_fiscal_years API
2022-06-13 14:56:33 +05:30
Solufyin
0410752fcf
Merge branch 'frappe:develop' into solufy_rec_pay_report
2022-06-13 13:20:41 +05:30
Gavin D'souza
0727d1d99b
refactor: get_fiscal_years API
...
* Optimize fiscal year options generation
* Don't pass unrequired criterions / values to prepared query
* Use QB notation for raw query
2022-06-13 12:43:08 +05:30
Deepesh Garg
ea276a7b86
Merge branch 'develop' into refactor_ar/ap_report
2022-06-13 12:34:47 +05:30
ruthra kumar
3018756482
refactor: remove 'show remarks'
2022-06-13 10:56:33 +05:30
ruthra kumar
71521b6550
refactor: unit test for AR/AP report
2022-06-13 10:56:33 +05:30
ruthra kumar
cd9d70d6ee
refactor: show advance payments in AR/AP report
2022-06-13 10:56:33 +05:30
ruthra kumar
dfe3082596
refactor: AR/AP will use payment ledger
2022-06-13 10:56:30 +05:30
Deepesh Garg
eb93564db6
Merge branch 'develop' of https://github.com/frappe/erpnext into quotation_issues
2022-06-11 21:56:24 +05:30
Deepesh Garg
243625898e
fix(India): Sales taxes and charges template fetching in quotation
2022-06-10 22:05:58 +05:30
barredterra
f6695909c4
fix: remove DATEV from accounting workspace
2022-06-10 15:51:02 +02:00
Deepesh Garg
3d76b1a093
Merge pull request #31182 from ruthra-kumar/migrate_gl_to_payment_ledger_using_sql
...
refactor: migrating data from GL to payment ledger using raw SQL
2022-06-10 17:15:58 +05:30
hendrik
74b274f555
fix: update Period Closing Voucher per Company
...
Validate period closing voucher company-wise
2022-06-10 14:52:53 +05:30
Ankush Menat
450bef8443
Merge pull request #31240 from ankush/repost_match_gle
...
fix: unnecessary GLE reposts
2022-06-10 14:51:45 +05:30
Ankush Menat
1646fbe478
refactor: remove add_fetch ( #31315 )
...
- Sales Team already had fetch from set up
- Set up fetch from on sales partner in sales transaction
Reason for removal: the JS code applies arbitrarily to any field called "sales_person"
2022-06-10 13:52:17 +05:30
Deepesh Garg
9562c28408
Merge pull request #31198 from HarryPaulo/gross-profit-monthly-schedule
...
feat: two new groupby mode on gross profit: Monthly, Payment Term
2022-06-10 12:52:35 +05:30
Deepesh Garg
a2f34d74f3
Merge pull request #31225 from vishdha/fix_date_range_print
...
fix: Print/PDF for financial statement reports displays either wrong date range or wrong fiscal year
2022-06-10 10:52:53 +05:30
Deepesh Garg
43bf327f9b
Merge pull request #31216 from sunhoww/patch-4
...
fix: Trial Balance failing to ignore Finance Book
2022-06-09 20:34:33 +05:30
Sun Howwrongbum
ee2949aa3f
fix: typo in sql condition
2022-06-09 19:28:59 +05:30
Deepesh Garg
b9dbb36d0e
chore: Linting Issues
2022-06-09 18:58:04 +05:30
Marica
60968419e7
Merge pull request #31296 from ruthra-kumar/misalinged_columns_in_AR_report
...
fix: misaligned columns in print format of AR/AP report
2022-06-09 17:35:21 +05:30
ruthra kumar
bbaa14af16
fix: misaligned columns in print format of AR/AP report
2022-06-09 15:14:44 +05:30
Ankush Menat
eb53a9727d
perf: commit GL reposting periodically
...
If you have a huge list of docs to repost then maintaining transaction
throughtout entire GL reposting is not only unnecessary but also creates
performance issues. Periodically commiting the changes prevents lost
progress and reduces memory usage.
2022-06-09 11:37:43 +05:30
Ankush Menat
67c26325ee
fix: unnecessary GLE reposts
...
In Sales/Purchase invoices credit/debit are flipped and negated while making GLE,
this is unflipped while posting them but if we compare the flipped ones
it will always result in comparison failure and repost it.
2022-06-09 11:37:40 +05:30
Nihantra C. Patel
43b0f2efe6
[DEV] Accounts: Added total of future amount, Remaining Balance in Payable and Receivable reports.
2022-06-08 17:36:42 +05:30
Rushabh Mehta
b29edb302c
Merge pull request #31284 from rmehta/item-form-cleanup
...
fix(ux): Add tabs in Item
2022-06-08 17:01:57 +05:30
Sagar Sharma
f7a52f76d4
Merge branch 'develop' into subcontracting
2022-06-08 04:27:24 -07:00
Rushabh Mehta
5c6937865c
fix(ux): Add tabs in Item
2022-06-08 16:30:44 +05:30
Ankush Menat
f830b57fd4
test: sales register report with conditions
2022-06-07 15:23:32 +05:30
Ankush Menat
25f9d58c34
Merge pull request #31209 from ankush/purch_return_gle
...
fix: purchase invoice standalone return GLEs
2022-06-07 14:28:17 +05:30
Deepesh Garg
eae4f64dd8
Merge pull request #31233 from deepeshgarg007/pi_cancel_provisional_gl_entries
...
fix: Reverse provisional entries on Purchase Invoice cancel
2022-06-07 13:31:02 +05:30
Ankush Menat
7726271e2a
fix: purchase invoice return GLe
...
voucher_wise_stock_value contains tuples and the condition was looking
for string, so it's never triggered.
Caused by https://github.com/frappe/erpnext/pull/24200
2022-06-07 12:08:20 +05:30
Deepesh Garg
dc8e80ea81
test: Add test coverage for cancellation
2022-06-07 11:35:03 +05:30
Vishal Dhayagude
934cb97d90
Merge branch 'develop' into fix_date_range_print
2022-06-06 21:34:14 +05:30
Deepesh Garg
fe5b9e8bbb
Merge branch 'develop' into patch-4
2022-06-06 16:45:20 +05:30
vishdha
53774e0f52
chore: minor change in fetching start and end date
2022-06-06 16:00:56 +05:30
vishdha
3513d54c0a
fix: Print/PDF for financial statement reports displays either wrong date range or wrong fiscal year
2022-06-06 16:00:56 +05:30
Ankush Menat
c3219ebad1
fix(Sales Register): incorrect query with dimensions
...
If accounting dimension is also part of the default filters then same
query is repeated with incorrect syntax.
e.g. `item_group = (child1, child2)` instead of `in` query.
fix: don't add default filter if they are part of dimensions to be
added.
2022-06-06 12:39:12 +05:30
Sagar Sharma
74fae72939
Merge branch 'develop' into subcontracting
2022-06-06 10:27:25 +05:30
Deepesh Garg
aad887bab9
Merge branch 'develop' into patch-4
2022-06-06 09:16:22 +05:30
Deepesh Garg
8b56f0559e
Merge branch 'develop' into item_wise_report_perf
2022-06-06 09:01:37 +05:30
Deepesh Garg
86a24f3d22
fix: Simply cancel reverse entries
2022-06-05 19:12:24 +05:30
Deepesh Garg
61fa4eb6c9
fix: Reverse provisional entries on Purchase Invoice cancel
2022-06-05 18:23:24 +05:30
Deepesh Garg
a200e7e1fb
fix: Remove redundant query
2022-06-05 11:16:12 +05:30
s-aga-r
992ba974e2
Merge branch 'develop' into subcontracting
2022-06-03 13:25:49 +05:30
Deepesh Garg
3f376cc3a5
fix: Parent dimension filters in orders
2022-06-02 13:57:54 +05:30
Sun Howwrongbum
48bde2de2a
fix: Trial Balance failing to ignore Finance Book
2022-06-01 20:20:16 +05:30
hrzzz
c4af63ad98
feat: two new groupby mode: Monthly, Payment Term
2022-05-31 10:46:56 -03:00
Mitchy25
a0c412a0dd
Ignore Cancelled GL Entries
...
Profitability Analysis includes 'is_cancelled' GL Entries which means that the profit numbers are incorrect. This change will ensure that the profit figures ignore cancelled GL Entries.
2022-05-31 15:25:09 +12:00
ruthra kumar
4c74637c91
refactor: remove naming expression for payment ledger
2022-05-30 19:06:56 +05:30
HarryPaulo
4b04694c2c
fix(pos): freeze screen while processing pos invoices ( #30850 )
2022-05-27 12:16:07 +05:30
Sagar Sharma
bcaac8f90f
Merge branch 'develop' into subcontracting
2022-05-26 15:01:23 +05:30
Saqib Ansari
ca75d814a3
fix: timesheet fetching in sales invoice
...
(cherry picked from commit 216c32f4bc13376335ae31bd09fe6b5c01855ba2)
2022-05-25 14:45:41 +00:00
xdlumertz
c5e922c76b
fix: Chart data for monthly periodicity in Cash Flow report ( #31039 )
...
fix: Chart data for monthly periodicity in Cash Flow report
2022-05-25 19:39:59 +05:30
Deepesh Garg
efa5b5b3db
Merge pull request #31038 from alyf-de/taxes-title-field
...
feat: show title when linking Taxes and Charges Template
2022-05-25 19:28:59 +05:30
Deepesh Garg
d68187caae
Merge branch 'develop' into loan_doc_reco_queries
2022-05-25 18:50:54 +05:30
Deepesh Garg
9e4a36089e
chore: Linting Issues
2022-05-25 18:10:42 +05:30
Deepesh Garg
a1f53f8d31
chore: Linting Issues
2022-05-25 17:59:40 +05:30
Deepesh Garg
147fc8fde7
fix: Loan Doc query in Bank Reconciliation Statement
2022-05-25 17:58:30 +05:30
Deepesh Garg
ac17ecb84b
Merge branch 'develop' into party_account_currency_check
2022-05-25 16:21:06 +05:30
Deepesh Garg
bc34737709
chore: Update test case
2022-05-25 15:42:47 +05:30
Sagar Sharma
07dc5f180d
Merge branch 'develop' into subcontracting
2022-05-21 10:02:47 +05:30
ruthra kumar
dac678e3fc
test: payment ledger entry
2022-05-20 18:21:47 +05:30
ruthra kumar
e888975007
refactor: link payment ledger with gl entry creation
2022-05-20 18:21:47 +05:30
ruthra kumar
59ed7c854d
refactor: ignore linked Payment Ledger Entry in basic transactions
2022-05-20 18:21:47 +05:30
ruthra kumar
451cf3a937
refactor: helper class for ple creation and delinking
...
Helper functions for delinking ple and for creating payment ledger
entry for transactions on receivable/payable account types
2022-05-20 18:21:47 +05:30
ruthra kumar
163085f201
feat: payment ledger doctype created
2022-05-20 18:21:47 +05:30
Sagar Sharma
213113bc00
Merge branch 'develop' into subcontracting
2022-05-20 12:13:13 +05:30
Sagar Sharma
5fa3f58c06
refactor!: Purchase Invoice
2022-05-20 10:45:33 +05:30
Sagar Sharma
409df263e8
refactor!: change "is_subcontracted" field type from "Select" to "Check"
2022-05-20 10:45:33 +05:30
barredterra
cad64f19b7
feat: show title field for Sales Taxes and Charges
2022-05-16 16:19:53 +02:00
barredterra
9553319d87
feat: show title field for Purchase Taxes and Charges
2022-05-16 16:19:32 +02:00
Deepesh Garg
65232edfd5
test: Update test cases
2022-05-16 10:52:58 +05:30
Deepesh Garg
5b8726405d
fix: Remove validation from Journal Entry
2022-05-15 21:10:52 +05:30
Rohit Waghchaure
69be22ba7c
fix: select multiple values for accounting dimenssion
2022-05-14 17:19:34 +05:30
HarryPaulo
328b1b54d9
fix: payments duplicate on pos closing entry ( #30976 )
2022-05-13 15:06:02 +05:30
Saqib Ansari
319c858d63
Merge pull request #30968 from nextchamp-saqib/validate-on-hold-invs
...
fix(accounts): minor fixes & validations
2022-05-12 22:06:35 +05:30
Deepesh Garg
33d9767382
Merge branch 'develop' of https://github.com/frappe/erpnext into party_account_currency_check
2022-05-12 16:40:29 +05:30
Saqib Ansari
6c16422beb
test: sales_invoice_with_disabled_account
2022-05-12 12:05:53 +05:30
Saqib Ansari
92613777b9
test: payment_entry_against_onhold_purchase_invoice
2022-05-12 11:17:36 +05:30
Saqib Ansari
95b059a98c
fix: validate disabled accounts before posting ledger entries
2022-05-11 13:26:15 +05:30
Saqib Ansari
b0f302e579
fix: validate on hold purchase invoices in payment entry
2022-05-11 12:42:35 +05:30
Saqib Ansari
cf13a20438
feat(india): generate qrcode button for e-invoice ( #30939 )
2022-05-10 12:07:47 +05:30
Ankush Menat
05dd1d6d15
refactor: tax rule validity query ( #30934 )
2022-05-09 19:26:13 +05:30
HarryPaulo
ebbe27c183
fix: subtract change_amount from paid_amount field on POS Register ( #30922 )
2022-05-09 15:14:57 +05:30
Deepesh Garg
c05144fb60
Merge pull request #30897 from deepeshgarg007/general_ledger_consolidated
...
fix: Consider party and party type as well in group by consolidated view
2022-05-06 13:10:00 +05:30
Deepesh Garg
cf4128edba
Merge pull request #30900 from alyf-de/bank-account-website
...
feat: remove website from bank account
2022-05-06 13:01:28 +05:30
Deepesh Garg
826c3f5c63
Merge pull request #30899 from deepeshgarg007/timesheet_link
...
fix: Show linked time sheets in sales invoice dashboard
2022-05-04 19:54:06 +05:30
barredterra
f1b8a969cf
feat: remove website from bank account
2022-05-04 15:51:52 +02:00
Deepesh Garg
3e38dc7ea8
fix: Show linked time sheets in sales invoice dashboard
2022-05-04 17:30:52 +05:30
Deepesh Garg
c2d52a1ac0
fix: Consider paryt and party type as well in group by consolidated view
2022-05-04 15:59:24 +05:30
Deepesh Garg
e8d6eb207d
fix: Ignore loan repayments made from salary slip
...
(cherry picked from commit b7e1d40e43c136f0e967111e10af95ddc80e2fd5)
2022-05-04 04:15:07 +00:00
Deepesh Garg
2e3e666784
Merge branch 'develop' of https://github.com/frappe/erpnext into erpnext_setup_cleanup
2022-05-03 18:17:36 +05:30
Deepesh Garg
e0fd980bcc
Merge pull request #30848 from deepeshgarg007/cost_center_filter_p_r
...
fix: Cost center filter in payment reconciliation
2022-05-02 17:58:45 +05:30
Deepesh Garg
b440dabe12
test: Add test for payment reconciliation
2022-05-02 16:09:48 +05:30
Rushabh Mehta
548afba8bb
fix(minor): update frappe.error_log to new API ( #30864 )
...
* fix(minor): update frappe.error_log to new API
* refactor: changes for updated log_error api
Co-authored-by: Ankush Menat <ankush@frappe.io>
2022-05-02 15:04:26 +05:30
Ankush Menat
bae8ab2fa9
Merge branch 'develop' into education_sepration
2022-05-02 11:47:37 +05:30
Deepesh Garg
c7edc29152
Merge branch 'develop' of https://github.com/frappe/erpnext into cost_center_filter_p_r
2022-04-30 22:11:43 +05:30
Deepesh Garg
ab94b73e93
fix: Cost center filter on payment reconciliation
2022-04-29 18:06:13 +05:30
Deepesh Garg
a8452c2ba2
fix: Multi currency opening invoices
2022-04-29 14:27:03 +05:30
Deepesh Garg
1622faad40
Merge pull request #30802 from deepeshgarg007/multi_currency_opening
...
fix: Allow multi-currency opening invoices
2022-04-29 13:34:54 +05:30
Deepesh Garg
f25251bb70
chore: Clean up patches
2022-04-29 12:42:29 +05:30
Deepesh Garg
44c54f69f8
chore: Remove references for Student doctype
2022-04-28 16:16:47 +05:30
Deepesh Garg
429361ce87
chore: Remove domains from Setup
2022-04-27 13:32:51 +05:30
Ankush Menat
88e257ff6d
fix: column name in party query
2022-04-26 11:47:05 +05:30
Ankush Menat
052171f51c
fix: date condition in tax rule
2022-04-26 11:47:05 +05:30
Ankush Menat
a90e7e32a4
fix: proper quoting in sql queries
2022-04-26 11:47:05 +05:30
Deepesh Garg
d3582ea399
fix: Allow multi-currency opening invoices
2022-04-25 18:18:39 +05:30
Deepesh Garg
4ffea617ef
Merge pull request #30754 from deepeshgarg007/round_off_account_cost_center
...
fix: First preference to parent cost center rather than round off cost center
2022-04-25 17:06:19 +05:30
Deepesh Garg
3fa1c63479
test: Unit test for round off entry dimensions
2022-04-25 16:29:26 +05:30
Deepesh Garg
f064e0b15e
Merge pull request #30642 from rahib-hassan/separate-discount-account
...
feat: separate discount accounting for buying and selling
2022-04-25 14:07:20 +05:30
Deepesh Garg
02aaa6546c
chore: Remove dead code
2022-04-25 12:42:06 +05:30
rahib-hassan
6c86067d90
Merge branch 'develop' into separate-discount-account
2022-04-25 12:17:50 +05:30
Deepesh Garg
618fa0e8ea
Merge branch 'develop' into accpunting_dimension_validate_ignore_new
2022-04-24 20:55:50 +05:30
Deepesh Garg
afc6aa88f0
Merge pull request #30763 from deepeshgarg007/loan_reconciliation
...
fix: Add loan doctypes in bank clearance
2022-04-24 20:55:29 +05:30
Deepesh Garg
c515abc392
test: Remove teardown method
2022-04-24 19:20:29 +05:30
Deepesh Garg
c312cd3725
fix: Check if accounting dimension exists
2022-04-24 18:11:32 +05:30
Deepesh Garg
783793deac
Merge branch 'develop' of https://github.com/frappe/erpnext into round_off_account_cost_center
2022-04-23 21:40:38 +05:30
Deepesh Garg
015812b0b8
fix: Add accounting dimensions for round off GL Entry
2022-04-23 21:40:08 +05:30
Deepesh Garg
d4d83f4bb6
test: Fixes in test case
2022-04-23 12:33:35 +05:30
Deepesh Garg
0eacc99ab7
test: Fixes in test case
2022-04-23 12:08:30 +05:30
Deepesh Garg
9bb132fdd3
fix: Do not validate while creating accounting dimension
2022-04-22 13:39:43 +05:30
Deepesh Garg
8a8476bb5c
test: Add test coverage for bank clearance
2022-04-21 18:53:18 +05:30
Deepesh Garg
c42547d40f
fix: Use parent cost center for Sales and Purchase Invoice
2022-04-21 13:26:44 +05:30
rahib-hassan
02e17dbded
fix: removed manual enable-discount-account method
2022-04-21 02:42:42 +05:30
rahib-hassan
2c78cc2014
fix: removed manual rollback - enable discount account
2022-04-21 02:40:59 +05:30
Deepesh Garg
3d0e68acaa
fix: select doctype as payment_document
2022-04-20 19:49:53 +05:30
Deepesh Garg
c3e27b5556
fix: Loan doctypes in bank reconciliation
2022-04-20 19:07:53 +05:30
rahib-hassan
13092bcc2d
fix: enable discount roll_back
2022-04-20 16:46:29 +05:30
rahib-hassan
1e143e7479
fix: use @change_settings to enable_discount_account
2022-04-20 16:06:55 +05:30
rahib-hassan
f058755ad3
fix: test cases updated
2022-04-20 13:24:15 +05:30
Deepesh Garg
0ac11a5b30
fix: First preference to parent cost center rather than round off cost center
2022-04-20 12:18:11 +05:30
