Deepesh Garg
|
4b828dd276
|
Merge branch 'develop' of https://github.com/frappe/erpnext into loan_schedule_types
|
2022-10-08 18:41:39 +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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|