Raffael Meyer
e526a0e282
Merge branch 'develop' into validate-accounts-dates
2022-12-05 19:37:54 +01:00
Raffael Meyer
a2abc879c9
Merge branch 'develop' into validate-project-dates
2022-12-05 19:37:46 +01:00
barredterra
748c74ba52
fix: add translation variable order
2022-12-05 18:24:22 +01:00
rohitwaghchaure
d0478ec3b8
Merge pull request #33224 from rohitwaghchaure/fixed-partial-work-order-incorrect-batch-picked
...
fix: non empty FG batch picked while completing work order
2022-12-05 20:29:19 +05:30
Rohit Waghchaure
713330cbf6
fix: non empty FG batch picked while completing work order
2022-12-05 18:15:13 +05:30
Deepesh Garg
0581000990
fix: Remove free items
2022-12-05 17:59:02 +05:30
ruthra kumar
7bd0e977bf
Merge pull request #33222 from ruthra-kumar/data_import_errors_for_sales_invoice
...
fix: data import mandatory account_head, charge_type
2022-12-05 16:56:43 +05:30
ruthra kumar
3814db02eb
fix: data import mandatory account_head, charge_type
2022-12-05 16:24:05 +05:30
Deepesh Garg
55c0770280
Merge branch 'develop' of https://github.com/frappe/erpnext into buying_selling_pricing_rule
2022-12-05 15:43:29 +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
anandbaburajan
83ed93fbb6
chore: refactor chart and manual set_accumulated_depreciation logic
2022-12-04 22:45:48 +05:30
barredterra
31db0e7c79
refactor: validate parent_expected_end_date in Task
2022-12-04 15:28:38 +01:00
barredterra
2c4eb371a6
refactor: validate dates in project and task
2022-12-04 15:15:07 +01:00
anandbaburajan
ca8c827492
chore: refactor schedules in split_asset functions
2022-12-04 19:22:58 +05:30
barredterra
eb66b749b2
refactor: validate dates in accounts module
2022-12-04 14:41:21 +01:00
Raffael Meyer
083a954b5d
Merge branch 'develop' into validate-employee-dates
2022-12-04 14:30:51 +01:00
Deepesh Garg
b741ae143c
fix: Reapply pricing rule on qty change
2022-12-02 17:14:06 +05:30
rohitwaghchaure
66dbf94151
Merge pull request #33199 from s-aga-r/refactor/warehouse-tree
...
refactor: remove `balance` from `Warehouse Tree`
2022-12-02 14:24:07 +05:30
rohitwaghchaure
295ce0e8e9
Merge pull request #33193 from rohitwaghchaure/clear-repost-logs
...
fix: clear repost logs using Log Settings
2022-12-02 13:55:59 +05:30
Rohit Waghchaure
2cce6f2a34
fix: test case
2022-12-02 12:43:31 +05:30
Sagar Sharma
b3ae6cc4b9
Merge branch 'develop' into refactor/warehouse-tree
2022-12-02 10:58:33 +05:30
Deepesh Garg
2058fac177
Merge pull request #33195 from ruthra-kumar/type_error_on_sales_pipeline_report
...
fix: type error on Sales Pipeline Analytics
2022-12-02 10:10:36 +05:30
Rohit Waghchaure
5949a7ecff
fix: default clear repost logs
2022-12-01 23:35:21 +05:30
Deepesh Garg
f54838ab56
fix: Buying and selling check in pricing rule
2022-12-01 21:23:17 +05:30
s-aga-r
3ce8386ca3
refactor: remove balance from Warehouse Tree
2022-12-01 19:44:49 +05:30
Deepesh Garg
2106de0fa5
Merge pull request #33170 from deepeshgarg007/se_alert_develop
...
fix(UX): Alert on change of item rate in Stock Entry
2022-12-01 18:16:55 +05:30
Deepesh Garg
9ddd838f2d
Merge pull request #33183 from deepeshgarg007/month_end_due_date
...
fix: Due date for month end payment term
2022-12-01 18:16:13 +05:30
ruthra kumar
4856e750f9
fix: type error on Sales Pipeline Analytics
2022-12-01 18:08:32 +05:30
barredterra
03f7bfbbde
refactor: validate dates
2022-12-01 12:42:03 +01:00
Deepesh Garg
826f45ad60
fix: Bundle item rates
2022-12-01 16:11:10 +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
Anand Baburajan
5b1743330d
Merge branch 'develop' into invalid_message_fix
2022-12-01 12:35:04 +05:30
Anand Baburajan
2886d8ab5a
Merge branch 'develop' into month_end_due_date
2022-12-01 12:34:51 +05:30
Deepesh Garg
5b1798363c
Merge pull request #33091 from ssiyad/fix/pos/partial_return_amount
...
fix(pos): partial return amount update
2022-12-01 11:41:53 +05:30
Sagar Sharma
d892e27289
Merge branch 'develop' into se_alert_develop
2022-12-01 10:37:52 +05:30
Sagar Sharma
93f29d8f08
Merge branch 'develop' into invalid_message_fix
2022-12-01 09:24:40 +05:30
anandbaburajan
827ad01d4f
chore: style
2022-11-30 23:57:26 +05:30
Anand Baburajan
ba38001116
Merge branch 'develop' into asset_last_day_test_bug
2022-11-30 23:53:21 +05:30
anandbaburajan
25522444b8
fix: use is_last_day_of_the_month in test_scrap_asset
2022-11-30 23:25:40 +05:30
Sagar Sharma
0e8edd1ee9
Merge branch 'develop' into se_alert_develop
2022-11-30 22:03:31 +05:30
Deepesh Garg
bfb81ef56f
fix: Due date for month end payment term
2022-11-30 20:53:41 +05:30
Deepesh Garg
64e5a79a91
fix: Error on making stock entry from material request
2022-11-30 19:35:30 +05:30
Sabu Siyad
c5edbe2e2f
fix(lint): trailing whitespace
...
Signed-off-by: Sabu Siyad <hello@ssiyad.com>
2022-11-30 17:12:06 +05:30
Sagar Sharma
43d08b4c74
Merge branch 'develop' into se_alert_develop
2022-11-30 10:15:31 +05:30
s-aga-r
ca0485a503
fix: add company filter in RFQ Items
2022-11-30 10:03:36 +05:30
anandbaburajan
96ede2fcf9
fix: bug in new depr schedule
2022-11-29 21:30:23 +05:30
Deepesh Garg
4bd9289d7d
fix(UX): Alert on change of item rate in Stock Entry
2022-11-29 19:21:48 +05:30
Deepesh Garg
3eb1ed19a1
fix: Tax withholding net total for PI in reports
2022-11-29 13:10:31 +05:30
Sagar Sharma
ce7720b14c
Merge branch 'develop' into repost-item-valuation
2022-11-29 11:03:22 +05:30
rohitwaghchaure
6dd84cb977
Merge pull request #33013 from rtdany10/riv-validation
...
fix: validate repost item valuation against accounts freeze date
2022-11-29 10:40:48 +05:30
Deepesh Garg
a7b7d0d99d
Merge pull request #33116 from shariquerik/show-batch-selector-only-once
...
fix: only show serial no batch selector only once
2022-11-29 10:20:30 +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
56b96f0a9c
Merge branch 'develop' into fix/pos/partial_return_amount
2022-11-29 10:12:29 +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
8287fb5104
Merge pull request #33143 from deepeshgarg007/auto_repeat_dates
...
fix: Auto repeat date validations
2022-11-29 09:28:19 +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
rohitwaghchaure
a222b0a6ae
Merge pull request #33144 from rohitwaghchaure/fixed-incorrect-stock-balance-qty
...
fix: incorrect balance qty
2022-11-29 08:48:03 +05:30
barredterra
06e094b5fc
fix: reload currency exchange settings
2022-11-28 22:58:31 +01:00
Rohit Waghchaure
b606a9684b
test: test case for serialized batched item
2022-11-29 00:08:07 +05:30
Rohit Waghchaure
b2105a8be7
fix: incorrect balance qty
2022-11-28 23:13:30 +05:30
Deepesh Garg
6a47fb6c9e
chore: Update condition
2022-11-28 22:47:44 +05:30
Sagar Sharma
4750bfaeab
Merge branch 'develop' into repost-item-valuation
2022-11-28 22:06:49 +05:30
Deepesh Garg
a9cf9e5a88
Merge pull request #33107 from barredterra/german-tax-templates
...
feat: german tax templates
2022-11-28 21:54:08 +05:30
Sagar Sharma
ec95a9b760
Merge branch 'develop' into repost-item-valuation
2022-11-28 21:33:58 +05:30
Sagar Sharma
8948e42a6d
Merge branch 'develop' into repost-item-valuation
2022-11-28 21:29:35 +05:30
s-aga-r
4e10352b48
chore: make posting_date and posting_time read-only if based_on is set to Transaction
2022-11-28 21:22:22 +05:30
s-aga-r
eeec008547
fix: reset voucher_type and voucher_no if based_on is set to Item and Warehouse
2022-11-28 21:22:20 +05:30
Sagar Sharma
6868b4d7c3
Merge branch 'develop' into fix/repost-item-valuation
2022-11-28 21:00:46 +05:30
s-aga-r
eeda264eb6
fix: reposting error AttributeError: 'datetime.timedelta' object has no attribute 'replace'
2022-11-28 20:59:14 +05:30
Deepesh Garg
fa15221455
fix: Auto repeat date validations
2022-11-28 19:22:35 +05:30
s-aga-r
ba77da0874
fix: validation msg in stock entry
2022-11-28 18:01:30 +05:30
Deepesh Garg
6ebe8ad60d
fix(ux): Action buttons in Bank Reconciliation
2022-11-28 17:37:41 +05:30
rohitwaghchaure
b8b9d1b0a8
Merge pull request #33135 from rohitwaghchaure/feat-provision-to-make-mr-for-sub-assembly-items
...
feat: make Material Request for sub-assembly items
2022-11-28 16:53:38 +05:30
Rohit Waghchaure
e02f35c8ff
feat: make Material Request for sub-assembly items
2022-11-28 16:20:46 +05:30
ruthra kumar
9fd70a6827
Merge pull request #33115 from ruthra-kumar/duplicate_schema_block
...
fix: remove product schema block from additional info section on item template
2022-11-28 15:28:50 +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
Ankush Menat
63b9795d41
fix: opportunity list doesn't show assigned user ( #33110 )
...
Because `db_update` is performed `_assign` property is not updated and
hence lead -> opportunity conversion makes it disappear from list view.
Steps to reproduce:
1. Create lead
2. Assign anyone
3. Create opportunity from lead.
4. Form view shows assigned user, list view wont.
2022-11-28 10:58:35 +05:30
Deepesh Garg
4f2ece34df
chore: Supplier invoice no field description
2022-11-27 21:50:26 +05:30
Deepesh Garg
dedd722aef
Merge pull request #33022 from barredterra/incoterms
...
feat: Incoterms in buying and selling
2022-11-27 20:52:25 +05:30
rohitwaghchaure
397a0e2a3a
Merge pull request #33118 from rohitwaghchaure/production-plan-ux-issues
...
fix: production plan UX
2022-11-27 08:46:39 +05:30
s-aga-r
ef7fd670fc
fix: production_item filter in Job Card Summary Report
2022-11-26 16:57:38 +05:30
s-aga-r
481149814e
fix: company name with , in Job Card Summary Report
2022-11-26 16:55:45 +05:30
s-aga-r
2e4f3e9317
fix: Work Order filter typo in Job Card Summary Report
2022-11-26 16:54:53 +05:30
s-aga-r
87b39f045c
fix: company name with , in Work Order Summary Report
2022-11-26 16:39:32 +05:30
Rohit Waghchaure
8cb7112e72
fix: production plan UX
2022-11-26 15:02:27 +05:30
Sagar Sharma
10a2121361
Merge branch 'develop' into show-batch-selector-only-once
2022-11-26 10:09:10 +05:30
Raffael Meyer
905a50cbb2
Merge branch 'develop' into incoterms
2022-11-25 16:50:55 +01:00
Shariq Ansari
0f87d329d6
fix: only show serial no batch selector only once
2022-11-25 17:03:00 +05:30
anandbaburajan
7d09440579
chore: more refactoring
2022-11-25 16:49:44 +05:30
ruthra kumar
2c18a95115
fix: remove duplicate schema
2022-11-25 16:23:45 +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
Abhinav Raut
fe87c27acd
fix: disbursable amount on currrent security price
2022-11-25 13:20:01 +05:30
barredterra
7fd2639e68
feat: german tax templates
2022-11-25 00:21:33 +01:00
Sagar Sharma
4e7613d4ce
Merge branch 'develop' into fix/github-issue/20496
2022-11-24 20:43:52 +05:30
s-aga-r
df0fee2312
fix: MR Item description and item_name gets reset on qty change
2022-11-24 20:42:57 +05:30
rohitwaghchaure
b0c8643517
Merge pull request #33103 from rohitwaghchaure/fixed-job-card-for-qty-ux
...
fix: job card "Qty to Manufacture" UX
2022-11-24 19:24:05 +05:30
Deepesh Garg
541eb7e43b
Merge pull request #33100 from deepeshgarg007/dispatch_address_display
...
fix: Dispatch address display
2022-11-24 18:00:26 +05:30
anandbaburajan
4e63ba3ac6
chore: refactor schedules in journal_entry
2022-11-24 17:39:11 +05:30
Rohit Waghchaure
87d37e90a2
fix: job card for quantity UX
2022-11-24 17:29:50 +05:30
Deepesh Garg
104fdcb9f9
fix: Dispatch address display
2022-11-24 16:41:40 +05:30
Sabu Siyad
80813c66e3
Merge branch 'develop' into fix/pos/warehouse_selection
2022-11-24 16:21:54 +05:30
anandbaburajan
de17367a36
chore: finish refactoring asset_value_adjustment
2022-11-24 16:16:36 +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
anandbaburajan
0e726609f1
fix: precision in asset test_scrap_asset
2022-11-24 15:38:05 +05:30
anandbaburajan
f35b19eac3
chore: renaming functions and variables again, and continuing refactoring AssetValueAdjustment
2022-11-24 15:33:21 +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
anandbaburajan
7db66b0916
chore: renaming some functions and variables, and partially refactoring AssetValueAdjustment
2022-11-24 13:02:48 +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
Dany Robert
88a0aa4077
chore: pre-commit
2022-11-23 19:04:11 +05:30
Dany Robert
b482e3876d
fix: check for session user rather than owner
2022-11-23 18:59:15 +05:30
Deepesh Garg
60740baf3b
Merge pull request #33066 from deepeshgarg007/move_taxjar_integration_new
...
refactor!: Move TaxJar integration from ERPNext
2022-11-23 18:21:55 +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
Saurabh
5e4a287624
Merge pull request #33065 from saurabh6790/task-view-fix
...
fix: project website view
2022-11-23 18:17:55 +05:30
anandbaburajan
76f28de7eb
chore: refactor more functions to use new depr schedule
2022-11-23 18:04:54 +05:30
Sabu Siyad
a378619c9a
fix(pos): partial return amount update
...
Signed-off-by: Sabu Siyad <hello@ssiyad.com>
2022-11-23 17:52:12 +05:30
Deepesh Garg
0e3438db10
Merge branch 'develop' of https://github.com/frappe/erpnext into move_taxjar_integration_new
2022-11-23 17:47:22 +05:30
Deepesh Garg
f448a077b8
chore: Cleanup patches
2022-11-23 17:47:05 +05:30
Rohit Waghchaure
be19e4f621
fix: Valuation Rate column UX in stock ledger report
2022-11-23 16:44:18 +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
rohitwaghchaure
68424887e4
Merge pull request #33077 from rohitwaghchaure/ux-for-inventory-dimension
...
fix: UX for inventory dimension
2022-11-23 09:53:49 +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
Deepesh Garg
0fffe61e3c
Merge pull request #33072 from deepeshgarg007/move_section
...
chore: Rearrange supplier invoice section in Purchase Invoice
2022-11-22 20:14:14 +05:30
niralisatapara
0fdde2e5c0
feat: item wise tds calculation for purchase order
2022-11-22 14:36:30 +05:30
niralisatapara
46e8cdf31a
feat: item wise tds calculation for purchase order.
2022-11-22 14:15:36 +05:30
ruthra kumar
31f463dd83
Merge pull request #33071 from ruthra-kumar/advance_paid_in_account_currency
...
fix: advance paid updated in account currency for SO/PO
2022-11-22 13:45:04 +05:30
Deepesh Garg
e96be712b8
chore: Rearrange supplier invoice section in Purchase Invoice
2022-11-22 12:50:00 +05:30
ruthra kumar
541cf153f7
test: fix test case for SO/PO advance amount
2022-11-22 12:33:29 +05:30
ruthra kumar
bf76b85dfd
fix: update advace paid in SO/PO in account currency
2022-11-22 12:33:18 +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
Deepesh Garg
81c856ccb8
chore: Remove unwanted patch
2022-11-21 21:00:31 +05:30
Deepesh Garg
1100816d7a
refactor!: Move TaxJar integration from ERPNext
2022-11-21 20:18:06 +05:30
Saurabh
5d9960ae5b
feat: handle empty state
2022-11-21 19:37:57 +05:30
Saurabh
80e45828ae
fix: ux for project view on web
2022-11-21 18:16:57 +05:30
Saurabh
7cc99ab63b
fix: update tasks route under website route rules
2022-11-21 18:13:54 +05:30
niralisatapara
b9d0b4e2d3
feat: item wise tds in purchase order
2022-11-21 15:43:03 +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
e25d0ead1a
Merge pull request #33051 from deepeshgarg007/timesheet_timer_button
...
fix: Timesheet timer button
2022-11-21 11:15:02 +05:30
Deepesh Garg
15e74c5d7b
fix: Viewing account ledger from party master
2022-11-20 20:30:24 +05:30
Deepesh Garg
64802d1220
fix: Timesheet timer button
2022-11-20 19:45:51 +05:30
Deepesh Garg
89631fa744
Merge pull request #32958 from pps190/fix-item-price-brand
...
fix: link `Item Price` brand to `Brand` doctype.
2022-11-19 19:14:39 +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
Raffael Meyer
491857b3c8
fix: remove obsolete comment
2022-11-18 10:57:52 +01:00
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
Sagar Sharma
985ce0dc42
Merge pull request #32986 from s-aga-r/fix/scr-return-rejected-qty
...
fix: hide rejected-fields in return SCR
2022-11-18 15:00:22 +05:30
Daizy Modi
62c0210463
Merge branch 'develop' into perf-fix-get-cached-value-for-accounts
2022-11-18 12:07:52 +05:30
Sagar Sharma
29132609ff
Merge branch 'develop' into fix/scr-return-rejected-qty
2022-11-18 12:06:59 +05:30
s-aga-r
12d7b7e9c2
chore: linters
2022-11-18 11:42:44 +05:30
Sagar Sharma
cbfd8da848
Merge branch 'develop' into internal_transfer
2022-11-18 10:38:37 +05:30
barredterra
a5966b6f84
feat: add connections to Incoterm doctype
2022-11-17 22:37:04 +01:00
barredterra
ffd287d5a6
feat: add german translations for incoterm titles
2022-11-17 22:18:53 +01:00
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
barredterra
ce83f02f24
feat: create Incoterm records after install
2022-11-17 22:17:19 +01:00
barredterra
d2563ee973
feat: create incoterms and migrate shipments
2022-11-17 22:16:43 +01:00
barredterra
1a1bfc8db9
feat: add doctype Incoterm
2022-11-17 22:14:30 +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
Anand Baburajan
a66d9f8e8e
Merge branch 'develop' into asset_depreciation_schedule
2022-11-17 20:17:21 +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
Sabu Siyad
0b5584a54a
Merge branch 'develop' into fix/mutate_iter_list
2022-11-17 17:58:49 +05:30
Sabu Siyad
546c809cbe
fix: use list() on self mutating iteration
...
https://github.com/frappe/erpnext/issues/30325
Signed-off-by: Sabu Siyad <hello@ssiyad.com>
2022-11-17 17:46:49 +05:30
Deepesh Garg
cbe8fa7fd2
Merge pull request #33009 from ssiyad/fix/pos/item_img_border
...
fix(pos): item selector image border radius
2022-11-17 17:31:29 +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
Dany Robert
be15419bd5
chore: pre-commit
2022-11-17 11:00:34 +01:00
Dany Robert
61f05132db
feat: validate repost item valuation against accounts freeze date
2022-11-17 11:00:01 +01:00
Ankush Menat
fd3c7903ba
chore: typo
2022-11-17 14:18:05 +05:30
Sagar Sharma
da4c20f7be
Merge branch 'develop' into fix/scr-return-rejected-qty
2022-11-17 14:15:16 +05:30
Sagar Sharma
1349d24514
Merge branch 'develop' into purchase-order/internal-supplier
2022-11-17 14:08:07 +05:30
Sabu Siyad
2f4940cc26
fix(pos): item selector image border radius
...
Signed-off-by: Sabu Siyad <hello@ssiyad.com>
2022-11-17 13:21:47 +05:30
Ankush Menat
34e4903ed7
refactor: search queries ( #33004 )
...
- guard clauses for readability
- use values or format
2022-11-17 13:04:42 +05:30
Sagar Sharma
f71f27462d
Merge branch 'develop' into fix/scr-return-rejected-qty
2022-11-17 13:04:15 +05:30
Sagar Sharma
e13b9e839d
Merge branch 'develop' into purchase-order/internal-supplier
2022-11-17 13:04:07 +05:30
s-aga-r
5efbc2cbf8
fix: make is_internal_supplier read-only
2022-11-17 12:36:44 +05:30
anandbaburajan
218da1217a
fix: add missing commas and brackets
2022-11-17 12:23:38 +05:30
Anand Baburajan
538da9a58e
Merge branch 'develop' into fix_precision_in_asset_tests
2022-11-17 12:17:27 +05:30
anandbaburajan
b5e5d3b3af
fix: precision in asset tests
2022-11-17 12:13:06 +05:30
Ritwik Puri
b03b568e6c
chore(patch): remove reload_doc from post model sync update_exchange_rate_settings patch ( #32994 )
...
[skip ci]
2022-11-17 11:59:42 +05:30
Ankush Menat
1bd886387b
chore: hardcode doctype
2022-11-17 11:58:35 +05:30
Sagar Sharma
5083c22490
Merge branch 'develop' into fix/scr-return-rejected-qty
2022-11-17 10:15:23 +05:30
rohitwaghchaure
31afae3e75
Merge branch 'develop' into workstation-type-feat-for-bom
2022-11-16 23:26:08 +05:30
Rohit Waghchaure
ffa30127e7
fix: linters failing
2022-11-16 23:23:06 +05:30
Rohit Waghchaure
7bd06e6fbc
test: test case to check workstation type
2022-11-16 23:19:04 +05:30
Deepesh Garg
9154d08b89
Merge pull request #32882 from ernestoruiz89/patch-9
...
fix: add translation function to doctype name on message
2022-11-16 20:41:34 +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
Sagar Sharma
399ee80d80
Merge branch 'develop' into fix/scr-return-rejected-qty
2022-11-16 15:02:55 +05:30
s-aga-r
7dd7617ec7
fix: hide reject-fields in return SCR
2022-11-16 14:28:54 +05:30
s-aga-r
8a73e963ce
fix: don't set rejected-qty in return SCR
2022-11-16 14:28:32 +05:30
Vishal
e5dfd53e6f
chore: minor fix
2022-11-16 14:25:35 +05:30
Vishal
ba6189d054
fix: minor change
2022-11-16 13:58:29 +05:30
Vishal
343b414b40
fix: test case updated for mr
2022-11-16 13:53:21 +05:30
Vishal
89aabdaaaa
fix: test case added for MR internal Transfer
2022-11-16 13:53:21 +05:30
Vishal
d86afddb60
fix: minor issue fixed
2022-11-16 13:53:21 +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
Devin Slauenwhite
3a35651441
fix: naming
2022-11-15 08:26:16 -05:00
Ankush Menat
c013db6ea1
fix: cast POS query inputs to integers ( #32975 )
...
fix: cast POS query inputs to integers
2022-11-15 18:10:45 +05:30
Deepesh Garg
b3bc1c66a3
Merge pull request #32968 from frappe/mergify/bp/develop/pr-32953
...
chore(payment_entry): Remove dead validations (backport #32953 )
2022-11-15 16:32:40 +05:30
Rohit Waghchaure
0a69523940
fix: UX for inventory dimension
2022-11-15 15:57:30 +05:30
s-aga-r
369db4eacc
test: fix test cases for supplied-items consumed_qty
2022-11-15 14:39:43 +05:30
s-aga-r
01f56c621c
Revert "fix: get consumed_qty based on received_qty in SCR"
...
This reverts commit 70c9b8dc50
2022-11-15 14:32:16 +05:30
s-aga-r
3706a9b4dc
Revert "fix: set received_qty before_validate SCR"
...
This reverts commit c447dfaa9c
2022-11-15 14:30:13 +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
rohitwaghchaure
91fad1935e
Merge pull request #32947 from rohitwaghchaure/incorrect-fix-of-conversion-factor-in-pp
...
fix: incorrect fix of conversion factor in PP
2022-11-15 10:30:23 +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
Devin Slauenwhite
cee069d426
fix: link to brand doctype.
2022-11-14 17:38:46 -05:00
Deepesh Garg
8c13f70fc5
fix: Label for applicable dimension table
2022-11-14 20:39:40 +05:30
Ernesto Ruiz
01cc58db83
Merge branch 'develop' into patch-9
2022-11-14 07:44:01 -06:00
anandbaburajan
417180e6ba
chore: refactor some functions to use new depr schedule
2022-11-14 17:51:11 +05:30
anandbaburajan
ffd41703de
chore: add expected_value_after_useful_life in depr schedule
2022-11-14 14:36:10 +05:30
Rohit Waghchaure
105c272816
feat: Workstation Type for BOM
2022-11-14 13:03:03 +05:30
anandbaburajan
ca3581d055
chore: rename modify_draft_asset_depreciation_schedules
2022-11-14 12:47:48 +05:30
anandbaburajan
ed495dc846
chore: add convert_draft_asset_depreciation_schedules_into_active and fix some bugs
2022-11-14 12:45:49 +05:30
Rohit Waghchaure
490b0e3cdf
fix: incorrect fix of conversion factor in PP
2022-11-14 10:10:49 +05:30
Sagar Sharma
a191ce6200
Merge branch 'develop' into refactor/qb/job-card
2022-11-13 22:31:35 +05:30
Deepesh Garg
7ba8350089
Merge branch 'develop' into patch-9
2022-11-13 20:42:48 +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
s-aga-r
7df2921d38
refactor: rewrite job_card.py queries in QB
2022-11-12 22:03:56 +05:30
Deepesh Garg
42a59d5c17
chore: Remove raw SQL query
2022-11-12 17:32:04 +05:30
Sagar Sharma
4e9a63423f
Merge pull request #32913 from resilient-tech/fix-item-price-fetch
...
fix: set stock UOM in args to ensure item price is fetched
2022-11-12 10:08:44 +05:30
anandbaburajan
97ab7bd36b
chore: remove some unwanted functions in asset
2022-11-11 16:27:29 +05:30
anandbaburajan
710d2452b7
feat: moving, refactoring and adding functions to asset_depreciation_schedule
2022-11-11 16:20:17 +05:30
Deepesh Garg
d03979eef9
Merge pull request #32878 from abhinavxd/fix-repayment-schedule
...
fix: repayment schedule regeneration
2022-11-11 14:22:40 +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
902e1ab74b
Merge branch 'develop' into patch-9
2022-11-10 20:08:27 +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
9d5c8d9d6b
Merge branch 'develop' into fix-repayment-schedule
2022-11-10 19:52:59 +05:30
Deepesh Garg
06a42caa5b
Merge pull request #32923 from deepeshgarg007/rate_quotation
...
fix: Maintain same rate between Quotation and Sales Order
2022-11-10 19:52:27 +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
8f65677cb4
Merge pull request #32912 from nabinhait/customer-supplier-tab-break
...
fix(ux): Tab break in Customer and Supplier form
2022-11-10 18:30:14 +05:30
Deepesh Garg
362ec7b673
fix: Maintain same rate between Quotation and Sales Order
2022-11-10 18:28:08 +05:30
Deepesh Garg
51521fc19f
feat: Add net value filter on PSOA
2022-11-10 17:48:25 +05:30
Sagar Sharma
e7fa2e08ad
fix: set WIP Warehouse in Job Card
2022-11-10 16:40:53 +05:30
Sagar Sharma
9730cd0aec
fix: don't set WIP Warehouse if is checked in WO
2022-11-10 16:18:10 +05:30
Deepesh Garg
1283c5b7a5
Merge branch 'develop' into fix-repayment-schedule
2022-11-10 09:39:39 +05:30
Ernesto Ruiz
a007f1da9d
Merge branch 'develop' into patch-7
2022-11-09 15:53:36 -06:00
Ernesto Ruiz
499dfee2d4
Merge branch 'develop' into patch-9
2022-11-09 15:52:35 -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
Sagar Vora
57038c3969
fix: set stock UOM in args to ensure item price is fetched
2022-11-09 18:56:09 +05:30
Nabin Hait
fb7ee301b5
fix(ux): Tab break in Customer and Supplier form
2022-11-09 18:03:23 +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
Deepesh Garg
077f3c515f
Merge branch 'develop' into patch-9
2022-11-09 09:19:28 +05:30
Rohit Waghchaure
7278387879
fix: test cases
2022-11-09 01:28:40 +05:30
Sagar Sharma
030ef6da25
Merge branch 'develop' into fix/scr/return-scr-ref
2022-11-08 21:36:00 +05:30
Rohit Waghchaure
4082149f0e
fix: Purchase Receipt timeout error
2022-11-08 20:59:20 +05:30
Deepesh Garg
c8619284bc
Merge pull request #32883 from deepeshgarg007/timesheet_project_filter
...
fix: Project filter in timesheet
2022-11-08 14:54:49 +05:30
Sagar Sharma
47248251e2
chore: link SCR Return in SCR Dashboard
2022-11-08 12:29:41 +05:30
Sagar Sharma
84ab100d86
chore: remove debugger from stock_entry_list.js
2022-11-08 12:05:15 +05:30
Deepesh Garg
55d6773be6
Merge branch 'develop' of https://github.com/frappe/erpnext into timesheet_project_filter
2022-11-08 11:02:01 +05:30
Deepesh Garg
7b5cf6978e
chore: Linting Issues
2022-11-08 11:00:48 +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
Deepesh Garg
2b65b22aa2
fix: Project filter in timesheet
2022-11-07 22:48:52 +05:30
Sagar Sharma
1d52084b05
Merge branch 'develop' into fix/ux/scr/supplied-items/consumed-qty
2022-11-07 21:58:11 +05:30
Sagar Sharma
5e8a22be24
fix: linter
2022-11-07 21:54:12 +05:30
Ernesto Ruiz
1f13bc906b
fix: add translation functuinon to doctype name on message in bulk_transaction_processing
2022-11-07 09:43:28 -06:00
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
404662e794
Merge pull request #32625 from deepeshgarg007/editable_inovice
...
feat: Editable Sales Invoice
2022-11-07 18:29:21 +05:30
Abhinav Raut
d6ab2b3b87
fix: repayment schedule regeneration
2022-11-07 17:43:08 +05:30
Sagar Sharma
734db5b722
Merge branch 'develop' into fix/ux/scr/supplied-items/consumed-qty
2022-11-07 17:36:42 +05:30
Sagar Sharma
bf4b012cec
fix: make consumed_qty editable when backflush based on Material Transfer
2022-11-07 17:23:33 +05:30
Sagar Sharma
f8d2e276a5
fix: make consumed_qty read-only in SCR Supplied Items
2022-11-07 17:19:03 +05:30
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
Ankush Menat
30daeb90a8
fix: incorrect single valeu fetch
...
refer https://github.com/frappe/frappe/pull/18787
[skip ci]
2022-11-07 15:38:38 +05:30
Nihantra C. Patel
8355c1092c
fix: Increase columns width in Warehouse wise Item Balance Age and Value
2022-11-07 11:45:47 +05:30
rohitwaghchaure
5e7a69e649
Merge pull request #32802 from s-aga-r/fix/github-issue/29006
...
fix: `Material Consumption` option in case of `Skip Transfer to WIP` in WO
2022-11-07 09:35:39 +05:30
Daizy Modi
4efc947f14
perf: use get_cached_value instead of db.get_value in controllers ( #32776 )
2022-11-07 09:21:03 +05:30
Sagar Sharma
4d8da4420e
test: add test case for consumed-qty
2022-11-06 14:55:33 +05:30
Sagar Sharma
70c9b8dc50
fix: get consumed_qty based on received_qty in SCR
2022-11-06 13:33:47 +05:30
Sagar Sharma
c447dfaa9c
fix: set received_qty before_validate SCR
2022-11-06 13:32:15 +05:30
ruthra kumar
9209ec59c2
refactor: split delete gl utility function into two
2022-11-06 11:39:44 +05:30
Raffael Meyer
d2b6490bca
chore: add german translations ( #32846 )
...
Mostly for balance sheet
2022-11-06 10:22:33 +05:30
Deepesh Garg
8d30ebb12b
fix: Disable tax included prices for internal transfers ( #32794 )
...
* fix: Disable tax-included prices for internal transfers
2022-11-05 20:51:15 +05:30
Sagar Sharma
0394080898
Merge branch 'develop' into fix/github-issue/29006
2022-11-05 20:11:55 +05:30
Ankush Menat
75983ce809
fix: remove global _("translation") calls ( #32828 )
...
This is not how it works. Translations are dynamic based on language
sets during request (using header, user's preferences etc)
Calling them on global variables makes no sense.
Ref: https://github.com/frappe/frappe/pull/18733
2022-11-05 18:49:15 +05:30
Sagar Sharma
cc8d540943
Merge branch 'develop' into fix/scr/return
2022-11-05 16:48:59 +05:30
Deepesh Garg
90fbab4b1e
Merge pull request #32847 from maharshivpatel/fix-pos-opening-entry-profile-filter
...
fix: Create POS Opening Entry POS Profile filter.
2022-11-05 16:44:39 +05:30
Sagar Sharma
5665d1afa0
Merge branch 'develop' into fix/scr/return
2022-11-05 16:36:07 +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
4ff06a9d79
Merge pull request #32844 from deepeshgarg007/auto_allocate_advances
...
fix: Auto advance allocation against partial invoices
2022-11-05 16:27:59 +05:30
Sagar Sharma
324bfa9fde
test: fix test case
2022-11-05 16:18:31 +05:30
Sagar Sharma
760c26e9c0
fix: make BOM required in SCR Item
2022-11-05 15:52:14 +05:30
Sagar Sharma
761e9df1bf
test: add test case
2022-11-05 15:52:14 +05:30
Sagar Sharma
611d827e0b
fix: rename test method
2022-11-05 15:51:29 +05:30
Sagar Sharma
54072ec9cd
fix: map BOM while mapping the return SCR
2022-11-05 15:51:29 +05:30
Sagar Sharma
3ca9d53d1b
refactor: rewrite query in QB
...
(cherry picked from commit 2f145f99129503359b9a79c247fe69e30ac1bf8e)
2022-11-05 06:12:40 +00:00
Bhavesh Maheshwari
f4779df9b3
fix: mysql syntax issue
...
(cherry picked from commit 4d9bbd4c9c06811086e0ae4e2c16763fe7d171a3)
2022-11-05 06:12:40 +00:00
Deepesh Garg
428971f127
test: Check parital payment allocation
2022-11-04 15:50:39 +05:30
Deepesh Garg
181df2fe63
fix: Auto advance allocation against partial invoices
2022-11-04 15:49:37 +05:30
Maharshi Patel
1328a45f2a
fix: Create POS Opening Entry POS Profile filter.
...
pos_profile_query was variable instead of function.
2022-11-04 15:29:17 +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
Deepesh Garg
f6a61b999f
chore: fix patch
2022-11-04 08:11:38 +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
153675e52a
chore: Update patch
2022-11-04 01:03:45 +05:30
Deepesh Garg
e2ad785422
chore: Hide tax withholding net total field
2022-11-04 01:03:20 +05:30
rohitwaghchaure
0caa35a251
Merge branch 'develop' into fix/github-issue/29006
2022-11-03 16:12:53 +05:30
Rohit Waghchaure
e5b19e3f70
fix: auto increment qty if item table has no items
2022-11-03 14:57:36 +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
Rohit Waghchaure
b0fc568c80
fix: not able to select customer / supplier
2022-11-03 11:24:58 +05:30
niralisatapara
12456f9850
feat: item wise tds calculation
2022-11-03 10:46:30 +05:30
Deepesh Garg
f5478c871c
Merge pull request #32773 from AnandBaburajan/asset_bill_date_new
...
fix: for asset's purchase_date, if bill_date is set, use that instead of posting_date
2022-11-03 09:51:44 +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
Anand Baburajan
c95f05a3dc
Merge branch 'develop' into asset_bill_date_new
2022-11-02 21:30:40 +05:30
Sagar Sharma
cd5836243d
Merge branch 'develop' into fix/github-issue/29006
2022-11-02 19:07:47 +05:30
ruthra kumar
c3dc1c272b
Merge pull request #32816 from ruthra-kumar/advance_paid_in_so_and_po
...
fix: update advance paid in SO/PO from Payment Ledger
2022-11-02 16:27:56 +05:30
ruthra kumar
721ac6b847
test: SO advance paid on Payment submission and cancellation
2022-11-02 15:54:23 +05:30
ruthra kumar
1a0a8ac7e2
test: PO advance paid on payment submission and cancellation
2022-11-02 15:53:52 +05:30
ruthra kumar
81d791eea0
test: refactor use @change_settings decorator when possible
2022-11-02 15:40:56 +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
Sagar Sharma
be4593c1d9
Merge branch 'develop' into fix/github-issue/30339
2022-11-02 11:50:51 +05:30
Sagar Sharma
aa6e8c9ec0
Merge branch 'develop' into fix/github-issue/29006
2022-11-02 11:50:44 +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
rohitwaghchaure
a6a280669c
Merge pull request #32800 from rohitwaghchaure/test-cases-failing
...
fix: test cases
2022-11-01 22:51:31 +05:30
Rohit Waghchaure
3f2728e3f7
test: run tmate
2022-11-01 22:20:13 +05:30
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
Sagar Sharma
31f95da947
Merge branch 'develop' into fix/github-issue/30339
2022-11-01 20:30: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
Sagar Sharma
8ea6983734
fix: Material Consumption option in case of Skip Transfer to WIP in WO
2022-11-01 19:43:06 +05:30
Rohit Waghchaure
ddd1b4be3f
fix: test cases
2022-11-01 19:30:37 +05:30
Anand Baburajan
05d2c7f9ae
Merge branch 'develop' into asset_bill_date_new
2022-11-01 17:45:23 +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
6b0178e9fb
Merge branch 'develop' into fix-pricing-rule-item-group-uom
2022-11-01 15:21:41 +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
anandbaburajan
65e855bfff
fix: pro_rata_amount calculation in assets tests
2022-11-01 12:45:28 +05:30
anandbaburajan
5a274176d3
feat: add asset_depreciation_schedule
2022-11-01 11:45:17 +05:30
Sagar Sharma
9fb3fb4c83
fix: use flt instead of cint in get_batch_no
2022-11-01 10:45:13 +05:30
ruthra kumar
4487065b67
fix: update advance paid in SO/PO from Payment Ledger
2022-11-01 10:29:31 +05:30
rohitwaghchaure
1033d34964
Merge pull request #32730 from rohitwaghchaure/duplicate-custom-fields-inventory-dimension
...
fix: duplicate custom fields for inventory dimension
2022-10-31 22:25:29 +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
b98d25dafb
Merge pull request #32777 from deepeshgarg007/sales_order_advance_paid_amount
...
fix: Reset advance paid amount on Order cancel and amend
2022-10-31 21:38:43 +05:30
Deepesh Garg
06e8e28531
fix: Mode of payment for returns in POS Sales Invoice
2022-10-31 19:58:46 +05:30
Deepesh Garg
92f37ca111
fix: Reset advance paid amount on Oreder cancel and amend
2022-10-31 19:01:54 +05:30
Rohit Waghchaure
45ededbed5
fix: duplicate custom fields for inventory dimension
2022-10-31 15:33:23 +05:30
anandbaburajan
f322c608cf
fix: for asset's purchase_date, if bill_date is set, use that instead of posting_date
2022-10-31 12:41:37 +05:30
gn306029
a612a666f3
chore: Update zh-TW translations ( #31775 )
2022-10-31 12:32:57 +08:00
Deepesh Garg
4e26d42d17
fix: Budget validation for main cost center
2022-10-30 19:33:27 +05:30
Hossein Yousefian
54c2ffc36b
fix: Pass project to stock entry items
...
fix: Pass project to stock entry items
2022-10-29 22:24:59 +05:30
Sagar Sharma
15ebf4a0cf
fix: add Sales Order reference in Material Request Dashboard
2022-10-29 12:01:37 +05:30
Deepesh Garg
cca36cab70
Merge pull request #32744 from ruthra-kumar/so_terms_report_enhancement
...
refactor: additional filters on Payment Terms status report
2022-10-29 11:09:43 +05:30
Deepesh Garg
49343e9f68
chore: column name
2022-10-28 22:03:09 +05:30
Deepesh Garg
b6ade62211
Merge pull request #32662 from s-aga-r/refactor/stock/remaining-reports
...
refactor: rewrite stock reports queries in qb
2022-10-28 21:05:15 +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
92f2d9f99f
Merge pull request #32725 from ernestoruiz89/patch-10
...
fix: add translate function on remark text on asset_value_adjustment.py
2022-10-28 20:47:00 +05:30
Deepesh Garg
25eac80ae6
Merge pull request #32718 from deepeshgarg007/total_sales_amount_project
...
fix: Total Sales amount update in project via Sales Order
2022-10-28 20:46:00 +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
b9d497c61c
chore: Update patch
2022-10-28 20:18:55 +05:30
ruthra kumar
fed39a53cb
test: due date filter on Payment Terms report
2022-10-28 18:15:58 +05:30
ruthra kumar
4765f937ea
fix: key error in filter access
2022-10-28 17:50:01 +05:30
ruthra kumar
aadb6b1772
feat: additional filters on Payment terms report
...
Filter on Status and Due dates
2022-10-28 17:46:06 +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
Vishal Dhayagude
db0f2c0b10
Merge branch 'develop' into pr_dashboard
2022-10-28 13:36:43 +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
Vishal
e8c0157017
chore: minor linting issue fixed
2022-10-28 11:59:10 +05:30
Vishal
a04c44fe34
chore: Added Material Request Reference in Purchase Recipt Dashboard for Tracking
2022-10-28 11:36:14 +05:30
Sagar Sharma
334b158f0b
Merge branch 'develop' into refactor/stock/remaining-reports
2022-10-28 11:27:42 +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
Deepesh Garg
591291caee
Merge pull request #32724 from deepeshgarg007/ap_report_filter_fixes
...
fix: Filter fixes in Accounts Payable report
2022-10-28 11:23:52 +05:30
Dany Robert
de20dfe459
chore: remove commented line
2022-10-27 09:33:49 +05:30
Ernesto Ruiz
8f0e63cd27
fix: add translate function on remark text on make_depreciation_entry in asset_value_adjustment.py
2022-10-26 13:56:35 -06:00
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
6063c4e3c0
fix: Total Sales amount update in project via Sales Order
2022-10-26 18:01:39 +05:30
Deepesh Garg
4cd65027c4
fix: Add condition for discount section collapse
2022-10-26 16:48:24 +05:30
