Rucha Mahabal
64075cbebc
Merge branch 'develop' into hr-separation
2022-07-07 17:36:01 +05:30
Labeeb Mattra
8434ec09c3
fix lint
2022-07-07 17:20:21 +05:30
marination
88ac519b24
fix: Use Contact Name instead of Supplier in RFQ Email
2022-07-07 16:59:23 +05:30
Sagar Vora
93f87cb6e2
chore: remove missed code for India localisation
2022-07-07 16:41:41 +05:30
Ankush Menat
bc3f99321a
refactor: department creation ( #31548 )
...
- all department creation always fails after first company, this is
handled in exception handling code but better to not attempt this in
first place.
- move department creation to company.py this has nothing to do with
setup and previous function signature made no sense.
2022-07-07 16:05:18 +05:30
marination
7a6ee8cf2d
chore: Remove image use in website item list
2022-07-07 14:25:02 +05:30
Rucha Mahabal
2248276fe9
chore: Remove gratuity rule patch
2022-07-07 13:48:59 +05:30
Rucha Mahabal
ef02e58859
Merge branch 'develop' into hr-separation
2022-07-07 13:46:54 +05:30
Deepesh Garg
0b5101d9c7
Merge pull request #31546 from deepeshgarg007/regional_quotation
...
fix: Unable to open quotation
2022-07-07 11:53:34 +05:30
Deepesh Garg
f73408bfd6
fix: Unable to open quotation
2022-07-07 10:47:48 +05:30
Sagar Sharma
f9885746a8
Merge branch 'develop' into subcontracting
2022-07-07 09:56:23 +05:30
Suraj Shetty
891fd70882
Merge pull request #31541 from surajshetty3416/update-library-usage
2022-07-07 09:41:05 +05:30
Suraj Shetty
c9dc902dee
Merge branch 'develop' into update-library-usage
2022-07-07 09:40:21 +05:30
Labeeb Mattra
1b5b2138ee
Use adjustment amounts in pending principal amnt
2022-07-06 18:52:04 +05:30
Labeeb Mattra
a1a51ce1a6
Add ref no to balance adjustment remarks
2022-07-06 18:52:04 +05:30
Labeeb Mattra
74dbf8c5d9
Add reference number to repayment remarks
2022-07-06 18:52:04 +05:30
Labeeb Mattra
27a8e16b28
Add NPA checkbox in Loan
2022-07-06 18:52:04 +05:30
Labeeb Mattra
7d6e4898c4
Update list view for Accrual and Shortfall
2022-07-06 18:52:04 +05:30
Labeeb Mattra
6febcd529b
Remove loan account field from doctype
2022-07-06 18:52:04 +05:30
Labeeb Mattra
7d468a8778
Use new adjustment amount fields
2022-07-06 18:52:04 +05:30
Labeeb Mattra
d6f632a770
Seperate credit and debit adjust amount fields in Loan
2022-07-06 18:52:04 +05:30
Abhinav Raut
5c0a25012c
feat: add adjustment amount to loan
...
- fix: bugs in loan balance adjustment
2022-07-06 18:52:04 +05:30
Labeeb Mattra
2e8f056514
Add Loan Balance Adjustment doctype
2022-07-06 18:52:04 +05:30
Labeeb Mattra
e1682965c5
Add Loan Refund doctype
2022-07-06 18:52:04 +05:30
Labeeb Mattra
88cd780ca1
Add refund amount to loan
2022-07-06 18:52:04 +05:30
Labeeb Mattra
a81da2ea85
Add more loan interest accrual types
2022-07-06 18:52:04 +05:30
Labeeb Mattra
900c878e03
update loan interest accrual types
2022-07-06 18:52:04 +05:30
Aditya Hase
7053bb9bb8
fix: Maintain backward compatibility with older bench versions ( #31542 )
...
Older versions of bench depend on `name` in setup.py
Setting it to `frappe` causes some weird behavior like moving `apps/erpnext` to `apps/frappe`
2022-07-06 17:32:21 +05:30
Suraj Shetty
f0e8a518cd
fix: Update font awesome path
2022-07-06 15:10:39 +05:30
Suraj Shetty
32fd753a14
fix: Update html2text import path
2022-07-06 15:09:44 +05:30
Marica
b58d7d1c89
Merge branch 'develop' into make-image-field-obsolete-in-web-item
2022-07-06 14:43:23 +05:30
rohitwaghchaure
8eb676eb5a
Merge pull request #31519 from rohitwaghchaure/fixed-time-out-error-reposting
...
fix: timeout error while reposting
2022-07-06 11:45:02 +05:30
Marica
9b6bb1b3fc
Merge pull request #31529 from marination/petty-purchase
...
fix: Use fallback conversion factor while setting incoming rate for petty purchase
2022-07-06 00:38:37 +05:30
Deepesh Garg
b785d7b904
Merge pull request #31531 from nihantra/pur_inv_docstatus
...
fix: Set the condition to create a purchase receipt
2022-07-05 22:47:17 +05:30
Nihantra C. Patel
3e670eda68
fix: Set the condition to create a purchase receipt
2022-07-05 21:19:50 +05:30
marination
eec07833f4
chore: Remove image from ProductQuery fields
2022-07-05 20:31:04 +05:30
marination
aa043fe961
fix: Use fallback conversion factor while setting incoming rate for petty purchase
...
- PIs for petty items (that do not need an Item record) are allowed using Item Name field
- If a different UOM is used in this case, conversion factor stays 0 and causes an error
- Fallback to 1 in `set_incoming_rate` for buying
- Selling will need a proper item, so this change is not needed there
2022-07-05 19:43:02 +05:30
rohitwaghchaure
96f46b220b
Merge branch 'develop' into fixed-time-out-error-reposting
2022-07-05 19:23:46 +05:30
Deepesh Garg
37f7801cfb
Merge pull request #29884 from resilient-tech/remove-india
...
refactor: remove India specific code
2022-07-05 18:50:41 +05:30
Rohit Waghchaure
78c8bb251e
fix: timeout error while reposting
2022-07-05 18:45:13 +05:30
rohitwaghchaure
8835d16b60
Merge pull request #31514 from ruthra-kumar/fix_test_for_pr_tool
...
fix: test pr output for amount and currency
2022-07-05 18:35:01 +05:30
rohitwaghchaure
c2432778ef
Merge branch 'develop' into fix_test_for_pr_tool
2022-07-05 17:18:50 +05:30
rohitwaghchaure
d5b0b5e798
Merge pull request #31523 from rohitwaghchaure/fixed-test-case-backflushed_batch-raw-materials
...
fix: test case
2022-07-05 15:10:59 +05:30
Rohit Waghchaure
7282c8e65b
fix: test case
2022-07-05 15:10:28 +05:30
Sagar Sharma
f75d35ed60
Merge branch 'develop' into subcontracting
2022-07-05 11:25:08 +05:30
Ankush Menat
90942d2ba5
chore: remove currency info from boot ( #31520 )
...
refactor: remove currency info from boot
Framework loads this info by default now, so no need to add it here.
2022-07-05 11:22:32 +05:30
Sagar Sharma
a7161d3875
fix: SCO status on SCR cancel
2022-07-05 09:27:56 +05:30
Sagar Sharma
6f7e67db9d
chore: hide "Duplicate" button in PO
2022-07-05 08:44:35 +05:30
Sagar Sharma
687329f571
chore: update fg_item_qty based on qty in PO Item
2022-07-05 08:31:31 +05:30
Deepesh Garg
d5da8c7403
Merge pull request #31516 from deepeshgarg007/previsional_accounting_report
...
fix: Incorrect provisional expense booking while reposting
2022-07-04 20:28:10 +05:30
