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 |
|
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 |
|
Rohit Waghchaure
|
105c272816
|
feat: Workstation Type for BOM
|
2022-11-14 13:03:03 +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 |
|
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 |
|