Commit Graph

41977 Commits

Author SHA1 Message Date
Sagar Sharma
6e5effc1b0 Merge branch 'develop' into subcontracting 2022-05-23 11:35:50 +05:30
Wolfram Schmidt
348a674df9 fix translation German "Designation" (#31082)
changed "Bezeichnung" to "Position" as the is more precice in the field of employment which erpnext refers to here
2022-05-23 11:23:12 +05:30
Rucha Mahabal
34e238ce4f fix: Leave Encashment calculations (#31062) 2022-05-23 10:13:49 +05:30
Ankush Menat
3019f93915 Merge pull request #31083 from ankush/jc_corrective_creation
fix: corrective job card creation
2022-05-21 14:28:08 +05:30
Ankush Menat
66cf9aa344 fix: creation of corrective job card fails
This used to fail because sub_operations is a child table that's not
initalized by default till v13, in develop branch we init tables with
empty list.
2022-05-21 14:01:30 +05:30
Ankush Menat
e625394488 test: simplify job card tests 2022-05-21 14:01:28 +05:30
Sagar Sharma
07dc5f180d Merge branch 'develop' into subcontracting 2022-05-21 10:02:47 +05:30
ruthra kumar
dac678e3fc test: payment ledger entry 2022-05-20 18:21:47 +05:30
ruthra kumar
e888975007 refactor: link payment ledger with gl entry creation 2022-05-20 18:21:47 +05:30
ruthra kumar
59ed7c854d refactor: ignore linked Payment Ledger Entry in basic transactions 2022-05-20 18:21:47 +05:30
ruthra kumar
451cf3a937 refactor: helper class for ple creation and delinking
Helper functions for delinking ple and for creating payment ledger
entry for transactions on receivable/payable account types
2022-05-20 18:21:47 +05:30
ruthra kumar
7b1cb6711d refactor: include Payment ledger in accounting dimensions list 2022-05-20 18:21:47 +05:30
ruthra kumar
8e72f19bfb feat: patch to migrate gl entries to payment ledger 2022-05-20 18:21:47 +05:30
ruthra kumar
163085f201 feat: payment ledger doctype created 2022-05-20 18:21:47 +05:30
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
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
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
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
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