Ankush
4e88dcf956
fix: auto unlink warehouse from item on delete ( #26073 ) ( #26101 )
...
* fix: auto unlink warehouse from item on delete
* fix: sider
* refactor: use delete_doc
* test: add test for unlinking warehouse from item
* refactor: add msgprint to inform user of unlink
* refactor: cleanup and reuse extant functions
* fix: don't delete row, update table
Co-authored-by: Alan <2.alan.tom@gmail.com>
2021-06-18 14:48:30 +05:30
Ankush
584fe32900
fix: escaped warehouse value for sql query (bp #26049 )
...
Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>
2021-06-18 14:47:30 +05:30
rohitwaghchaure
e43df63978
Merge pull request #26099 from rohitwaghchaure/enqueue-cancel-action-in-stock-reco-develop
...
fix: timeout while cancelling stock reconciliation
2021-06-18 11:31:00 +05:30
Rohit Waghchaure
7fc50ba460
fix: timeout while cancelling stock reconciliation
2021-06-18 10:45:53 +05:30
GangaManoj
94dfd0e318
fix(Asset): Add function to clear old depreciation schedule
2021-06-18 09:59:45 +05:30
GangaManoj
354116142a
fix(Asset Repair): Create GL Entries for each item in Stock Items
2021-06-18 09:53:18 +05:30
Suraj Shetty
6894cc2832
Merge pull request #26088 from surajshetty3416/refactor-website-routing
2021-06-17 20:43:23 +05:30
Suraj Shetty
e8e4841e5e
ci: Build frappe assets
...
- Build frappe assets since it is used for print views
2021-06-17 20:23:18 +05:30
Deepesh Garg
1c1e25da45
Merge pull request #25896 from buff0k/patch-3
...
fix: Correct South Africa VAT Rate
2021-06-17 18:27:00 +05:30
Deepesh Garg
ceb9d9e870
Merge branch 'develop' into patch-3
2021-06-17 18:26:42 +05:30
Deepesh Garg
1c58d79142
Merge pull request #26077 from nemesis189/fixed-label-rate-of-purchase-invoice-item
...
fix: removed extra space from label rate
2021-06-17 17:18:52 +05:30
GangaManoj
05c70ac584
fix(Asset): Replace asset_value with value_after_depreciation in Finance Books
2021-06-17 13:02:02 +05:30
Suraj Shetty
00332d1834
Merge branch 'develop' of github.com:frappe/erpnext into refactor-website-routing
2021-06-17 09:47:16 +05:30
GangaManoj
66d4e2ba51
fix(Asset Repair): Display value_after_depreciation in Finance Books
2021-06-17 08:28:19 +05:30
Subin Tom
c03a947e98
fix: removed extra space from label rate
2021-06-16 19:47:55 +05:30
Afshan
d5c172590f
fix(pos): pos loyalty card alignment ( #26050 )
2021-06-16 14:28:03 +05:30
Ankush
fd84847f2b
fix: syntax fixes for native class ( #26064 )
2021-06-16 11:14:40 +05:30
GangaManoj
34997789cd
fix(Asset Repair): Filter Warehouse by Company
2021-06-16 10:48:07 +05:30
GangaManoj
6d6aee29e8
fix(Asset Repair): Fix GL Entry creation
2021-06-16 10:42:37 +05:30
GangaManoj
491763fa27
fix(Asset Repair): Fix Sider issues
2021-06-16 08:45:54 +05:30
GangaManoj
a33e751b0f
fix(Asset Repair): Make Cost Center non-mandatory
2021-06-16 08:35:50 +05:30
GangaManoj
abb0c769a4
fix(Asset Repair): Uncheck allow_on_submit for all fields
2021-06-16 08:33:05 +05:30
GangaManoj
c61bbc5915
fix(Asset Repair): Use existing function from asset.py for fetching fixed_asset_account
2021-06-16 08:26:02 +05:30
GangaManoj
94ac52c47d
fix(Asset Repair): Add mandatory_depends_on condition for Purchase Invoice
2021-06-16 08:18:45 +05:30
GangaManoj
71c60f75d7
fix(Asset Repair): Filter Cost Center and Project by Company
2021-06-16 08:13:36 +05:30
GangaManoj
9e07b7d4a7
fix(Asset Repair): Add Company field
2021-06-16 08:07:06 +05:30
GangaManoj
bf52f55870
fix(Asset Repair): Make Stock Items and Warehouse mandatory if stock_consumption is checked
2021-06-16 07:56:40 +05:30
GangaManoj
695cd70994
fix(Asset Repair): Add title to error messages
2021-06-16 07:50:03 +05:30
GangaManoj
14ea9ebcb7
fix(Asset Repair): Display fields according to the state of the doc
2021-06-16 07:03:32 +05:30
Nabin Hait
0950481253
fix: merge conflict
2021-06-15 20:18:06 +05:30
Nabin Hait
a97556fa8d
Merge branch 'version-13-pre-release' into version-13
2021-06-15 19:58:40 +05:30
Nabin Hait
24a88f6cf6
bumped to version 13.5.0
2021-06-15 20:18:40 +05:50
Nabin Hait
1e2df2c109
fix(pos): 'NoneType' object is not iterable
2021-06-15 19:53:57 +05:30
Nabin Hait
b2f2d0e749
chore: Added change log for v13.5.0
2021-06-15 19:44:06 +05:30
Deepesh Garg
95bc141531
Merge pull request #26056 from deepeshgarg007/gst_taxtable_value_with_discount_v13
...
fix(India): Taxable value for invoices with additional discount
2021-06-15 12:05:16 +05:30
GangaManoj
285bc60684
fix(Asset Repair): Set asset_name as title
2021-06-15 12:02:07 +05:30
GangaManoj
d4acf87feb
fix(Asset Repair): Make Accounting Dimensions section collapsible
2021-06-15 11:37:17 +05:30
Deepesh Garg
433815daba
fix: Update einvoice json test
2021-06-14 20:43:51 +05:30
Deepesh Garg
4afda3c89c
fix(India): Taxable value for invoices with additional discount
2021-06-14 20:43:42 +05:30
Deepesh Garg
a717b5ad6e
Merge pull request #26055 from deepeshgarg007/payment_entry_auto_tax_fixes_pre_release
...
fix: Auto tax calculations in Payment Entry
2021-06-14 20:39:52 +05:30
Deepesh Garg
bbf6121bb5
fix: Revert unintended changes
2021-06-14 20:09:31 +05:30
Deepesh Garg
ac52daa14f
fix: Import throw
2021-06-14 20:09:23 +05:30
Deepesh Garg
5ef9a62917
fix: Add separate function to validate payment entry taxes
2021-06-14 20:09:17 +05:30
Deepesh Garg
302855e160
fix: Auto tax calculations in Payment Entry
2021-06-14 20:09:10 +05:30
Saqib
80077d215f
fix: patch for adding doctype to sla ( #26053 )
2021-06-14 19:34:25 +05:30
Himanshu
ec25d5938b
feat(SLA): Apply SLA to any document ( #22449 )
2021-06-14 19:05:52 +05:30
Marica
326a2e6a99
Merge pull request #26020 from marination/subcontracted-rm-to-transfer-report-develop
...
fix: Report Subcontracted Raw Materials to be Transferred
2021-06-14 17:11:51 +05:30
Marica
ff1360a8e6
Merge branch 'develop' into subcontracted-rm-to-transfer-report-develop
2021-06-14 16:48:57 +05:30
marination
5d082b05a9
fix: Flaky test for Report Subcontracted Raw materials to be transferred
2021-06-14 16:31:45 +05:30
Nabin Hait
580b4d50b5
Merge pull request #26027 from ruchamahabal/add-inactive-status-to-employee
...
feat: add Inactive status to Employee
2021-06-14 12:34:33 +05:30
