admin/tradon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge dev from main #1

Merged
admin merged 25 commits from main into dev 2026-01-05 13:03:46 +00:00
Conversation 0 Commits 25 Files Changed 15 +2 -6
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 13b7553641 - Show all commits

8
modules/purchase_trade/dashboard.py
View File

@@ -268,12 +268,10 @@ class Dashboard(ModelSQL, ModelView):
conf = Shipment.search(['state','=','received']) conf = Shipment.search(['state','=','received'])
shipment_r = len(conf) shipment_r = len(conf)
Lot = Pool().get('lot.lot') Lot = Pool().get('lot.lot')
lots = Lot.search(['sale_line','!=',None]) lots = Lot.search([('sale_line','!=',None),('line','!=',None)])
lot_m = len(lots) lot_m = len(lots)
val = Lot.search(['sale_line','=',None]) val = Lot.search([('sale_line','=',None),('line','!=',None)])
lot_a = len(val) lot_a = len(val)
conf = Lot.search(['lot_type','=','physic'])
lot_al = len(conf)
Invoice = Pool().get('account.invoice') Invoice = Pool().get('account.invoice')
invs = Invoice.search(['type','=','in']) invs = Invoice.search(['type','=','in'])
inv_p = len(invs) inv_p = len(invs)
@@ -325,8 +323,6 @@ class Dashboard(ModelSQL, ModelView):
+ str(lot_m) + str(lot_m)
+ "&lot_a=" + "&lot_a="
+ str(lot_a) + str(lot_a)
+ "&lot_al="
+ str(lot_al)
+ "&inv_p=" + "&inv_p="
+ str(inv_p) + str(inv_p)
+ "&inv_p_p=" + "&inv_p_p="