Merged in print_picking_list (pull request #2)

Print picking list

3 files changed, 25 insertions, 10 deletions

diff --git a/fixco_custom/models/print_picking_list.py b/fixco_custom/models/print_picking_list.py
index 6998526..2b1605a 100644
--- a/fixco_custom/models/print_picking_list.py
+++ b/fixco_custom/models/print_picking_list.py
@@ -19,7 +19,7 @@ class PrintPickingList(models.Model):
         vals['number'] = self.env['ir.sequence'].next_by_code('print.picking.list') or '0'
         result = super(PrintPickingList, self).create(vals)
         return result
-    
+
 class PrintPickingListLine(models.Model):
     _name = 'print.picking.list.line'
     _description = 'Print Picking List Line'
@@ -27,4 +27,3 @@ class PrintPickingListLine(models.Model):
 
     print_picking_list_id = fields.Many2one('print.picking.list', string='Ref', required=True, ondelete='cascade', index=True, copy=False)
     invoice_marketplace = fields.Char(string='Invoice Marketplace')
-    
diff --git a/fixco_custom/models/stock_picking.py b/fixco_custom/models/stock_picking.py
index 7437ca5..76c2ecf 100755
--- a/fixco_custom/models/stock_picking.py
+++ b/fixco_custom/models/stock_picking.py
@@ -125,10 +125,10 @@ class StockPicking(models.Model):
         origin = self.origin or ''
         if any(prefix in origin for prefix in ['PO/', 'SO/']) and not self.check_product_lines and not self.name.startswith('BU/INT'):
             raise UserError(_("Belum ada check product, gabisa validate"))
-        
+
         if self.name.startswith('BU/INT') and self.picking_type_code == 'internal' and self.env.user.id not in [10,15,2] and self.location_dest_id.id == 86:
             raise UserError(_("Hanya bang rafly hanggara yang bisa validate"))
-        
+
 
         res = super(StockPicking, self).button_validate()
 
@@ -388,7 +388,7 @@ class StockPicking(models.Model):
             if 'Blibli' in self.partner_id.name or 'BLIBLI' in self.partner_id.name:
                 self.get_shipping_parameter_blibli()
                 return
-                
+
             order_id = self.order_reference
 
             authorization = self.sign_request(1)
@@ -569,7 +569,7 @@ class StockPicking(models.Model):
             if 'Blibli' in self.partner_id.name or 'BLIBLI' in self.partner_id.name:
                 self.ship_order_blibli()
                 return
-            
+
             order_id = self.order_reference
 
             authorization = self.sign_request(2)  # index 2 -> ship-order
@@ -904,7 +904,7 @@ class StockPicking(models.Model):
         except Exception as e:
             raise UserError(_("Error: %s") % str(e))
 
-        
+
     def sign_request(self, array_num):
         signData = '$'.join(['POST', Request_URI[array_num]]) + '$'
         authorization = ACCESS_KEY + ':' + base64.b64encode(
@@ -1178,3 +1178,21 @@ class PickingReportCustom(models.AbstractModel):
             'docs': pickings,
             'was_printed_map': was_printed_map,
         }
+
+class PickingReportCustomNew(models.AbstractModel):
+    _name = 'report.fixco_custom.report_picking_list_custom_new'
+    _description = 'asjdkla'
+
+    def _get_report_values(self, docids, data=None):
+        pickings = self.env['stock.picking'].browse(docids)
+
+        was_printed_map = {p.id: p.is_printed for p in pickings}
+
+        pickings.write({'is_printed': True})
+
+        return {
+            'doc_ids': docids,
+            'doc_model': 'stock.picking',
+            'docs': pickings,
+            'was_printed_map': was_printed_map,
+        }
diff --git a/fixco_custom/models/stock_picking_print_picking_list.py b/fixco_custom/models/stock_picking_print_picking_list.py
index 7cc7995..13b27b1 100644
--- a/fixco_custom/models/stock_picking_print_picking_list.py
+++ b/fixco_custom/models/stock_picking_print_picking_list.py
@@ -11,7 +11,7 @@ class StockPickingPrintPickingList(models.TransientModel):
             raise UserError("No stock picking selected.")
 
         pickings = self.env['stock.picking'].browse(picking_ids)
-        
+
         print_picking_list = self.env['print.picking.list'].create({})
 
         for picking in pickings:
@@ -27,5 +27,3 @@ class StockPickingPrintPickingList(models.TransientModel):
             'res_id': print_picking_list.id,
             'target': 'current',
         }
-
-