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
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
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
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
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
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
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
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
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