schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: merge conflict

Browse Source
This commit is contained in:
Nabin Hait
2021-05-31 11:21:18 +05:30
parent 05d5fb24f7 d0ba0217e4
commit a3d1b6973a
104 changed files with 2251 additions and 1477 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/public/js/controllers/buying.js
View File

@@ -84,13 +84,13 @@ erpnext.buying.BuyingController = class BuyingController extends erpnext.Transac
if (me.frm.doc.is_subcontracted == "Yes") {
return{
query: "erpnext.controllers.queries.item_query",
filters:{ 'is_sub_contracted_item': 1 }
filters:{ 'supplier': me.frm.doc.supplier, 'is_sub_contracted_item': 1 }
}
}
else {
return{
query: "erpnext.controllers.queries.item_query",
filters: {'is_purchase_item': 1}
filters: { 'supplier': me.frm.doc.supplier, 'is_purchase_item': 1 }
}
}
});