Rohit Waghchaure
6381e75fa5
fix: group warehouse filter not working for Batchwise Balance history report
2022-10-17 12:17:05 +05:30
Sagar Sharma
484b115b09
Merge branch 'develop' into refactor/stock/reports
2022-10-17 12:08:44 +05:30
Sagar Sharma
309fc6db43
Merge branch 'develop' into refactor/buying/reports
2022-10-17 12:08:37 +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
Sagar Sharma
682fb171cb
Merge branch 'develop' into refactor/buying/reports
2022-10-16 11:50:31 +05:30
Sagar Sharma
177c9c93e8
Merge branch 'develop' into refactor/stock/reports
2022-10-16 11:50:26 +05:30
Deepesh Garg
40b3d8ec1b
Merge pull request #32591 from nabinhait/crm-notes-to-comments
...
fix: Renamed Notes section to Comments
2022-10-15 17:42:45 +05:30
Deepesh Garg
fc795275f2
Merge pull request #32594 from deepeshgarg007/order_account
...
fix: Party account for multi-order invoices
2022-10-15 16:58:51 +05:30
Sagar Sharma
5f3796f6ea
Merge branch 'develop' into refactor/buying/reports
2022-10-14 11:57:11 +05:30
Sagar Sharma
3c1bd90d0d
Merge branch 'develop' into refactor/stock/reports
2022-10-14 11:57:04 +05:30
Anand Baburajan
9127b96033
fix: add project settings to projects workspace ( #32568 )
2022-10-13 18:27:11 +05:30
Ankush Menat
50e9698932
chore: drop dead code ( #32595 )
...
[skip ci]
2022-10-13 15:25:22 +05:30
Deepesh Garg
fd49503ba2
fix: Party account for multi-order invoices
2022-10-13 15:08:34 +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
Nabin Hait
f561d8f689
fix: Renamed Dashboard tab label to Connections
2022-10-13 12:43:08 +05:30
Nabin Hait
56a4a77398
fix: Renamed Notes section to Comments
2022-10-13 12:35:04 +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
Raffael Meyer
e543dca6a0
fix: don't try to update youtube data if disabled in settings ( #32588 )
...
fix: cast value from db
[skip ci]
2022-10-13 11:53:52 +05:30
Sagar Sharma
bb7897caab
Merge branch 'develop' into refactor/stock/reports
2022-10-12 19:21:15 +05:30
Sagar Sharma
610d18cc25
Merge branch 'develop' into refactor/buying/reports
2022-10-12 19:21:10 +05:30
Sagar Sharma
7dfd741ced
Merge branch 'develop' into fix/github-issue/32559
2022-10-12 19:20:39 +05:30
Rohit Waghchaure
692462d7c8
fix: removed unnecessary imports
2022-10-12 16:30:48 +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
ruthra kumar
eb819368aa
test: dedeplication on payment ledger upon repost
2022-10-12 16:08:59 +05:30
Deepesh Garg
9aa5e20ef7
chore: check only for inter-company transfers
2022-10-12 15:53:28 +05:30
Rohit Waghchaure
98bf8e1304
fix: test case
2022-10-12 15:45:36 +05:30
Rohit Waghchaure
3266e54e33
fix: consider outgoingrate while valuation rate calculate
2022-10-12 15:44:53 +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
49601558c6
chore: fix precision condition
2022-10-12 14:57:16 +05:30
Deepesh Garg
1c05c004cd
chore: Use proper accounts
2022-10-12 14:19:09 +05:30
Deepesh Garg
c8d2181498
chore: Increase precision for other doc fields
2022-10-12 14:17:55 +05:30
Sagar Sharma
59edf64951
Merge branch 'develop' into refactor/stock/reports
2022-10-12 13:30:00 +05:30
Sagar Sharma
0af385d73f
Merge branch 'develop' into refactor/buying/reports
2022-10-12 13:29:50 +05:30
Sagar Sharma
d2755c0106
Merge branch 'develop' into fix/github-issue/32559
2022-10-12 13:28:35 +05:30
Rohan
43037d893d
fix: type-cast while saving an item ( #32549 )
2022-10-12 13:07:58 +05:30
Sagar Sharma
7da32c7db3
fix: Brand Defaults filters
2022-10-12 12:15:07 +05:30
Sagar Sharma
16aef53470
Merge branch 'develop' into refactor/stock/reports
2022-10-12 00:38:40 +05:30
Sagar Sharma
a161048a9d
Merge branch 'develop' into refactor/buying/reports
2022-10-12 00:38:37 +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
df2a0e265b
chore: GL Entries for SLE diff
2022-10-11 14:55:09 +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
35f836c4b7
feat: Tab Break in Purchase Receipt
2022-10-11 13:18:21 +05:30
Nabin Hait
3d9263bf86
feat: Tab Break in Supplier Quotation
2022-10-11 13:18:21 +05:30
Nabin Hait
2172c5034a
feat: Tab Break in Material Request
2022-10-11 13:18:21 +05:30
Nabin Hait
10a25603ac
feat: Tab Break in Purchase Order
2022-10-11 13:18:21 +05:30
Nabin Hait
7546562139
feat: Tab Break in Quotation
2022-10-11 13:18:21 +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
dddbc130db
Merge branch 'develop' of https://github.com/frappe/erpnext into internal_transfer_precision_fixes
2022-10-11 12:54:11 +05:30
ruthra kumar
4b908ebcd6
fix: value error on pos submit
2022-10-11 11:21:11 +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
Deepesh Garg
a14c5dbcc4
Merge branch 'develop' of https://github.com/frappe/erpnext into internal_transfer_precision_fixes
2022-10-10 15:08:15 +05:30
rohitwaghchaure
be1ebd348b
Merge pull request #32497 from s-aga-r/fix/quality-inspection/status
...
chore: set `Quality Inspection` status based on readings status
2022-10-10 10:49:56 +05:30
ruthra kumar
537d953f4c
fix: unlink payment on invoice cancellation
2022-10-10 10:17:19 +05:30
Deepesh Garg
d806e32030
fix: PO cancel post advance payment cancel against PO
2022-10-08 21:25:11 +05:30
Deepesh Garg
4b828dd276
Merge branch 'develop' of https://github.com/frappe/erpnext into loan_schedule_types
2022-10-08 18:41:39 +05:30
Sagar Sharma
60befcd8a8
Merge branch 'develop' into fix/quality-inspection/status
2022-10-08 13:34:21 +05:30
Sagar Sharma
4992e4a2b8
fix(test): test_rejected_qi_validation
2022-10-08 13:33:36 +05:30
Sagar Sharma
fcc1272d42
test: add test cases for Quality Inspection status
2022-10-08 13:33:36 +05:30
Sagar Sharma
2657ece2cd
fix: set Quality Inspection status based on readings status
2022-10-08 13:33:22 +05:30
Sagar Sharma
ce20b05ed0
Merge branch 'develop' into refactor/buying/reports
2022-10-08 10:48:03 +05:30
Sagar Sharma
e78a706994
refactor: rewrite Procurement Tracker Report queries in QB
2022-10-08 10:47:10 +05:30
rohitwaghchaure
73a9791401
Merge branch 'develop' into provision-to-return-components
2022-10-07 23:50:05 +05:30
Rohit Waghchaure
d59ed24e6c
feat: provision to return non consumed components against the work order
2022-10-07 22:45:53 +05:30
Sagar Sharma
a14b9c7bac
refactor: rewrite Supplier Quotation Comparison Report queries in QB
2022-10-07 18:07:53 +05:30
Sagar Sharma
a5b3f8cae9
refactor: rewrite Purchase Order Analysis Report queries in QB
2022-10-07 17:30:01 +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
Sagar Sharma
f0f2413932
Merge branch 'develop' into refactor/stock/reports
2022-10-07 09:59:56 +05:30
Sagar Sharma
8103856a41
refactor: rewrite Warehouse wise Item Balance Age and Value Report queries in QB
2022-10-07 09:59:35 +05:30
Sagar Sharma
7c759b193c
refactor: rewrite Total Stock Summary Report queries in QB
2022-10-07 09:59:28 +05:30
Sagar Sharma
d7c3b7633a
fix: make readings status mandatory in Quality Inspection
2022-10-06 22:36:37 +05:30
Ankush Menat
8376fbc982
fix: Explicitly update modified ( #32519 )
...
* fix: Explicitly update modified
required after https://github.com/frappe/frappe/pull/18301
* chore: fix broken translations
2022-10-06 20:35:33 +05:30
Sagar Sharma
d3c073dc25
refactor: rewrite Supplier-Wise Sales Analytics Report queries in QB
2022-10-06 17:42:31 +05:30
Sagar Sharma
c18f13a45b
refactor: rewrite Stock Projected Qty Report queries in QB
2022-10-06 17:04:50 +05:30
Ankush Menat
07c4a74838
chore: drop stale demo page ( #32515 )
2022-10-06 13:01:53 +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
HENRY Florian
0e4017cbe5
chore: update fr translation ( #32385 )
2022-10-05 18:19:44 +05:30
Deepesh Garg
0235901614
Merge pull request #32478 from rtdany10/patch-23
...
feat(JE): trigger account field when fetched from template
2022-10-05 16:07:59 +05:30
Deepesh Garg
fbdd1f39e7
Merge pull request #32499 from rohitwaghchaure/fixed-TooManyWritesError-for-reposting
...
fix: TooManyWritesError during reposting of stock
2022-10-05 16:05:12 +05:30
Deepesh Garg
777ed10e21
Merge pull request #32491 from ruthra-kumar/performance_issue_on_migrate_remarks_patch
...
refactor: remove duplicate entries on remarks migration patch
2022-10-05 16:04:23 +05:30
Rohit Waghchaure
aaabba9b1e
fix: TooManyWritesError during reposting of stock
2022-10-05 10:58:21 +05:30
Sagar Sharma
39707757a6
chore: add Manual Inspection field in Quality Inspection DocType
2022-10-04 23:16:16 +05:30
Dany Robert
74505a116f
Merge branch 'develop' into patch-23
2022-10-04 17:17:30 +05:30
ruthra kumar
518ab93e03
refactor: remove duplicate entries on remarks migration patch
2022-10-04 12:39:34 +05:30
Summayya Hashmani
da43a5e371
refactor(UI): clean up portal pages ( #29018 )
...
* refactor: list view for portal pages
* refactor: add align center class
* refactor: change footer btn class(primary)
* refactor: add order style page
* refactor: import order page in website
* refactor: remove table elements
* fix: preview image height
* fix: make string translatable
* refactor: change font variables
* refactor: order preview bg white
* refactor: center align items
* fix: breadcrumb padding
* refactor: make preview image rounded
* refactor: add condition for image container
* refactor: change alignment for mobile view
* fix: make footer button secondary
* refactor: clean code
* refactor: code indentantion
* refactor: remove space
* fix: Payment section cleanup
Co-authored-by: Summayya <frappe@Summayyas-MacBook-Air.local>
Co-authored-by: Marica <maricadsouza221197@gmail.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
2022-10-04 09:57:07 +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
Sagar Sharma
e295d0c091
Merge branch 'develop' into fix/pick-list/picked-qty
2022-10-03 14:20:05 +05:30
Sagar Sharma
ba02209f1d
fix: pick list picked-qty for batch item
2022-10-03 14:12:42 +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
Dany Robert
91055151ce
fix: (bulk transaction) key error and better error logging ( #32445 )
...
* fix: (bulk transaction) key error and better error logging
* chore: pre-commit
* chore: linter - missing comma
2022-10-03 10:59:53 +05:30
Muvuk
73e5a7d671
fix: update with new Frappe color. fix #32455 ( #32456 )
...
* Update with new Frappe color.
* refactor: use css variables
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
2022-10-02 22:30:36 +05:30
Deepesh Garg
601880f1ce
Merge pull request #32454 from AnandBaburajan/fix_test_scrap_asset
...
fix: test_scrap_asset not working on end of month
2022-10-02 17:44:46 +05:30
Deepesh Garg
28772bc9a4
Merge pull request #32405 from AnandBaburajan/fix_asset_sold_status
...
fix: status of assets with maintenance_required changing back to 'Partially Depreciated' some time after being sold
2022-10-02 17:41:31 +05:30
Anand Baburajan
04f9e7fa73
Merge branch 'develop' into fix_test_scrap_asset
2022-10-01 17:12:24 +05:30
anandbaburajan
47bd4be71b
fix: test_scrap_asset
2022-10-01 17:04:22 +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
Sagar Sharma
e71b25107d
Merge branch 'develop' into purchase-order/item/fg-item
2022-09-30 19:10:07 +05:30
Sagar Sharma
128c4bb7cb
Merge branch 'develop' into purchase-order/item/fg-item
2022-09-30 17:06:35 +05:30
Sagar Sharma
f95ed7dca2
fix: add non-stock item filter for fg_item in PO
2022-09-30 17:05:16 +05:30
Sagar Sharma
1f4e4db50d
Merge branch 'develop' into fix/item/update-stock
2022-09-30 16:55:26 +05:30
Sagar Sharma
ca2958a999
Merge branch 'develop' into fix/item/update-stock
2022-09-30 16:36:46 +05:30
Maharshi Patel
dc8d49260c
fix: payment request make bank field Link instead of Read Only
2022-09-30 16:22:57 +05:30
Sagar Sharma
eedaf9cd26
Merge branch 'develop' into fix/scr/non-stock-item
2022-09-30 16:19:23 +05:30
Sagar Sharma
fa2290657a
fix: add validation for non-stock item in SCR
2022-09-30 16:18:15 +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
Deepesh Garg
a79d074436
Merge pull request #32368 from ruthra-kumar/remove_code_for_buying_side_discount_accounting
...
chore: remove discount accounting logic from PI and PI Item
2022-09-30 15:58:35 +05:30
Deepesh Garg
429303bbb7
Merge pull request #32402 from deepeshgarg007/item_dashboard_create_new
...
fix: Item details fetching on making transaction from item dashboard
2022-09-30 15:56:32 +05:30
Nabin Hait
fe891aa488
fix: Create accounting dimension fields in asset capitalization
2022-09-30 15:55:41 +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
Deepesh Garg
bf7a51791a
chore: label post save
2022-09-30 15:29:07 +05:30
Sagar Sharma
6d0842465b
fix: don't allow to update Maintain Stock if the item has a BOM
2022-09-30 15:18:10 +05:30
Deepesh Garg
679b5ed551
chore: Add patch to update repayment schedule type in loan documents
2022-09-30 14:06:06 +05:30
Sagar Sharma
b1edd911f9
Merge branch 'develop' into remove_code_for_buying_side_discount_accounting
2022-09-30 12:39:29 +05:30
Sagar Sharma
774097bd10
Merge branch 'develop' into item_dashboard_create_new
2022-09-30 12:37:58 +05:30
Deepesh Garg
2ddee50f27
chore: Update labels as per repayment type
2022-09-30 10:39:45 +05:30
Deepesh Garg
3466461eb3
chore: Remove print statements
2022-09-30 10:19:58 +05:30
Deepesh Garg
76c6ccab5d
feat: Repayment schedule types for term loans
2022-09-30 10:13:17 +05:30
anandbaburajan
eadcd8e614
Merge branch 'fix_asset_sold_status' of https://github.com/AnandBaburajan/erpnext into fix_asset_sold_status
2022-09-29 15:34:48 +05:30
anandbaburajan
28952eda87
chore: remove unused function
2022-09-29 15:33:45 +05:30
Anand Baburajan
990514ae6d
Merge branch 'develop' into fix_asset_sold_status
2022-09-29 15:32:37 +05:30
anandbaburajan
f1169fb213
chore: refactor by just using a filter
2022-09-29 15:32:01 +05:30
Sagar Sharma
ffef659782
Merge branch 'develop' into fix/supplier-portal/make-pi-btn
2022-09-29 14:54:29 +05:30
rohitwaghchaure
10b7592d14
Merge pull request #32414 from rohitwaghchaure/consider-searchfields-as-per-customize-form
...
fix: searchfields as per customize form not working for Item
2022-09-29 14:51:55 +05:30
Rohit Waghchaure
3656f7d06f
test: added test case
2022-09-29 14:01:51 +05:30
anandbaburajan
0b3b4c99e6
Merge branch 'develop' of https://github.com/frappe/erpnext into fix_asset_sold_status
2022-09-29 08:55:00 +05:30
anandbaburajan
b734f9d237
chore: refactor by creating is_sold
2022-09-29 08:54:35 +05:30
Rohit Waghchaure
fd889fd29a
fix: searchfields as per customize form not working for Item
2022-09-28 23:00:45 +05:30
Deepesh Garg
369a343fb2
Merge pull request #32363 from ernestoruiz89/patch-7
...
fix: add translate function to strings in www/book appoinment
2022-09-28 20:15:05 +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
Deepesh Garg
84ab5d45fd
Merge pull request #32403 from deepeshgarg007/loan_type_patch_fix
...
fix: Disbursement Account in patch to update old loans
2022-09-28 19:35:42 +05:30
Anand Baburajan
d4242de699
Merge branch 'develop' into fix_asset_sold_status
2022-09-28 18:20:46 +05:30
