Unifield Server

Merge lp:~dorian-kemps/unifield-server/US-10222 into lp:unifield-server

  1. US-10222
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 6282
Proposed branch: lp:~dorian-kemps/unifield-server/US-10222
Merge into: lp:unifield-server
Diff against target: 52 lines (+10/-6)
2 files modified
bin/addons/sales_followup/report/sale_follow_up_report_multi.py (+9/-5)
bin/addons/sales_followup/wizard/sale_followup_multi_wizard_view.xml (+1/-1)
To merge this branch: bzr merge lp:~dorian-kemps/unifield-server/US-10222
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+427109@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/addons/sales_followup/report/sale_follow_up_report_multi.py'
2--- bin/addons/sales_followup/report/sale_follow_up_report_multi.py 2021-12-16 15:03:07 +0000
3+++ bin/addons/sales_followup/report/sale_follow_up_report_multi.py 2022-07-19 16:23:38 +0000
4@@ -83,8 +83,11 @@
5
6 def _get_order_line(self, order_id):
7 order_line_ids = self.pool.get('sale.order.line').search(self.cr, self.uid, [('order_id', '=', order_id)])
8+ ftf = ['id', 'line_number', 'state', 'state_to_display', 'order_id', 'product_id', 'product_uom_qty',
9+ 'product_uom', 'esti_dd', 'confirmed_delivery_date', 'move_ids']
10 for order_line_id in order_line_ids:
11- yield self.pool.get('sale.order.line').browse(self.cr, self.uid, order_line_id, context=self.localcontext)
12+ yield self.pool.get('sale.order.line').browse(self.cr, self.uid, order_line_id,
13+ fields_to_fetch=ftf, context=self.localcontext)
14
15 raise StopIteration
16
17@@ -94,10 +97,10 @@
18 '''
19 if not move.picking_id or not move.picking_id.shipment_id:
20 return False
21- for pack_fam_mem in move.picking_id.shipment_id.pack_family_memory_ids:
22- for m in pack_fam_mem.move_lines:
23- if m.not_shipped and m.id == move.id:
24- return True
25+ self.cr.execute('''SELECT id FROM stock_move WHERE not_shipped = 't' AND pick_shipment_id = %s AND id = %s''',
26+ (move.picking_id.shipment_id.id, move.id))
27+ if self.cr.fetchone():
28+ return True
29 return False
30
31 def in_line_data_expected_date(self, pol_id):
32@@ -139,6 +142,7 @@
33 m_index = 0
34 bo_qty = line.product_uom_qty
35 po_name = '-'
36+
37 supplier_name = '-'
38
39 edd = False
40
41=== modified file 'bin/addons/sales_followup/wizard/sale_followup_multi_wizard_view.xml'
42--- bin/addons/sales_followup/wizard/sale_followup_multi_wizard_view.xml 2018-04-04 15:16:00 +0000
43+++ bin/addons/sales_followup/wizard/sale_followup_multi_wizard_view.xml 2022-07-19 16:23:38 +0000
44@@ -13,7 +13,7 @@
45 <field name="start_date" />
46 <field name="end_date" />
47 <field name="partner_id" domain="[('customer', '=', True)]" on_change="partner_onchange(partner_id, order_id)" />
48- <field name="order_id" domain="[('to_partner_id', '=', partner_id)]" />
49+ <field name="order_id" domain="[('to_partner_id', '=', partner_id), ('procurement_request', '=', False)]" />
50 <separator colspan="4" string="Order statuses" />
51 <group colspan="4" col="8">
52 <field name="draft_ok" />

Subscribers

People subscribed via source and target branches