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