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

[jftempo]

=== modified file 'bin/addons/base/rng/view.rng'
--- bin/addons/base/rng/view.rng	2024-02-27 09:10:05 +0000
+++ bin/addons/base/rng/view.rng	2024-05-07 10:17:45 +0000
@@ -504,6 +504,7 @@
             <rng:optional><rng:attribute name="required_error_msg"/></rng:optional>
             <rng:optional><rng:attribute name="truncate"/></rng:optional>
             <rng:optional><rng:attribute name="tooltip"/></rng:optional>
+            <rng:optional><rng:attribute name="colors"/></rng:optional>
             <rng:zeroOrMore>
                 <rng:choice>
                     <rng:ref name="diagram"/>

=== modified file 'bin/addons/msf_doc_import/wizard/wizard_import_po_line.py'
--- bin/addons/msf_doc_import/wizard/wizard_import_po_line.py	2023-11-03 15:04:29 +0000
+++ bin/addons/msf_doc_import/wizard/wizard_import_po_line.py	2024-05-07 10:17:45 +0000
@@ -329,9 +329,7 @@
                                 if not price_value['price_unit_defined']:
                                     raise osv.except_osv(_('Error'), _("Price must be defined in the RfQ import file."))
 
-                                # in case of update we do not want to update qty and uom values :
-                                if 'product_qty' in to_write:
-                                    to_write.pop('product_qty')
+                                # in case of update we do not want to update uom values :
                                 if 'product_uom' in to_write:
                                     to_write.pop('product_uom')
 

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2024-05-02 13:19:58 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2024-05-07 10:17:45 +0000
@@ -8288,7 +8288,6 @@
 #: report:stock.forecast.report:0
 #: report:delivery.order:0
 #: report:internal.move:0
-#: report:addons/tender_flow/report/tender_rfq_comparison_xls.mako:573
 #: report:addons/msf_supply_doc_export/report/internal_request_export_xls.mako:132
 #: code:addons/sale/wizard/internal_request_import.py:45
 #: field:internal.request.import.line,imp_qty:0
@@ -27177,7 +27176,6 @@
 #: field:wizard.import.po.simulation.screen.line,in_qty:0
 #: field:wizard.simu.import.po.line,import_qty:0
 #: field:wizard.simu.import.po.line,initial_qty:0
-#: field:wizard.compare.rfq.line,quantity:0
 #: report:addons/purchase_followup/report/po_track_changes_report_xls.mako:237
 #: view:purchase.order:0
 #: field:stock.reserved.products,product_qty:0
@@ -98352,11 +98350,18 @@
 msgid "Server Actions"
 msgstr "Serveur - Actions "
 
-#. module: product
+#. module: product, tender_flow
 #: selection:product.price.type,field:0
 #: field:product.template,seller_qty:0
+#: report:addons/tender_flow/report/tender_rfq_comparison_xls.mako:663
 msgid "Supplier Quantity"
-msgstr "Fournisseur - Quantité"
+msgstr "Quantité Fournisseur"
+
+#. module: purchase_compare_rfq
+#: code:addons/purchase_compare_rfq/wizard/compare_rfq.py:475
+#, python-format
+msgid "Supplier Qty"
+msgstr "Qté Fournisseur"
 
 #. module: base
 #: report:ir.module.reference:0
@@ -121806,6 +121811,7 @@
 #, python-format
 msgid "This action can only be done on a Picking"
 msgstr "Cette action peut uniquement être faite sur un Picking"
+<<<<<<< TREE
 
 #. modules: purchase, sale
 #: code:addons/purchase/purchase_workflow.py:107
@@ -122096,3 +122102,21 @@
 msgid "No valid catalogue"
 msgstr "Aucun catalogue valide"
 
+=======
+
+#. module: purchase_compare_rfq
+#: field:wizard.compare.rfq.line,quantity:0
+msgid "Tender Qty"
+msgstr "Qté Appel d'Offre"
+
+#. module: tender_flow
+#: report:addons/tender_flow/report/tender_rfq_comparison_xls.mako:659
+msgid "Tender Quantity"
+msgstr "Quantité Appel d'Offre"
+
+#. module: purchase_compare_rfq
+#: code:addons/purchase_compare_rfq/wizard/compare_rfq.py:500
+#, python-format
+msgid "Quantity Discrepancy"
+msgstr "Écart de Quantité"
+>>>>>>> MERGE-SOURCE

=== modified file 'bin/addons/purchase/purchase_order.py'
--- bin/addons/purchase/purchase_order.py	2024-05-02 13:19:58 +0000
+++ bin/addons/purchase/purchase_order.py	2024-05-07 10:17:45 +0000
@@ -1636,7 +1636,7 @@
     def copy_web(self, cr, uid, id, defaults=None, context=None):
         if defaults is None:
             defaults = {}
-        defaults['from_procurement'] = False
+        defaults.update({'from_procurement': False, 'tender_id': False})
         is_direct = False
         if self.search_exists(cr, uid, [('id', '=', id), ('order_type', '=', 'direct')], context=context):
             company_id = self.pool.get('res.users').get_current_company(cr, uid)[0][0]

=== modified file 'bin/addons/purchase_compare_rfq/wizard/compare_rfq.py'
--- bin/addons/purchase_compare_rfq/wizard/compare_rfq.py	2022-08-18 14:56:03 +0000
+++ bin/addons/purchase_compare_rfq/wizard/compare_rfq.py	2024-05-07 10:17:45 +0000
@@ -416,7 +416,7 @@
         ),
         'quantity': fields.float(
             digits=(16,2),
-            string='Qty',
+            string='Tender Qty',
         ),
         'uom_id': fields.many2one(
             'product.uom',
@@ -467,6 +467,13 @@
                     'size': 128,
                     'string': _('Supplier'),
                 },
+                # Quantity on the related RfQ line
+                'qty_%s' % sid: {
+                    'selectable': True,
+                    'type': 'float',
+                    'digits': (16,2),
+                    'string': _('Supplier Qty'),
+                },
                 # Unit price on the related RfQ line
                 'unit_price_%s' % sid: {
                     'selectable': True,
@@ -486,6 +493,12 @@
                     'type': 'text',
                     'string': _('Comment'),
                 },
+                # Check to see if the RfQ line qty is different than the one on the related Tender line
+                'qty_discr_%s' % sid: {
+                    'selectable': True,
+                    'type': 'boolean',
+                    'string': _('Quantity Discrepancy'),
+                },
             })
 
         return res
@@ -529,9 +542,10 @@
                     ('tender_line_id', '=', r['tender_line_id']),
                 ], context=context)
                 rfql = None
-                pu = 0.00
+                qty, pu = 0.00, 0.00
                 if rfql_ids:
                     rfql = pol_obj.browse(cr, uid, rfql_ids[0], context=context)
+                    qty = rfql.product_qty
                     pu = rfql.price_unit
                     same_cur = rfql.order_id.pricelist_id.currency_id.id == cur_id
                     if not same_cur:
@@ -539,28 +553,26 @@
 
                 r.update({
                     'name_%s' % sid: sup.name,
+                    'qty_%s' % sid: rfql and qty or 0.00,
                     'unit_price_%s' % sid: rfql and pu or 0.00,
                     'confirmed_delivery_date_%s' % sid: rfql and rfql.confirmed_delivery_date or False,
                     'comment_%s' % sid: rfql and rfql.comment or '',
+                    'qty_discr_%s' % sid: rfql and rfql.tender_line_id and rfql.tender_line_id.qty != qty or False,
                 })
 
         return res
 
-    def fields_view_get(self, cr, uid, view_id=None, view_type='form',
-                        context=None, toolbar=False, submenu=False):
+    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
         """
-        Display the computed fields according to number of suppliers in the
-        tender.
+        Display the computed fields according to number of suppliers in the tender.
         """
         t_obj = self.pool.get('tender')
 
         if context is None:
             context = {}
 
-        res = super(wizard_compare_rfq_line, self).fields_view_get(
-            cr, uid, view_id, view_type,
-            context=context, toolbar=toolbar,
-            submenu=submenu)
+        res = super(wizard_compare_rfq_line, self).fields_view_get(cr, uid, view_id, view_type, context=context,
+                                                                   toolbar=toolbar, submenu=submenu)
 
         if view_type == 'tree':
             tree_view = """<tree string="Compared products" editable="top">
@@ -570,12 +582,11 @@
                 <field name="quantity" readonly="1" />
                 <field name="uom_id" readonly="1" />
             """
-            fld_to_add = ['name', 'unit_price', 'comment', 'confirmed_delivery_date']
+            fld_to_add = ['qty_discr', 'name', 'qty', 'unit_price', 'comment', 'confirmed_delivery_date']
             t_id = context.get('tender_id', False)
             s_ids = []
             if t_id:
-                s_ids = t_obj.\
-                    browse(cr, uid, t_id, context=context).supplier_ids
+                s_ids = t_obj.browse(cr, uid, t_id, context=context).supplier_ids
 
             for sup in s_ids:
                 tree_view += """
@@ -595,9 +606,12 @@
                 """ % {'sid': sup.id}
 
                 for fld in fld_to_add:
-                    tree_view += """
-                        <field name="%s_%s" readonly="1" not_sortable="1"/>
-                     """ % (fld, sup.id)
+                    if fld == 'qty_discr':
+                        tree_view += """<field name="%s_%s" readonly="1" not_sortable="1" invisible="1"/>""" % (fld, sup.id)
+                    else:
+                        tree_view += """
+                            <field name="%s_%s" readonly="1" not_sortable="1" colors="red:qty_discr_%s==True"/>
+                        """ % (fld, sup.id, sup.id)
 
             if s_ids:
                 tree_view += """

=== modified file 'bin/addons/tender_flow/report/tender_rfq_comparison_xls.mako'
--- bin/addons/tender_flow/report/tender_rfq_comparison_xls.mako	2022-02-24 09:02:02 +0000
+++ bin/addons/tender_flow/report/tender_rfq_comparison_xls.mako	2024-05-07 10:17:45 +0000
@@ -51,6 +51,19 @@
    <NumberFormat/>
    <Protection/>
   </Style>
+  <Style ss:ID="s67red">
+   <Alignment ss:Horizontal="Left" ss:Vertical="Center" ss:WrapText="1"/>
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
+   </Borders>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="11" ss:Color="#ff0000"/>
+   <Interior/>
+   <NumberFormat/>
+   <Protection/>
+  </Style>
   <Style ss:ID="s68">
    <Alignment ss:Horizontal="Left" ss:Vertical="Bottom"/>
    <Borders>
@@ -202,6 +215,18 @@
    <NumberFormat/>
    <Protection/>
   </Style>
+  <Style ss:ID="s87red">
+   <Alignment ss:Horizontal="Left" ss:Vertical="Center" ss:WrapText="1"/>
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
+   </Borders>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="11" ss:Color="#ff0000"/>
+   <Interior/>
+   <NumberFormat/>
+   <Protection/>
+  </Style>
   <Style ss:ID="s88">
    <Alignment ss:Vertical="Center" ss:WrapText="1"/>
    <Borders>
@@ -214,6 +239,18 @@
    <NumberFormat ss:Format="Fixed"/>
    <Protection/>
   </Style>
+  <Style ss:ID="s88red">
+   <Alignment ss:Vertical="Center" ss:WrapText="1"/>
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
+   </Borders>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="11" ss:Color="#ff0000"/>
+   <Interior/>
+   <NumberFormat ss:Format="Fixed"/>
+   <Protection/>
+  </Style>
   <Style ss:ID="s89">
    <NumberFormat ss:Format="Short Date"/>
    <Alignment ss:Vertical="Center" ss:WrapText="1"/>
@@ -236,6 +273,18 @@
    <NumberFormat/>
    <Protection/>
   </Style>
+  <Style ss:ID="s90red">
+   <Alignment ss:Horizontal="Left" ss:Vertical="Center" ss:WrapText="1"/>
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2"/>
+   </Borders>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="11" ss:Color="#ff0000"/>
+   <Interior/>
+   <NumberFormat/>
+   <Protection/>
+  </Style>
   <Style ss:ID="s91">
    <Alignment ss:Horizontal="Left" ss:Vertical="Center" ss:WrapText="1"/>
    <Borders>
@@ -248,6 +297,19 @@
    <NumberFormat/>
    <Protection/>
   </Style>
+  <Style ss:ID="s91red">
+   <Alignment ss:Horizontal="Left" ss:Vertical="Center" ss:WrapText="1"/>
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
+   </Borders>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="11" ss:Color="#ff0000"/>
+   <Interior/>
+   <NumberFormat/>
+   <Protection/>
+  </Style>
   <Style ss:ID="s92">
    <Alignment ss:Horizontal="Left" ss:Vertical="Center" ss:WrapText="1"/>
    <Borders>
@@ -287,7 +349,7 @@
    <Protection/>
   </Style>
   <Style ss:ID="s98">
-   <Alignment ss:Horizontal="Center" ss:Vertical="Center"/>
+   <Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
    <Borders>
     <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
     <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
@@ -404,6 +466,17 @@
     <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
     </Borders>
 </Style>
+<Style ss:ID="sShortDateRed">
+<NumberFormat ss:Format="Short Date"/>
+<Alignment ss:Vertical="Bottom" ss:Horizontal="Left" ss:WrapText="1"/>
+    <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
+    </Borders>
+    <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="11" ss:Color="#ff0000"/>
+</Style>
 <Style ss:ID="mSupHeader">
     <Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
     <Borders>
@@ -428,6 +501,18 @@
     <NumberFormat/>
     <Protection/>
 </Style>
+<Style ss:ID="mSupQty">
+    <Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
+    <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
+    </Borders>
+    <Interior ss:Color="#FFFF99" ss:Pattern="Solid"/>
+    <NumberFormat/>
+    <Protection/>
+</Style>
 <Style ss:ID="mSupUnit">
     <Alignment ss:Horizontal="Center" ss:Vertical="Center"/>
     <Borders>
@@ -499,10 +584,11 @@
    <Column ss:AutoFitWidth="0" ss:Width="50"/>
    <Column ss:AutoFitWidth="0" ss:Width="80"/>
    <Column ss:AutoFitWidth="0" ss:Width="250"/>
-   <Column ss:Width="40"/>
+   <Column ss:Width="50"/>
    <Column ss:AutoFitWidth="0" ss:Width="50"/>
    % for numsup in range(0, len(o.supplier_ids)):
    <Column ss:AutoFitWidth="0" ss:Width="120"/>
+   <Column ss:Width="50"/>
    <Column ss:AutoFitWidth="0" ss:Width="70"/>
    <Column ss:AutoFitWidth="0" ss:Width="90"/>
    <Column ss:Width="120" ss:Span="1"/>
@@ -562,7 +648,7 @@
      <Cell />
      <Cell />
     % for numsup in range(0, len(o.supplier_ids)):
-    <Cell ss:MergeAcross="3" ss:StyleID="mSupHeader"><Data ss:Type="String">${_('Supplier')} ${numsup+1}</Data></Cell>
+    <Cell ss:MergeAcross="4" ss:StyleID="mSupHeader"><Data ss:Type="String">${_('Supplier')} ${numsup+1}</Data></Cell>
     % endfor
     <Cell ss:MergeDown="1" ss:StyleID="mSupHeader"><Data ss:Type="String">${_('Selected Supplier')}</Data></Cell>
    </Row>
@@ -570,10 +656,11 @@
     <Cell ss:StyleID="s98"><Data ss:Type="String">${_('Line nr.')}</Data></Cell>
     <Cell ss:StyleID="s98"><Data ss:Type="String">${_('Product Code')}</Data></Cell>
     <Cell ss:StyleID="s98"><Data ss:Type="String">${_('Product Description')}</Data></Cell>
-    <Cell ss:StyleID="s98"><Data ss:Type="String">${_('Quantity')}</Data></Cell>
+    <Cell ss:StyleID="s98"><Data ss:Type="String">${_('Tender Quantity')}</Data></Cell>
     <Cell ss:StyleID="s98"><Data ss:Type="String">${_('UoM')}</Data></Cell>
     % for numsup in range(0, len(o.supplier_ids)):
     <Cell ss:StyleID="mSupName"><Data ss:Type="String">${_('Name')}</Data></Cell>
+    <Cell ss:StyleID="mSupQty"><Data ss:Type="String">${_('Supplier Quantity')}</Data></Cell>
     <Cell ss:StyleID="mSupUnit"><Data ss:Type="String">${_('Unit Price')}</Data></Cell>
     <Cell ss:StyleID="mSupConfDate"><Data ss:Type="String">${_('Confirmed Delivery Date')}</Data></Cell>
     <Cell ss:StyleID="mSupComment"><Data ss:Type="String">${_('Comment')}</Data></Cell>
@@ -590,19 +677,33 @@
     % for supplier in o.supplier_ids:
         <%
         sup_name = 'name_%s' % supplier.id
+        sup_qty = 'qty_%s' % supplier.id
         sup_price = 'unit_price_%s' % supplier.id
         sup_comment = 'comment_%s' % supplier.id
         sup_confirmed_delivery_date = 'confirmed_delivery_date_%s' % supplier.id
       %>
-    <Cell ss:StyleID="s87"><Data ss:Type="String">${line.get(sup_name, '')|x}</Data></Cell>
-    <Cell ss:StyleID="s88"><Data ss:Type="Number">${line.get(sup_price, 0.00)}</Data></Cell>
-    % if isDate(line.get(sup_confirmed_delivery_date, False)):
-        <Cell ss:StyleID="sShortDate"><Data ss:Type="DateTime">${line.get(sup_confirmed_delivery_date, '')|x}T00:00:00.000</Data></Cell>
-    % else:
-        <Cell ss:StyleID="s87"><Data ss:Type="String"></Data></Cell>
-    % endif
-    <Cell ss:StyleID="s90"><Data ss:Type="String">${line.get(sup_comment, '')|x}</Data></Cell>
-      % endfor
+      % if line.get(sup_qty, 0.00) != line.quantity:
+        <Cell ss:StyleID="s87red"><Data ss:Type="String">${line.get(sup_name, '')|x}</Data></Cell>
+        <Cell ss:StyleID="s67red"><Data ss:Type="Number">${line.get(sup_qty, 0.00)}</Data></Cell>
+        <Cell ss:StyleID="s88red"><Data ss:Type="Number">${line.get(sup_price, 0.00)}</Data></Cell>
+        % if isDate(line.get(sup_confirmed_delivery_date, False)):
+            <Cell ss:StyleID="sShortDateRed"><Data ss:Type="DateTime">${line.get(sup_confirmed_delivery_date, '')|x}T00:00:00.000</Data></Cell>
+        % else:
+            <Cell ss:StyleID="s87red"><Data ss:Type="String"></Data></Cell>
+        % endif
+        <Cell ss:StyleID="s90red"><Data ss:Type="String">${line.get(sup_comment, '')|x}</Data></Cell>
+      % else:
+        <Cell ss:StyleID="s87"><Data ss:Type="String">${line.get(sup_name, '')|x}</Data></Cell>
+        <Cell ss:StyleID="s67"><Data ss:Type="Number">${line.get(sup_qty, 0.00)}</Data></Cell>
+        <Cell ss:StyleID="s88"><Data ss:Type="Number">${line.get(sup_price, 0.00)}</Data></Cell>
+        % if isDate(line.get(sup_confirmed_delivery_date, False)):
+            <Cell ss:StyleID="sShortDate"><Data ss:Type="DateTime">${line.get(sup_confirmed_delivery_date, '')|x}T00:00:00.000</Data></Cell>
+        % else:
+            <Cell ss:StyleID="s87"><Data ss:Type="String"></Data></Cell>
+        % endif
+        <Cell ss:StyleID="s90"><Data ss:Type="String">${line.get(sup_comment, '')|x}</Data></Cell>
+      % endif
+    % endfor
     <Cell ss:StyleID="s91"><Data ss:Type="String">${line.choosen_supplier_id or ''|x}</Data></Cell>
    </Row>
    % endfor

=== modified file 'bin/addons/tender_flow/report/tender_rfq_comparison_xls.py'
--- bin/addons/tender_flow/report/tender_rfq_comparison_xls.py	2020-05-06 17:04:38 +0000
+++ bin/addons/tender_flow/report/tender_rfq_comparison_xls.py	2024-05-07 10:17:45 +0000
@@ -58,9 +58,10 @@
                     ('tender_line_id', '=', line.id),
                 ])
                 rfql = None
-                pu = 0.00
+                qty, pu = 0.00, 0.00
                 if rfql_ids:
                     rfql = pol_obj.browse(self.cr, self.uid, rfql_ids[0])
+                    qty = rfql.product_qty
                     pu = rfql.price_unit
                     to_cur = rfql.order_id.tender_id.currency_id and rfql.order_id.tender_id.currency_id.id or \
                         self.localcontext['company'].currency_id.id
@@ -69,7 +70,8 @@
 
                 line_vals.update({
                     'name_%s' % sid: sup.name,
-                    'unit_price_%s' % sid: pu,
+                    'qty_%s' % sid: rfql and qty or 0.00,
+                    'unit_price_%s' % sid: rfql and pu or 0.00,
                     'comment_%s' % sid: rfql and rfql.comment or '',
                     'confirmed_delivery_date_%s' % sid: rfql and rfql.confirmed_delivery_date or False,
                 })