Sagar Sharma
213113bc00
Merge branch 'develop' into subcontracting
2022-05-20 12:13:13 +05:30
Sagar Sharma
e9b28452e4
feat: SCR return
2022-05-20 10:45:34 +05:30
Sagar Sharma
323bdf85ce
feat: SL and GL reposting
2022-05-20 10:45:34 +05:30
Sagar Sharma
fcc09592b9
refactor!: Stock Ledger Entry
2022-05-20 10:45:34 +05:30
Sagar Sharma
6c794afbe7
refactor!: Item Alternative
2022-05-20 10:45:34 +05:30
Sagar Sharma
92625902ad
refactor!: BOM
2022-05-20 10:45:34 +05:30
Sagar Sharma
05f05ab75b
refactor!: Subcontracted Item To Be Transferred
2022-05-20 10:45:33 +05:30
Sagar Sharma
3be663b121
refactor!: Subcontracted Item To Be Received
2022-05-20 10:45:33 +05:30
Sagar Sharma
8486bbf31a
refactor!: Subcontract Order Summary
2022-05-20 10:45:33 +05:30
Sagar Sharma
3469560105
refactor!: Accounts Controller
2022-05-20 10:45:33 +05:30
Sagar Sharma
5fa3f58c06
refactor!: Purchase Invoice
2022-05-20 10:45:33 +05:30
Sagar Sharma
f09fc46059
refactor!: Purchase Receipt
2022-05-20 10:45:33 +05:30
Sagar Sharma
73484448f2
refactor!: Stock Entry
2022-05-20 10:45:33 +05:30
Sagar Sharma
34bda14b5b
refactor!: Buying Controller
2022-05-20 10:45:33 +05:30
Sagar Sharma
dafaed3cbd
refactor!: Purchase Order
2022-05-20 10:45:33 +05:30
Sagar Sharma
785d598762
test: SubcontractingReceipt
2022-05-20 10:45:33 +05:30
Sagar Sharma
8bc653b633
test: SubcontractingOrder
2022-05-20 10:45:33 +05:30
Sagar Sharma
574181f3d7
test: SubcontractingController
2022-05-20 10:45:33 +05:30
Sagar Sharma
70a1f40624
feat: New DocType "Subcontracting Receipt"
2022-05-20 10:45:33 +05:30
Sagar Sharma
3b17584bee
feat: New DocType "Subcontracting Receipt Supplied Item"
2022-05-20 10:45:33 +05:30
Sagar Sharma
3daf62dce8
feat: New DocType "Subcontracting Receipt Item"
2022-05-20 10:45:33 +05:30
Sagar Sharma
409df263e8
refactor!: change "is_subcontracted" field type from "Select" to "Check"
2022-05-20 10:45:33 +05:30
Sagar Sharma
249726b845
feat: New DocType "Subcontracting Order"
2022-05-20 10:45:33 +05:30
Sagar Sharma
f49c51ab74
feat: New DocType "Subcontracting Order Supplied Item"
2022-05-20 10:45:33 +05:30
Sagar Sharma
f8b7594292
feat: New DocType "Subcontracting Order Item"
2022-05-20 10:45:33 +05:30
Sagar Sharma
dcac7eb67c
feat: New DocType "Subcontracting Order Service Item"
2022-05-20 10:45:33 +05:30
Sagar Sharma
29a1cb89c2
feat: SubcontractingController
2022-05-20 10:45:33 +05:30
Sagar Sharma
68c21d9895
feat: Add fields "subcontracting_order" and "sco_rm_detail" in SE and SE Detail
2022-05-20 10:45:33 +05:30
Sagar Sharma
77db843692
refactor!: Make required changes to create SCO from PO
2022-05-20 10:45:30 +05:30
Deepesh Garg
3128f9603e
fix: Loan repayment entries for payroll payable account
2022-05-20 08:31:37 +05:30
Deepesh Garg
5edd1dbb35
Merge pull request #31004 from ruthra-kumar/bug_payment_terms_status_rpt
...
fix: duplicate entries in payment terms report output
2022-05-20 07:53:40 +05:30
marination
90d4dc0cd6
fix: test_work_order_with_non_stock_item
...
- Use the right price list and currency to avoid rate conversion (1000/62.9), since rates are reset correctly now
- Use RM rate based on Price List in BOM. Non stock item has no valuation
2022-05-20 03:12:42 +05:30
marination
dd99c00eb6
fix: Get fresh RM rate in calculate_rm_cost
2022-05-19 21:48:24 +05:30
marination
9a7e9d902d
perf: Use cached doc instead of get_doc
...
- Doc is only used to iterate over items(which wont change) and change rate/amount of rows
- These changes are inserted in db via `db_update`, so no harm
- Tested locally: refetching cached doc after db update, reflects fresh data.
2022-05-19 21:24:31 +05:30
Rucha Mahabal
7d4872aedd
patch: set payroll entry status
2022-05-19 20:35:56 +05:30
Rucha Mahabal
ef8164f188
refactor: UX for Salary Slip creation and submission via Payroll Entry
...
- Add status for Queued/Failed
- log errors and show corrective actions in payroll entry
2022-05-19 20:33:55 +05:30
marination
9dc3083088
fix: Call calculate_cost for Draft BOM and typo in argument
2022-05-19 20:33:48 +05:30
marination
5932e9d78a
fix: DB update child items, remove redundancy, fix perf
...
- Move `get_boms_in_bottom_up_order` in bom update tool’s file
- Remove repeated rm cost update from `update_cost`. `calculate_cost` handles RM cost update
- db_update children in `calculate_cost` optionally
- Don’t call `update_exploded_items` and regenerate exploded items in `update_cost`. They will stay the same (except cost)
2022-05-19 20:22:13 +05:30
Ankush Menat
6d6616dbcd
fix: always update item_name for stock entry ( #31068 )
...
If item_name is already set and for some reason becomes outdated then
it's not updated in backend.
Fix: always set item_name and stock_uom when fetching item details
2022-05-19 14:25:47 +05:30
Ankush Menat
1de6b14d15
fix: remove "scrap %" field ( #31069 )
...
This does nothing, there's scrap items table below that's actually used
for specifying scrap.
2022-05-19 14:25:16 +05:30
Rucha Mahabal
81c82c8d53
fix(ux): inform the user about salary slip creation/submission happening in the background
2022-05-19 13:41:11 +05:30
marination
b6e46eea80
perf: get_boms_in_bottom_up_order
...
- Create child-parent map once and fetch value from child key to get parents
- Get parents recursively for a leaf node (get all ancestors)
- Approx. 44 secs for 4lakh 70k boms
2022-05-18 13:00:00 +05:30
Saqib Ansari
9fb7b49b43
fix(india): error while parsing e-invoice ( #31053 )
2022-05-18 11:53:00 +05:30
maharshivpatel
65d55ea8fa
fix(india): eway bill cancel api is disabled ( #31055 )
2022-05-18 11:52:31 +05:30
Vladislav
fb586eb7c0
Update ru.csv
2022-05-18 00:02:25 +03:00
Vladislav
0843344119
Update ru.csv
2022-05-17 16:21:42 +03:00
marination
e07ce6efe0
fix: Job Card excess transfer behaviour
...
- Block excess transfer of items if not allowed in settings
- Behaviour made consistent with js behaviour (button disappears if not pending and not allowed in settings)
- Test for same case
2022-05-17 17:39:45 +05:30
Rucha Mahabal
28fe4f3d54
fix: unlink Attendance from Employee Checkins on cancellation ( #31045 )
2022-05-17 12:07:58 +05:30
Deepak
867f2c6282
fix: TypeError in add_indicator_for_multicompany ( #31042 )
...
Minor fix in add_indicator_for_multicompany
In case of multi-company transactions add (+) buttons in connection dashboard pf customer aren't being loaded due to TypeError (TypeError: e.dashboard.stats_area.removeClass is not a function) created by "frm.dashboard.stats_area.removeClass('hidden');" during the stats section creation.
2022-05-17 11:52:52 +05:30
Saqib Ansari
f915a9cef7
fix: discount ledger entry in case of multicurrency invoice ( #31024 )
2022-05-17 11:22:01 +05:30
