← Back to team overview

avanzosc team mailing list archive

[Merge] lp:~avanzosc-security-team/avanzosc/72h_dos_shipping_labels_report into lp:~avanzosc-security-team/avanzosc/72horas

 

Oihane (Avanzosc) has proposed merging lp:~avanzosc-security-team/avanzosc/72h_dos_shipping_labels_report into lp:~avanzosc-security-team/avanzosc/72horas.

Requested reviews:
  Pedro Manuel Baeza (pedro.baeza)

For more details, see:
https://code.launchpad.net/~avanzosc-security-team/avanzosc/72h_dos_shipping_labels_report/+merge/226078
-- 
https://code.launchpad.net/~avanzosc-security-team/avanzosc/72h_dos_shipping_labels_report/+merge/226078
Your team Avanzosc_security is subscribed to branch lp:~avanzosc-security-team/avanzosc/72horas.
=== modified file 'dos_shipping_labels_report/report/__init__.py'
--- dos_shipping_labels_report/report/__init__.py	2014-06-30 15:37:27 +0000
+++ dos_shipping_labels_report/report/__init__.py	2014-07-09 08:44:02 +0000
@@ -21,5 +21,3 @@
 from . import shipping_labels
 from . import shipping_labels_package
 from . import shipping_labels_receiver
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'dos_shipping_labels_report/report/shipping_labels.py'
--- dos_shipping_labels_report/report/shipping_labels.py	2014-07-01 12:53:32 +0000
+++ dos_shipping_labels_report/report/shipping_labels.py	2014-07-09 08:44:02 +0000
@@ -21,7 +21,7 @@
 
 import time
 from datetime import datetime
-from report import report_sxw
+from openerp.report import report_sxw
 from openerp.osv import orm, fields
 from openerp.tools.translate import _
 
@@ -98,5 +98,4 @@
 report_sxw.report_sxw('report.shipping.labels.report', 'stock.picking',
                       'addons/dos_shipping_labels_report/'
                       'report/shipping_labels.rml',
-                      parser=shipping_labels_report)
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+                      parser=ShippingLabelsReport)

=== modified file 'dos_shipping_labels_report/report/shipping_labels_package.py'
--- dos_shipping_labels_report/report/shipping_labels_package.py	2014-07-01 12:53:32 +0000
+++ dos_shipping_labels_report/report/shipping_labels_package.py	2014-07-09 08:44:02 +0000
@@ -21,7 +21,7 @@
 
 import time
 from datetime import datetime
-from report import report_sxw
+from openerp.report import report_sxw
 from openerp.osv import orm, fields
 from openerp.tools.translate import _
 
@@ -85,5 +85,4 @@
 report_sxw.report_sxw('report.shipping.labels.package.report', 'stock.picking',
                       'addons/dos_shipping_labels_report/report/'
                       'shipping_labels_package.rml',
-                      parser=shipping_labels_package_report)
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+                      parser=ShippingLabelsPackageReport)

=== modified file 'dos_shipping_labels_report/report/shipping_labels_receiver.py'
--- dos_shipping_labels_report/report/shipping_labels_receiver.py	2014-07-01 12:53:32 +0000
+++ dos_shipping_labels_report/report/shipping_labels_receiver.py	2014-07-09 08:44:02 +0000
@@ -21,7 +21,7 @@
 
 import time
 from datetime import datetime
-from report import report_sxw
+from openerp.report import report_sxw
 from openerp.osv import orm, fields
 from openerp.tools.translate import _
 
@@ -83,5 +83,4 @@
 report_sxw.report_sxw('report.shipping.labels.receiver.report',
                       'stock.picking', 'addons/dos_shipping_labels_report/'
                       'report/shipping_labels_receiver.rml',
-                      parser=shipping_labels_receiver_report)
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+                      parser=ShippingLabelsReceiverReport)


Follow ups