Merge lp:~npg-team/openobject-addons/shipping_api_ups_npg into lp:openobject-addons

[Novapoint Group]

NovaPoint Group has developed this module to provide an UPS extension for the shipping api

[Fabien (Open ERP) (fp-tinyerp)]

Hello,

Thank you for this good contribution. I checked your branches and I would suggest to keep them in your own branch for now on, instead of putting them in the official release. Please register them in apps.openerp.com if it's not already done; if people use them in v6.1, we will think about merging them to the official branch.

As these modules have thousands lines of code, we would not have the time to efficiently review the code, check the usability experience and test for v6.1. I propose to review this later on, if we see people using it from apps.

Thanks,

[Olivier Dony (Odoo) (odo-openerp)]

Hello,

I would like to explain a little bit more why this merge proposal was rejected, in 2 parts: our policy for merge proposals, then some specific hints.

1. Merge Proposal Acceptance Policy
===================================
There may have been contradicting messages about how and when it is useful to make a merge proposal.
We would like to state this policy very clearly, especially now that extra-addons have been deprecated due to the introduction of OpenERP Apps. So we have now added an official Merge Proposal Acceptance Policy to our contributor documentation, please have a look: http://bit.ly/openerp-contrib-mp

2. Remarks specific to this merge proposal
==========================================
In approximate order of importance:

- based on your minimal description (it would help to have more), it looks like this module is a general purpose extra feature that could be published on OpenERP Apps as explained in the policy, but does not need to be included in official addons now
- the size of the merge proposal diff is extremely large (+8000 lines) compared to the scope:
  + the UPS XML generation code looks duplicated in *MANY* places when it should be much smaller, simpler and modular
  + the XML generation code, on top of being duplicated and too verbose, is mixed inside the business code. It should be part of an abstraction in charge of contacting UPS, and that lies outside of the OpenERP business code: less code, cleaner, more modular and extensible
  + once again, you included a "tiny_sxw2rml.py" script and dependent files that look totally useless and out of place (1100+ lines!)
- lots of duplicated code from shipping_api module, e.g. package_types, etc..
- incorrect use of email template (should not need to evaluate the template yourself)
- outdated mail/email_template API - 6.1 has a new, much cleaner email API, please look at it - your module will not work on 6.1 as it is
- you are overriding methods from original addons without calling super(), and thus duplicating more code
- if this module is related to shipping, why does it add a payment_method on sale.order?
- instead of minidom, OpenERP official addons should use lxml/etree for XML parsing/generation
- adding shipping related field on email.template looks like bad design: breaking encapsulation
- horrible python code for modifying mako templates
- bad python style - see coding guidelines (type comparisons -> isinstance(), dict usage, etc.)
- no proper description of the features in the module manifest, nor how to use them
- a LOT of remaining commented out code lines (thousands of lines!)
- many useless python imports

I hope this helps,

Thanks!

review: Disapprove (policy + quick technical scan)

Unmerged revisions

5306. By Novapoint Group on 2011-10-06

[Add]: shipping_api_us module to provide an interface for UPS shipping

=== added directory 'shipping_api_ups'
=== added file 'shipping_api_ups/Change Log.txt'
--- shipping_api_ups/Change Log.txt	1970-01-01 00:00:00 +0000
+++ shipping_api_ups/Change Log.txt	2011-10-06 16:08:52 +0000
@@ -0,0 +1,41 @@
+===============================================================================
+ Version Change Log (shipping_api_ups)
+===============================================================================
+1.15 (2011-08-19) by Arif
+	* Added validation on shipment process for sale order of CC 
+1.14 (2011-08-10)
+	* Removed dependancy to account_payment_creditcard
+1.13 (2011-07-06) By Jabir
+	* Add validation of checking shipping packages before doing process shipping
+	
+1.12 (2011-07-06) By Jabir
+	* Updated shipping charge for first invoice created from delivery order
+1.11 (2011-07-04) By Jabir
+	* Integrated Canada shipping documents
+1.9 -> 1.10 (2011-06-10) By Jabir
+	* Automatically create invoice from delivery order if sale order is invoice from picking
+1.8 -> 1.9 (2011-06-10) By Jabir
+	* Created security rules for models
+	* Updated package weight
+Version 1.6 -> 1.7
+	* Fixed the issue with error in Processed Shipping on Delivery Order 
+Version 1.5 -> 1.6
+	* Fixed the issue with error in Processed Shipping on Delivery Order 
+Version 1.4 -> 1.5
+	* Moved the credti card charging of pre-authorised payment from shipping to process button on delivery order.
+Version 1.3 -> 1.4
+	* Changed the wizard print summary report from old type to new orm.memory type
+Version 1.02 -> 1.03
+	*Adding shipping date into Shipping log
+
+Version 1.01 -> 1.02
+	* Changed the wizard update_shipping_status from old type to new orm.memory type
+Version 1.00 -> 1.01
+	* Fixed direct delivery order creating creating issue
+Version 1.0
+	* Created shipping label report
+	* Created Quick ship wizard
+	* Wizard to print summary report
+	* Wizard to update the status of shipping log
+	* Shipping using ups api
+	* Summary report

=== added file 'shipping_api_ups/__init__.py'
--- shipping_api_ups/__init__.py	1970-01-01 00:00:00 +0000
+++ shipping_api_ups/__init__.py	2011-10-06 16:08:52 +0000
@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 NovaPoint Group LLC (<http://www.novapointgroup.com>)
+#    Copyright (C) 2004-2010 OpenERP SA (<http://www.openerp.com>)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>
+#
+##############################################################################
+
+import ups
+import stock
+import wizard
+import stock_package
+import report
+import sale
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

=== added file 'shipping_api_ups/__openerp__.py'
--- shipping_api_ups/__openerp__.py	1970-01-01 00:00:00 +0000
+++ shipping_api_ups/__openerp__.py	2011-10-06 16:08:52 +0000
@@ -0,0 +1,52 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 NovaPoint Group LLC (<http://www.novapointgroup.com>)
+#    Copyright (C) 2004-2010 OpenERP SA (<http://www.openerp.com>)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>
+#
+##############################################################################
+
+{
+    'name': 'Shipping API',
+    'version': '1.15',
+    'category': 'Generic Modules/Others',
+    'description': """
+    """,
+    'author': 'NovaPoint Group LLC',
+    'website': ' http://www.novapointgroup.com',
+    'depends': ['base','sale','sale_weight',
+                'stock','shipping_api',
+                'partner_address_validation',
+                'email_template',
+                'sale_negotiated_shipping'],
+    'init_xml': [],
+    'update_xml': [
+            'wizard/update_shipping_view.xml',
+            'wizard/summary_report_view.xml',
+            'wizard/quick_ship_view.xml',
+            'ups_view.xml',
+            'stock_package_view.xml',
+            'shipping_report.xml',
+            'security/ir.model.access.csv',
+
+        ],
+    'demo_xml': [
+    ],
+    'installable': True,
+    'active': False,
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added directory 'shipping_api_ups/report'
=== added file 'shipping_api_ups/report/__init__.py'
--- shipping_api_ups/report/__init__.py	1970-01-01 00:00:00 +0000
+++ shipping_api_ups/report/__init__.py	2011-10-06 16:08:52 +0000
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import label_print
+import summary_report
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+

=== added file 'shipping_api_ups/report/label_print.py'
--- shipping_api_ups/report/label_print.py	1970-01-01 00:00:00 +0000
+++ shipping_api_ups/report/label_print.py	2011-10-06 16:08:52 +0000
@@ -0,0 +1,62 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import time
+from report import report_sxw
+from tools import amount_to_text_en
+
+class report_print_label(report_sxw.rml_parse):
+    def __init__(self, cr, uid, name, context):
+        super(report_print_label, self).__init__(cr, uid, name, context)
+        self.number_lines = 0
+        self.number_add = 0
+        self.localcontext.update({
+            'time': time,
+        })
+    
+    
+        
+
+report_sxw.report_sxw(
+    'report.ship.label.print',
+    'stock.packages',
+    'addons/shipping_api_ups/report/label_print.rml',
+    parser=report_print_label,header=False
+)
+report_sxw.report_sxw(
+    'report.ship.log.label.print',
+    'shipping.move',
+    'addons/shipping_api_ups/report/label_print.rml',
+    parser=report_print_label,header=False
+)
+report_sxw.report_sxw(
+    'report.quick.ship.label.print',
+    'quick.ship',
+    'addons/shipping_api_ups/report/label_print.rml',
+    parser=report_print_label,header=False
+)
+report_sxw.report_sxw(
+    'report.multiple.label.print',
+    'stock.picking',
+    'addons/shipping_api_ups/report/multiple_label_print.rml',
+    parser=report_print_label,header=False
+)
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'shipping_api_ups/report/label_print.rml'
--- shipping_api_ups/report/label_print.rml	1970-01-01 00:00:00 +0000
+++ shipping_api_ups/report/label_print.rml	2011-10-06 16:08:52 +0000
@@ -0,0 +1,59 @@
+<?xml version="1.0"?>
+<document filename="test.pdf">
+  <template pageSize="(308.0,434.0)" title="Test" author="Martin Simon" allowSplitting="20">
+    <pageTemplate id="first">
+      <frame id="first" x1="-98.0" y1="-30" width="500" height="468"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="P1" fontName="Times-Roman" fontSize="9.0" leading="11"/>
+    <paraStyle name="P2" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Standard" fontName="Times-Roman"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Times-Roman"/>
+    <paraStyle name="Table Contents" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Footer" fontName="Times-Roman"/>
+    <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <images/>
+  </stylesheet>
+  <story>
+    <para style="P1">[[ repeatIn(objects,'o') ]]</para>
+    <para style="P2">[[ o.logo and setTag('para','image',{'width':'300','height':'450'}) or removeParentNode('blockTable') ]][[ o.logo ]]</para>
+  </story>
+</document>
+

=== added file 'shipping_api_ups/report/label_print.sxw'
Binary files shipping_api_ups/report/label_print.sxw	1970-01-01 00:00:00 +0000 and shipping_api_ups/report/label_print.sxw	2011-10-06 16:08:52 +0000 differ
=== added file 'shipping_api_ups/report/multiple_label_print.rml'
--- shipping_api_ups/report/multiple_label_print.rml	1970-01-01 00:00:00 +0000
+++ shipping_api_ups/report/multiple_label_print.rml	2011-10-06 16:08:52 +0000
@@ -0,0 +1,67 @@
+<?xml version="1.0"?>
+<document filename="test.pdf">
+  <template pageSize="(308.0,434.0)" title="Test" author="Martin Simon" allowSplitting="20">
+    <pageTemplate id="first">
+      <frame id="first" x1="-98.0" y1="-30" width="500" height="468"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="P1" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P2" fontName="Times-Roman" fontSize="9.0" leading="11"/>
+    <paraStyle name="P3" rightIndent="0.0" leftIndent="-4.0" fontName="Times-Roman" fontSize="9.0" leading="11"/>
+    <paraStyle name="P4" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P5" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Standard" fontName="Times-Roman"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Times-Roman"/>
+    <paraStyle name="Table Contents" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Footer" fontName="Times-Roman"/>
+    <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <images/>
+  </stylesheet>
+  <story>
+    <para style="P3">[[ repeatIn(objects,'o') ]]</para>
+    <section>
+      <para style="P4">
+        <font face="Times-Roman" size="9.0">[[repeatIn(o.packages_ids,'p')]]</font>
+      </para>
+      <para style="P1">[[ p.logo and setTag('para','image',{'width':'300','height':'450'}) or removeParentNode('blockTable') ]][[ p.logo ]]</para>
+    </section>
+  </story>
+</document>
+

=== added file 'shipping_api_ups/report/multiple_label_print.sxw'
Binary files shipping_api_ups/report/multiple_label_print.sxw	1970-01-01 00:00:00 +0000 and shipping_api_ups/report/multiple_label_print.sxw	2011-10-06 16:08:52 +0000 differ
=== added file 'shipping_api_ups/report/normalized_oo2rml.xsl'
--- shipping_api_ups/report/normalized_oo2rml.xsl	1970-01-01 00:00:00 +0000
+++ shipping_api_ups/report/normalized_oo2rml.xsl	2011-10-06 16:08:52 +0000
@@ -0,0 +1,696 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet
+  version="1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:fo="http://www.w3.org/1999/XSL/Format"
+  xmlns:office="http://openoffice.org/2000/office"
+  xmlns:style="http://openoffice.org/2000/style"
+  xmlns:text="http://openoffice.org/2000/text"
+  xmlns:table="http://openoffice.org/2000/table"
+  xmlns:draw="http://openoffice.org/2000/drawing"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  xmlns:number="http://openoffice.org/2000/datastyle"
+  xmlns:svg="http://www.w3.org/2000/svg"
+  xmlns:chart="http://openoffice.org/2000/chart"
+  xmlns:dr3d="http://openoffice.org/2000/dr3d"
+  xmlns:math="http://www.w3.org/1998/Math/MathML"
+  xmlns:form="http://openoffice.org/2000/form"
+  xmlns:script="http://openoffice.org/2000/script"
+  office:class="text" office:version="1.0"
+  exclude-result-prefixes = "xsl fo office style text table draw xlink number svg chart dr3d math form script">
+
+  <!--TODO's: indent, picture cache (trml2pdf) -->
+
+<xsl:output method="xml" indent="yes" />
+<xsl:strip-space elements="*"/>
+
+<xsl:key name="text_style" match="style:style[@style:family='text']" use="@style:name" />
+<xsl:key name="page_break_before" match="style:style[@style:family='paragraph' and ./style:properties/@fo:break-before='page']" use="@style:name" />
+<xsl:key name="page_break_after" match="style:style[@style:family='paragraph' and ./style:properties/@fo:break-after='page']" use="@style:name" />
+<xsl:key name="table_column_style" match="style:style[@style:family='table-column']" use="@style:name" />
+<xsl:key name="table_cell_style" match="style:style[@style:family='table-cell']" use="@style:name" />
+<xsl:key name="paragraph_style" match="style:style[@style:family='paragraph']" use="@style:name" />
+
+<xsl:template match="office:document-content">
+  <document filename="test.pdf">
+    <xsl:apply-templates select="office:automatic-styles" />
+    <xsl:apply-templates select="office:body" />
+  </document>
+</xsl:template>
+
+<xsl:template name="page_size">
+  <xsl:attribute name="pageSize">
+    <xsl:text>(</xsl:text>
+    <xsl:value-of select="//transferredfromstylesxml/style:page-master[1]/style:properties/@fo:page-width" />
+    <xsl:text>,</xsl:text>
+    <xsl:value-of select="//transferredfromstylesxml/style:page-master[1]/style:properties/@fo:page-height" />
+    <xsl:text>)</xsl:text>
+  </xsl:attribute>
+</xsl:template>
+
+<xsl:template name="fixed_frame">
+	<xsl:for-each select="//draw:text-box">
+		<frame>
+			<xsl:attribute name="id"><xsl:value-of select="./@draw:name" /></xsl:attribute>
+			<xsl:attribute name="x1"><xsl:value-of select="./@svg:x" /></xsl:attribute>
+			<xsl:attribute name="y1">
+				<xsl:value-of
+					select="//transferredfromstylesxml/style:page-master[1]/style:properties/@fo:page-height - ./@svg:y - ./@fo:min-height" />
+			</xsl:attribute>
+			<xsl:attribute name="width">
+				<xsl:value-of select="./@svg:width" />
+			</xsl:attribute>
+			<xsl:attribute name="height">
+				<xsl:value-of select="./@fo:min-height" />
+			</xsl:attribute>
+		</frame>
+	</xsl:for-each>
+</xsl:template>
+
+<xsl:template name="margin_sizes">
+  <xsl:variable name="margin_left" select="//transferredfromstylesxml/style:page-master[1]/style:properties/@fo:margin-left" />
+  <xsl:variable name="margin_right" select="//transferredfromstylesxml/style:page-master[1]/style:properties/@fo:margin-right" />
+  <xsl:variable name="margin_top" select="//transferredfromstylesxml/style:page-master[1]/style:properties/@fo:margin-top" />
+  <xsl:variable name="margin_bottom" select="//transferredfromstylesxml/style:page-master[1]/style:properties/@fo:margin-bottom" />
+  <xsl:variable name="page_width" select="//transferredfromstylesxml/style:page-master[1]/style:properties/@fo:page-width" />
+  <xsl:variable name="page_height" select="//transferredfromstylesxml/style:page-master[1]/style:properties/@fo:page-height" />
+  <xsl:attribute name="x1"><xsl:value-of select="$margin_left" /></xsl:attribute>
+  <xsl:attribute name="y1"><xsl:value-of select="$margin_bottom" /></xsl:attribute>
+  <xsl:attribute name="width"><xsl:value-of select="$page_width - $margin_left - $margin_right"/></xsl:attribute>
+  <xsl:attribute name="height"><xsl:value-of select="$page_height - $margin_bottom - $margin_top"/></xsl:attribute>
+</xsl:template>
+
+<xsl:template name="text_width">
+  <!-- You need this for the workaround to make primitive outlines-->
+  <xsl:variable name="margin_left" select="//transferredfromstylesxml/style:page-master[1]/style:properties/@fo:margin-left" />
+  <xsl:variable name="margin_right" select="//transferredfromstylesxml/style:page-master[1]/style:properties/@fo:margin-right" />
+  <xsl:variable name="page_width" select="//transferredfromstylesxml/style:page-master[1]/style:properties/@fo:page-width" />
+  <xsl:value-of select="$page_width - $margin_left - $margin_right - 18"/>
+</xsl:template>
+
+
+
+<xsl:template match="office:automatic-styles">
+  <!--<template pageSize="(21cm, 29.7cm)" leftMargin="1.0cm" rightMargin="2.0cm" topMargin="1.0cm" bottomMargin="1.0cm" title="Test" author="Martin Simon" allowSplitting="20">-->
+  <template pageSize="(21cm, 29.7cm)" title="Test" author="Martin Simon" allowSplitting="20">
+    <xsl:call-template name="page_size" />
+    <pageTemplate id="first">
+	  <xsl:call-template name="fixed_frame" />
+      <frame id="first" x1="2cm" y1="2cm" width="17cm" height="26cm">
+        <xsl:call-template name="margin_sizes" />
+      </frame>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <!--A table style to simulate primitive outlines -till the <addOutline> tag is implemented in trml2pdf -->
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <!--use two standard table grid styles like PyOpenOffice "Old Way": with and without a grid-->
+    <!--TODO insert table cell colors here, not within the <td> tag - otherwise
+         it will not work with flowables as cell content-->
+    <xsl:call-template name="make_blocktablestyle" />
+    <initialize>
+      <paraStyle name="all" alignment="justify" />
+    </initialize>
+    <xsl:apply-templates select="style:style" />
+  </stylesheet>
+</xsl:template>
+
+<xsl:template name="make_blocktablestyle">
+  <xsl:for-each select="//table:table">
+    <xsl:variable name="test">
+      <xsl:value-of select="./@table:name" />
+    </xsl:variable>
+    <xsl:if test="not(boolean(count(preceding-sibling::table:table[@table:name=$test])))">
+      <!--Test if this is the first table with this style, nested tables not counted-->
+      <blockTableStyle id="{@table:name}">
+	    <xsl:if test=".//draw:image">
+	      <blockTopPadding value="0"/>
+	      <blockBottomPadding value="0"/>
+	    </xsl:if>
+        <blockAlignment value="LEFT" />
+        <blockValign value="TOP" />
+        <xsl:call-template name="make_linestyle" />
+        <xsl:call-template name="make_tablebackground" />
+      </blockTableStyle>
+    </xsl:if>
+  </xsl:for-each>
+</xsl:template>
+
+<xsl:template name="make_linestyle">
+	<xsl:for-each select=".//table:table-row">
+		<xsl:variable name="row" select="position() - 1"/>
+		<xsl:for-each select=".//table:table-cell">
+			<xsl:variable name="col" select="position() - 1"/>
+			<xsl:variable name="linebefore">
+				<xsl:value-of select="key('table_cell_style',@table:style-name)/style:properties/@fo:border-left"/>
+			</xsl:variable>
+			<xsl:if test="not($linebefore='') and not($linebefore='none')">
+				<xsl:variable name="colorname">
+					<xsl:value-of select="substring-after($linebefore,'#')"/>
+				</xsl:variable>
+				<lineStyle kind="LINEBEFORE" colorName="#{$colorname}" start="{$col},{$row}" stop="{$col},-1"/>
+			</xsl:if>
+			<xsl:variable name="lineafter">
+				<xsl:value-of select="key('table_cell_style',@table:style-name)/style:properties/@fo:border-right"/>
+			</xsl:variable>
+			<xsl:if test="not($lineafter='') and not($lineafter='none')">
+				<xsl:variable name="colorname">
+					<xsl:value-of select="substring-after($lineafter,'#')"/>
+				</xsl:variable>
+				<lineStyle kind="LINEAFTER" colorName="#{$colorname}" start="{$col},{$row}" stop="{$col},-1"/>
+			</xsl:if>
+			<xsl:variable name="lineabove">
+				<xsl:value-of select="key('table_cell_style',@table:style-name)/style:properties/@fo:border-top"/>
+			</xsl:variable>
+			<xsl:if test="not($lineabove='') and not($lineabove='none')">
+				<xsl:variable name="colorname">
+					<xsl:value-of select="substring-after($lineabove,'#')"/>
+				</xsl:variable>
+				<lineStyle kind="LINEABOVE" colorName="#{$colorname}" start="{$col},{$row}" stop="{$col},{$row}"/>
+			</xsl:if>
+			<xsl:variable name="linebelow">
+				<xsl:value-of select="key('table_cell_style',@table:style-name)/style:properties/@fo:border-bottom"/>
+			</xsl:variable>
+			<xsl:if test="not($linebelow='') and not($linebelow='none')">
+				<xsl:variable name="colorname">
+					<xsl:value-of select="substring-after($linebelow,'#')"/>
+				</xsl:variable>
+				<lineStyle kind="LINEBELOW" colorName="#{$colorname}" start="{$col},{-1}" stop="{$col},{-1}"/>
+			</xsl:if>
+			<xsl:variable name="grid">
+				<xsl:value-of select="key('table_cell_style',@table:style-name)/style:properties/@fo:border"/>
+			</xsl:variable>
+			<xsl:if test="not($grid='') and not($grid='none')">
+				<xsl:variable name="colorname">
+					<xsl:value-of select="substring-after($grid,'#')"/>
+				</xsl:variable>
+				<!-- Don't use grid because we don't need a line between each rows -->
+				<lineStyle kind="LINEBEFORE" colorName="#{$colorname}" start="{$col},{$row}" stop="{$col},-1"/>
+				<lineStyle kind="LINEAFTER" colorName="#{$colorname}" start="{$col},{$row}" stop="{$col},-1"/>
+				<lineStyle kind="LINEABOVE" colorName="#{$colorname}" start="{$col},{$row}" stop="{$col},{$row}"/>
+				<lineStyle kind="LINEBELOW" colorName="#{$colorname}" start="{$col},{-1}" stop="{$col},{-1}"/>
+			</xsl:if>
+		</xsl:for-each>
+	</xsl:for-each>
+</xsl:template>
+
+<!-- Was needed to simulate bulleted lists:
+<xsl:template match="text:ordered-list|text:unordered-list">
+  <xsl:variable name = "text_width">
+    <xsl:call-template name="text_width" />
+  </xsl:variable>
+  <blockTable style="Standard_Outline" colWidths="18,{$text_width}">
+  <xsl:apply-templates match="text:list-item" />
+</blockTable>
+</xsl:template>
+
+<xsl:template match="text:list-item">
+  <tr>
+    <td><para><font face="Helvetica-Bold" size="10">*</font></para></td>
+    <td>
+      <xsl:apply-templates />
+    </td>
+  </tr>
+</xsl:template>
+
+-->
+
+
+<xsl:template match="office:body">
+  <story>
+    <xsl:apply-templates />
+	<xsl:for-each select="//draw:text-box">
+		<currentFrame>
+			<xsl:attribute name="name">
+				<xsl:value-of select="./@draw:name" />
+			</xsl:attribute>
+		</currentFrame>
+		<xsl:apply-templates>
+			<xsl:with-param name="skip_draw" select="0" />
+		</xsl:apply-templates>
+		<frameEnd />
+	</xsl:for-each>
+	<xsl:for-each select="//text:ordered-list">
+		<para><seqReset id="{./@text:style-name}"/></para>
+	</xsl:for-each>
+  </story>
+</xsl:template>
+
+<xsl:template match="table:table">
+  <blockTable>
+    <xsl:attribute name="colWidths">
+      <xsl:call-template name="make_columns" />
+    </xsl:attribute>
+    <xsl:call-template name="make_tableheaders" />
+    <xsl:attribute name="style">
+      <xsl:value-of select="@table:name" />
+    </xsl:attribute>
+    <xsl:apply-templates />
+  </blockTable>
+</xsl:template>
+
+<xsl:template name="make_tableheaders">
+  <xsl:if test="boolean(count(table:table-header-rows))">
+    <xsl:attribute name="repeatRows">1</xsl:attribute>
+  </xsl:if>
+</xsl:template>
+
+<xsl:template name="make_tablebackground">
+  <xsl:for-each select=".//table:table-row">
+    <!--Be careful when there are table:table-header-rows as
+         parent node of table:table-row -->
+    <xsl:variable name="row" select="position() - 1" />
+    <xsl:for-each select="./table:table-cell">
+      <xsl:variable name="col" select="position() - 1" />
+      <xsl:variable name="background">
+        <xsl:value-of select="key('table_cell_style',@table:style-name)/style:properties/@fo:background-color" />
+      </xsl:variable>
+      <xsl:if test="not($background='') and boolean(key('table_cell_style',@table:style-name)/style:properties/@fo:background-color) and starts-with($background,'#')">
+        <!--only RGB hexcolors are accepted -->
+		<blockBackground colorName="{$background}" start="{$col},{$row}" stop="{$col},-1" />
+      </xsl:if>
+     </xsl:for-each>
+   </xsl:for-each>
+</xsl:template>
+
+<xsl:template name="make_columns">
+  <xsl:variable name="columns" >
+    <xsl:for-each select="table:table-column">
+      <xsl:value-of select="key('table_column_style',@table:style-name)/style:properties/@style:column-width" />
+      <xsl:text>,</xsl:text>
+    </xsl:for-each>
+  </xsl:variable>
+  <xsl:value-of select="substring($columns,1,string-length($columns) - 1)" />
+  <!--strip the last comma-->
+</xsl:template>
+
+<xsl:template match="table:table-row">
+  <tr>
+    <xsl:apply-templates />
+  </tr>
+</xsl:template>
+
+<xsl:template match="table:table-cell">
+  <td>
+    <xsl:apply-templates />
+  </td>
+</xsl:template>
+
+<xsl:template match="text:section">
+  <section>
+    <xsl:apply-templates />
+  </section>
+</xsl:template>
+
+
+<xsl:template match="text:span">
+  <font>
+    <xsl:call-template name="make_fontnames_span" />
+    <xsl:call-template name="make_fontsize_span" />
+    <xsl:apply-templates />
+  </font>
+</xsl:template>
+
+<xsl:template name="make_fontsize_span">
+  <xsl:variable name ="fontsize">
+    <xsl:value-of select="key('text_style',@text:style-name)/style:properties/@fo:font-size" />
+  </xsl:variable>
+  <xsl:if test="not($fontsize='') and boolean(key('text_style',@text:style-name)/style:properties/@fo:font-size)" >
+    <xsl:attribute name="size">
+      <xsl:value-of select="$fontsize" />
+    </xsl:attribute>
+  </xsl:if>
+</xsl:template>
+
+<xsl:template name="make_fontnames_span">
+  <xsl:attribute name="face">
+    <xsl:call-template name="make_fontnames">
+      <xsl:with-param name="fontName" select="key('text_style',@text:style-name)/style:properties/@style:font-name"  />
+      <xsl:with-param name="fontWeight" select="key('text_style',@text:style-name)/style:properties/@fo:font-weight"  />
+      <xsl:with-param name="fontStyle" select="key('text_style',@text:style-name)/style:properties/@fo:font-style" />
+    </xsl:call-template>
+  </xsl:attribute>
+</xsl:template>
+
+<xsl:template name="make_image">
+  <illustration height="{.//draw:image/@svg:height}" width="{.//draw:image/@svg:width}">
+    <image x="0" y="0" file="{substring-after(.//draw:image/@xlink:href,'#Pictures/')}" height="{.//draw:image/@svg:height}" width="{.//draw:image/@svg:width}" />
+  </illustration>
+</xsl:template>
+
+<xsl:template name="empty_paragraph">
+  <xsl:if test="not(boolean(count(descendant::node())))">
+    <xsl:call-template name="distance_point">
+      <xsl:with-param name="background" select="key('paragraph_style',@text:style-name)/style:properties/@fo:background-color" />
+    </xsl:call-template>
+  </xsl:if>
+</xsl:template>
+
+<xsl:template name="distance_point">
+  <xsl:param name="background" />
+  <xsl:param name="tab_stop"></xsl:param>
+  <xsl:variable name="local_back">
+    <xsl:choose>
+      <xsl:when test="not(boolean($background)) or not(contains($background,'#'))">
+        <!-- Do not accept OO colors like "transparent", only hex-colors -->
+        <xsl:text>white</xsl:text>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:value-of select="$background" />
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:variable>
+  <font color="{$local_back}">
+    <xsl:text> </xsl:text>
+    <xsl:if test="boolean($tab_stop)">
+      <!-- simulate a tabstop with white/background-color points -->
+      <xsl:text>.........</xsl:text>
+    </xsl:if>
+  </font>
+</xsl:template>
+
+<xsl:template match="text:ordered-list">
+  <xsl:apply-templates />
+
+  <!-- Reset the counter. seqreset is not a trml2pdf tag, but a Platypus Intra Paragraph Markup,
+       so it needs a dummy paragraph to enclose it -->
+</xsl:template>
+
+<xsl:template name="make_listitem">
+  <xsl:if test="(name(..)='text:list-item')">
+    <xsl:attribute name="leftIndent">15</xsl:attribute>
+    <xsl:attribute name="bulletIndent">0</xsl:attribute>
+    <xsl:choose>
+      <xsl:when test="(name(../..)='text:unordered-list')">
+        <xsl:variable name="fontsize">
+          <xsl:value-of select="number(key('paragraph_style',@text:style-name)/style:properties/@fo:font-size)" />
+        </xsl:variable>
+        <xsl:choose>
+          <xsl:when test="$fontsize='NaN'">
+            <!-- you should exclude non-numerical values for bulletFontSize. <== Sometimes the preprocessing went wrong.-->
+            <!--use a default bullet font size-->
+            <xsl:attribute name="bulletFontSize">6</xsl:attribute>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:attribute name="bulletFontSize"><xsl:value-of select="floor(($fontsize div 2) + 1)" /></xsl:attribute>
+          </xsl:otherwise>
+        </xsl:choose>
+        <xsl:attribute name="bulletFontName">ZapfDingbats</xsl:attribute>
+        <xsl:attribute name="bulletText">l</xsl:attribute>
+      </xsl:when>
+      <xsl:otherwise>
+        <!-- Generate the numbers for an ordered list -->
+        <xsl:variable name="size">
+          <xsl:value-of select="key('paragraph_style',@text:style-name)/style:properties/@fo:font-size" />
+        </xsl:variable>
+        <!-- For ordered lists we use the bullet tag from Platypus Intra Paragraph Markup -->
+        <bullet>
+          <xsl:if test="not($size='') and boolean(key('paragraph_style',@text:style-name)/style:properties/@fo:font-size)">
+            <xsl:attribute name="size">
+              <!-- adapt the fontsize to the fontsize of the current paragraph -->
+              <xsl:value-of select="$size" />
+            </xsl:attribute>
+          </xsl:if>
+          <seq id="{../../@text:style-name}"/>.</bullet>
+
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:if>
+</xsl:template>
+
+<xsl:template match="text:drop-down">
+    <xsl:value-of select="text:label[2]/@text:value" />
+</xsl:template>
+
+
+<xsl:template match="text:p|text:h">
+	<xsl:param name="skip_draw" select="1" />
+  <xsl:if test="boolean(key('page_break_before',@text:style-name))" >
+    <pageBreak />
+  </xsl:if>
+  <xsl:choose>
+    <xsl:when test="boolean(.//draw:image)">
+      <xsl:call-template name="make_image" />
+    </xsl:when>
+	<xsl:when test="boolean(name(..) = 'draw:text-box') and boolean($skip_draw)">
+	</xsl:when>
+    <xsl:otherwise>
+      <para>
+        <xsl:attribute name="style">
+          <xsl:value-of select="@text:style-name" />
+        </xsl:attribute>
+        <xsl:call-template name="make_listitem" />
+        <xsl:apply-templates />
+        <xsl:call-template name="empty_paragraph" />
+      </para>
+    </xsl:otherwise>
+  </xsl:choose>
+  <xsl:if test="boolean(key('page_break_after',@text:style-name))" >
+    <pageBreak />
+  </xsl:if>
+</xsl:template>
+
+<xsl:template match="text:p/text:tab-stop">
+  <!-- simulate a tabstop -->
+  <xsl:call-template name="distance_point">
+    <xsl:with-param name="background" select="key('paragraph_style',@text:style-name)/style:properties/@fo:background-color" />
+    <xsl:with-param name="tab_stop">yes</xsl:with-param>
+  </xsl:call-template>
+</xsl:template>
+
+<!-- experimental - switched off
+<xsl:template match="text:h">
+  <para>
+    <xsl:attribute name="style">
+      <xsl:value-of select="@text:style-name" />
+    </xsl:attribute>
+    <xsl:call-template name="make_number" />
+    <xsl:apply-templates />
+    <xsl:call-template name="empty_paragraph" />
+  </para>
+</xsl:template>
+
+<xsl:template name="make_number">
+  <xsl:choose>
+    <xsl:when test="@text:level='1'">
+      <xsl:number format="1. " />
+    </xsl:when>
+    <xsl:when test="@text:level='2'">
+      <xsl:number count="text:h[@text:level='1']|text:h[text:level='2']" level="any" format="1.1." />
+    </xsl:when>
+  </xsl:choose>
+</xsl:template>
+
+-->
+
+<xsl:template match="style:style[@style:family='paragraph']">
+  <paraStyle>
+    <xsl:attribute name="name">
+      <xsl:value-of select="@style:name" />
+    </xsl:attribute>
+    <xsl:call-template name="make_indent_paragraph" />
+    <xsl:call-template name="make_fontnames_paragraph" />
+    <xsl:call-template name="make_fontsize" />
+    <!--<xsl:call-template name="make_parent" /> not necessary -
+         parent styles processed by PyOpenOffice -->
+    <xsl:call-template name="make_alignment" />
+    <xsl:call-template name="make_background" />
+    <xsl:call-template name="make_space_beforeafter" />
+    <xsl:call-template name="make_fontcolor" />
+  </paraStyle>
+</xsl:template>
+
+<xsl:template name="make_indent_paragraph">
+  <xsl:variable name="right_indent"><xsl:value-of select="style:properties/@fo:margin-right" /></xsl:variable>
+  <xsl:variable name="left_indent"><xsl:value-of select="style:properties/@fo:margin-left" /></xsl:variable>
+  <xsl:if test="not($right_indent='') and boolean(style:properties/@fo:margin-right)">
+    <xsl:attribute name="rightIndent">
+      <xsl:value-of select="$right_indent" />
+    </xsl:attribute>
+  </xsl:if>
+  <xsl:if test="not($left_indent='') and boolean(style:properties/@fo:margin-left)">
+    <xsl:attribute name="leftIndent">
+      <xsl:value-of select="$left_indent" />
+    </xsl:attribute>
+  </xsl:if>
+</xsl:template>
+
+<xsl:template name="make_background">
+  <xsl:variable name="background">
+    <xsl:value-of select="style:properties/@fo:background-color" />
+  </xsl:variable>
+  <xsl:if test="not($background='') and boolean(style:properties/@fo:background-color) and starts-with($background,'#')" >
+    <xsl:attribute name="backColor">
+      <xsl:value-of select="$background" />
+    </xsl:attribute>
+  </xsl:if>
+</xsl:template>
+
+<xsl:template name="make_space_beforeafter">
+  <xsl:variable name="before">
+    <xsl:value-of select="style:properties/@fo:margin-top" />
+  </xsl:variable>
+  <xsl:variable name="after">
+    <xsl:value-of select="style:properties/@fo:margin-bottom" />
+  </xsl:variable>
+  <xsl:if test="not($before='') and boolean(style:properties/@fo:margin-top)" >
+    <xsl:attribute name="spaceBefore">
+      <xsl:value-of select="$before" />
+    </xsl:attribute>
+  </xsl:if>
+  <xsl:if test="not($after='') and boolean(style:properties/@fo:margin-bottom)" >
+    <xsl:attribute name="spaceAfter">
+      <xsl:value-of select="$after" />
+    </xsl:attribute>
+  </xsl:if>
+</xsl:template>
+
+<xsl:template name="make_fontsize">
+  <xsl:variable name="fontSize">
+    <xsl:value-of select="style:properties/@fo:font-size" />
+  </xsl:variable>
+  <xsl:if test="not($fontSize='') and boolean(style:properties/@fo:font-size)">
+    <xsl:attribute name="fontSize">
+      <xsl:value-of select="$fontSize" />
+    </xsl:attribute>
+    <xsl:attribute name="leading">
+      <xsl:value-of select="$fontSize + floor($fontSize div 5) + 1" />
+      <!--use a standard leading related to the font size -->
+    </xsl:attribute>
+  </xsl:if>
+</xsl:template>
+
+<!--this template is not needed anymore for "normalized" sxw files -->
+<xsl:template name="make_parent">
+  <xsl:variable name="parent">
+    <xsl:value-of select="@style:parent-style-name" />
+  </xsl:variable>
+  <xsl:if test="not($parent='') and boolean(@style:parent-style-name)">
+    <xsl:attribute name="parent">
+      <xsl:value-of select="$parent" />
+    </xsl:attribute>
+  </xsl:if>
+</xsl:template>
+
+<xsl:template name="make_alignment">
+  <xsl:variable name="alignment">
+    <xsl:value-of select="style:properties/@fo:text-align" />
+  </xsl:variable>
+  <xsl:if test="not($alignment='') and boolean(style:properties/@fo:text-align)">
+    <xsl:choose>
+      <xsl:when test="$alignment='start'">
+        <xsl:attribute name="alignment">LEFT</xsl:attribute>
+      </xsl:when>
+      <xsl:when test="$alignment='center'">
+        <xsl:attribute name="alignment">CENTER</xsl:attribute>
+      </xsl:when>
+      <xsl:when test="$alignment='end'">
+        <xsl:attribute name="alignment">RIGHT</xsl:attribute>
+      </xsl:when>
+      <xsl:when test="$alignment='justify'">
+        <xsl:attribute name="alignment">JUSTIFY</xsl:attribute>
+      </xsl:when>
+    </xsl:choose>
+  </xsl:if>
+</xsl:template>
+
+<xsl:template name="make_fontnames_paragraph">
+  <xsl:attribute name="fontName">
+    <xsl:call-template name="make_fontnames">
+      <xsl:with-param name="fontName" select="style:properties/@style:font-name" />
+      <xsl:with-param name="fontWeight" select="style:properties/@fo:font-weight" />
+      <xsl:with-param name="fontStyle" select="style:properties/@fo:font-style" />
+    </xsl:call-template>
+  </xsl:attribute>
+</xsl:template>
+
+<xsl:template name="make_fontnames">
+  <!--much too verbose, needs improvement-->
+<xsl:param name="fontName" />
+<xsl:param name="fontWeight" />
+<xsl:param name="fontStyle" />
+<xsl:choose>
+<xsl:when test="not($fontName='') and boolean($fontName)">
+  <xsl:choose>
+    <xsl:when test="contains($fontName,'Courier')">
+      <xsl:choose>
+        <xsl:when test="($fontWeight='bold') and ($fontStyle='italic')">
+          <xsl:text>Courier-BoldOblique</xsl:text>
+        </xsl:when>
+        <xsl:when test="($fontWeight='bold') and not ($fontStyle='italic')">
+          <xsl:text>Courier-Bold</xsl:text>
+        </xsl:when>
+        <xsl:when test="not($fontWeight='bold') and ($fontStyle='italic')">
+          <xsl:text>Courier-Oblique</xsl:text>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:text>Courier</xsl:text>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:when>
+    <xsl:when test="contains($fontName,'Helvetica') or contains($fontName,'Arial') or contains($fontName,'Sans')">
+      <xsl:choose>
+        <xsl:when test="($fontWeight='bold') and ($fontStyle='italic')">
+          <xsl:text>Helvetica-BoldOblique</xsl:text>
+        </xsl:when>
+        <xsl:when test="($fontWeight='bold') and not ($fontStyle='italic')">
+          <xsl:text>Helvetica-Bold</xsl:text>
+        </xsl:when>
+        <xsl:when test="not($fontWeight='bold') and ($fontStyle='italic')">
+          <xsl:text>Helvetica-Oblique</xsl:text>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:text>Helvetica</xsl:text>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:choose>
+        <xsl:when test="($fontWeight='bold') and ($fontStyle='italic')">
+          <xsl:text>Times-BoldItalic</xsl:text>
+        </xsl:when>
+        <xsl:when test="($fontWeight='bold') and not ($fontStyle='italic')">
+          <xsl:text>Times-Bold</xsl:text>
+        </xsl:when>
+        <xsl:when test="not($fontWeight='bold') and ($fontStyle='italic')">
+          <xsl:text>Times-Italic</xsl:text>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:text>Times-Roman</xsl:text>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:otherwise>
+  </xsl:choose>
+</xsl:when>
+<xsl:otherwise>
+  <!--Use this as default -->
+  <xsl:text>Times-Roman</xsl:text>
+</xsl:otherwise>
+</xsl:choose>
+</xsl:template>
+<xsl:template name="make_fontcolor">
+  <xsl:variable name="textColor">
+    <xsl:value-of select="style:properties/@fo:color"/>
+  </xsl:variable>
+  <xsl:if test="not($textColor='') and boolean(style:properties/@fo:color)">
+  <xsl:attribute name="textColor">
+      <xsl:value-of select="$textColor" />
+   </xsl:attribute>
+  </xsl:if>
+</xsl:template>
+
+<!--
+This stylesheet is part of:
+PyOpenOffice Version 0.4
+Copyright (C) 2005: Martin Simon
+Homepage: www.bezirksreiter.de
+
+GNU LESSER GENERAL PUBLIC LICENSE Version 2.1, February 1999
+-->
+
+</xsl:stylesheet>
+
+

=== added file 'shipping_api_ups/report/summary_report.py'
--- shipping_api_ups/report/summary_report.py	1970-01-01 00:00:00 +0000
+++ shipping_api_ups/report/summary_report.py	2011-10-06 16:08:52 +0000
@@ -0,0 +1,55 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import time
+from report import report_sxw
+import pooler
+
+
+class summary_report_print(report_sxw.rml_parse):
+    def __init__(self, cr, uid, name, context):
+        super(summary_report_print, self).__init__(cr, uid, name, context)
+        db_pool = pooler.get_pool(self.cr.dbname)
+        self.localcontext.update({
+            'time': time,
+            'get_total':self.get_total,
+            'get_items':self.get_items,
+        })
+    def get_total(self):
+        ship_ids=pooler.get_pool(self.cr.dbname).get('shipping.move').search(self.cr,self.uid,[('state','=','ready_pick')])
+        return str(len(ship_ids))
+    def get_items(self):
+        ret = {}
+        ship_ids=pooler.get_pool(self.cr.dbname).get('shipping.move').search(self.cr,self.uid,[('state','=','ready_pick')])
+        if ship_ids:
+            for ship_id in pooler.get_pool(self.cr.dbname).get('shipping.move').browse(self.cr,self.uid,ship_ids):
+                key = ship_id.service and ship_id.service.description or ''
+                ret[key] = 1 + ret.get(key,0)
+        return ret.items()
+
+
+report_sxw.report_sxw(
+        'report.summary_report_print',
+        'shipping.move',
+        'addons/shipping_api/report/summary_report.rml',
+        parser=summary_report_print
+)
+

=== added file 'shipping_api_ups/report/summary_report.rml'
--- shipping_api_ups/report/summary_report.rml	1970-01-01 00:00:00 +0000
+++ shipping_api_ups/report/summary_report.rml	2011-10-06 16:08:52 +0000
@@ -0,0 +1,97 @@
+<?xml version="1.0"?>
+<document filename="test.pdf">
+  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+    <pageTemplate id="first">
+      <frame id="first" x1="55.0" y1="0.0" width="495" height="786"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#000000" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table4">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#000000" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="P1" rightIndent="22.0" leftIndent="20.0" fontName="Helvetica-Bold" fontSize="14.0" leading="17" alignment="CENTER"/>
+    <paraStyle name="P2" rightIndent="22.0" leftIndent="20.0" fontName="Helvetica-Bold" fontSize="15.0" leading="19"/>
+    <paraStyle name="P3" rightIndent="22.0" leftIndent="20.0" fontName="Helvetica" fontSize="11.0" leading="14"/>
+    <paraStyle name="P4" fontName="Helvetica" fontSize="15.0" leading="19"/>
+    <paraStyle name="P5" rightIndent="22.0" leftIndent="0.0" fontName="Helvetica" fontSize="11.0" leading="14"/>
+    <paraStyle name="P6" rightIndent="22.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="11.0" leading="14"/>
+    <paraStyle name="P7" rightIndent="22.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="15.0" leading="19"/>
+    <paraStyle name="P8" rightIndent="22.0" leftIndent="0.0" fontName="Helvetica"/>
+    <paraStyle name="Standard" fontName="Helvetica"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Helvetica"/>
+    <paraStyle name="Table Contents" fontName="Helvetica"/>
+    <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER"/>
+    <images/>
+  </stylesheet>
+  <story>
+    <para style="P1">Shipping Summary Report</para>
+    <para style="P3">
+      <font color="white"> </font>
+    </para>
+    <para style="P5">
+      <font color="white"> </font>
+    </para>
+    <para style="P6">Date : [[time.strftime("%b %d, %Y")]]</para>
+    <para style="P6">Total number of packages : [[get_total()]]</para>
+    <para style="P7">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="248.0,248.0" style="Table2">
+      <tr>
+        <td>
+          <para style="P2">Shipping Method</para>
+        </td>
+        <td>
+          <para style="P2">Count</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="248.0,248.0" style="Table4">
+      <tr>
+        <td>
+          <para style="P4">[[not get_items() and removeParentNode('blockTable')]][[repeatIn(get_items(),'p')]][[ p[0] ]]</para>
+        </td>
+        <td>
+          <para style="P4">[[ p[1] ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="P7">
+      <font color="white"> </font>
+    </para>
+    <para style="P8">
+      <font color="white"> </font>
+    </para>
+  </story>
+</document>
+

=== added file 'shipping_api_ups/report/summary_report.sxw'
Binary files shipping_api_ups/report/summary_report.sxw	1970-01-01 00:00:00 +0000 and shipping_api_ups/report/summary_report.sxw	2011-10-06 16:08:52 +0000 differ
=== added file 'shipping_api_ups/report/tiny_sxw2rml.py'
--- shipping_api_ups/report/tiny_sxw2rml.py	1970-01-01 00:00:00 +0000
+++ shipping_api_ups/report/tiny_sxw2rml.py	2011-10-06 16:08:52 +0000
@@ -0,0 +1,377 @@
+#!/usr/bin/python
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c):
+#
+#     2005 pyopenoffice.py Martin Simon (http://www.bezirksreiter.de)
+#     2005 Fabien Pinckaers, TINY SPRL. (http://tiny.be)
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contact a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+
+"""
+Tiny SXW2RML - The Open ERP's report engine
+
+Tiny SXW2RMLis part of the Tiny report project.
+Tiny Report is a module that allows you to render high quality PDF document
+from an OpenOffice template (.sxw) and any relationnal database.
+
+The whole source code is distributed under the terms of the
+GNU Public Licence.
+
+(c) 2005 pyopenoffice.py Martin Simon (http://www.bezirksreiter.de)
+(c) 2005-TODAY, Fabien Pinckaers - Tiny sprl
+"""
+__version__ = '0.9'
+
+
+import re
+import string
+import os
+import zipfile
+import xml.dom.minidom
+from reportlab.lib.units import toLength
+import base64
+
+class DomApiGeneral:
+    """General DOM API utilities."""
+    def __init__(self,content_string="",file=""):
+        self.content_string = content_string
+        self.re_digits = re.compile(r"(.*?\d)(pt|cm|mm|inch|in)")
+
+    def _unitTuple(self,string):
+        """Split values and units to a tuple."""
+        temp = self.re_digits.findall(string)
+        if not temp:
+            return (string,"")
+        else:
+            return (temp[0])
+
+    def stringPercentToFloat(self,string):
+        temp = string.replace("""%""","")
+        return float(temp)/100
+
+    def findChildrenByName(self,parent,name,attr_dict={}):
+        """Helper functions. Does not work recursively.
+        Optional: also test for certain attribute/value pairs."""
+        children = []
+        for c in parent.childNodes:
+            if c.nodeType == c.ELEMENT_NODE and c.nodeName == name:
+                children.append(c)
+        if attr_dict == {}:
+            return children
+        else:
+            return self._selectForAttributes(nodelist=children,attr_dict=attr_dict)
+
+    def _selectForAttributes(self,nodelist,attr_dict):
+        "Helper function."""
+        selected_nodes = []
+        for n in nodelist:
+            check = 1
+            for a in attr_dict.keys():
+                if n.getAttribute(a) != attr_dict[a]:
+                    # at least one incorrect attribute value?
+                    check = 0
+            if check:
+                selected_nodes.append(n)
+        return selected_nodes
+
+    def _stringToTuple(self,s):
+        """Helper function."""
+        try:
+            temp = string.split(s,",")
+            return int(temp[0]),int(temp[1])
+        except:
+            return None
+
+    def _tupleToString(self,t):
+        try:
+            return self.openOfficeStringUtf8("%s,%s" % (t[0],t[1]))
+        except:
+            return None
+
+    def _lengthToFloat(self,value):
+        v = value
+        if not self.re_digits.search(v):
+            return v
+        try:
+            if v[-4:] == "inch":
+                # OO files use "inch" instead of "in" in Reportlab units
+                v = v[:-2]
+        except:
+            pass
+        try:
+            c = round(toLength(v))
+            return c
+        except:
+            return v
+
+    def openOfficeStringUtf8(self,string):
+        if type(string) == unicode:
+            return string.encode("utf-8")
+        tempstring = unicode(string,"cp1252").encode("utf-8")
+        return tempstring
+
+class DomApi(DomApiGeneral):
+    """This class provides a DOM-API for XML-Files from an SXW-Archive."""
+    def __init__(self,xml_content,xml_styles):
+        DomApiGeneral.__init__(self)
+        self.content_dom = xml.dom.minidom.parseString(xml_content)
+        self.styles_dom = xml.dom.minidom.parseString(xml_styles)
+        body = self.content_dom.getElementsByTagName("office:body")
+        self.body = body and body[0]
+
+        # TODO:
+        self.style_dict = {}
+        self.style_properties_dict = {}
+
+        # ******** always use the following order:
+        self.buildStyleDict()
+        self.buildStylePropertiesDict()
+        if self.styles_dom.getElementsByTagName("style:page-master").__len__()<>0:
+            self.page_master = self.styles_dom.getElementsByTagName("style:page-master")[0]
+        if  self.styles_dom.getElementsByTagName("style:page-layout").__len__()<>0 :
+			self.page_master = self.styles_dom.getElementsByTagName("style:page-layout")[0]        
+        self.document = self.content_dom.getElementsByTagName("office:document-content")[0]
+
+    def buildStylePropertiesDict(self):
+        for s in self.style_dict.keys():
+            self.style_properties_dict[s] = self.getStylePropertiesDict(s)
+
+    def updateWithPercents(self,dict,updatedict):
+        """Sometimes you find values like "115%" in the style hierarchy."""
+        if not updatedict:
+            # no style hierarchies for this style? =>
+            return
+        new_updatedict = copy.copy(updatedict)
+        for u in new_updatedict.keys():
+            try:
+                if new_updatedict[u].find("""%""") != -1 and dict.has_key(u):
+                    number = float(self.re_digits.search(dict[u]).group(1))
+                    unit = self.re_digits.search(dict[u]).group(2)
+                    new_number = self.stringPercentToFloat(new_updatedict[u]) * number
+                    if unit == "pt":
+                        new_number = int(new_number)
+                        # no floats allowed for "pt"
+                        # OOo just takes the int, does not round (try it out!)
+                    new_updatedict[u] = "%s%s" % (new_number,unit)
+                else:
+                    dict[u] = new_updatedict[u]
+            except:
+                dict[u] = new_updatedict[u]
+        dict.update(new_updatedict)
+
+    def normalizeStyleProperties(self):
+        """Transfer all style:style-properties attributes from the
+        self.style_properties_hierarchical dict to the automatic-styles
+        from content.xml. Use this function to preprocess content.xml for
+        XSLT transformations etc.Do not try to implement this function
+        with XSlT - believe me, it's a terrible task..."""
+        styles_styles = self.styles_dom.getElementsByTagName("style:style")
+        automatic_styles = self.content_dom.getElementsByTagName("office:automatic-styles")[0]
+        for s in styles_styles:
+            automatic_styles.appendChild(s.cloneNode(deep=1))
+        content_styles = self.content_dom.getElementsByTagName("style:style")
+        # these are the content_styles with styles_styles added!!!
+        for s in content_styles:
+            c = self.findChildrenByName(s,"style:properties")
+            if c == []:
+                # some derived automatic styles do not have "style:properties":
+                temp = self.content_dom.createElement("style:properties")
+                s.appendChild(temp)
+                c = self.findChildrenByName(s,"style:properties")
+            c = c[0]
+            dict = self.style_properties_dict[(s.getAttribute("style:name")).encode("utf-8")] or {}
+            for attribute in dict.keys():
+                c.setAttribute(self.openOfficeStringUtf8(attribute),self.openOfficeStringUtf8(dict[attribute]))
+
+    def transferStylesXml(self):
+        """Transfer certain sub-trees from styles.xml to the normalized content.xml
+        (see above). It is not necessary to do this - for example - with paragraph styles.
+        the "normalized" style properties contain all information needed for
+        further processing."""
+        # TODO: What about table styles etc.?
+        outline_styles = self.styles_dom.getElementsByTagName("text:outline-style")
+        t = self.content_dom.createElement("transferredfromstylesxml")
+        self.document.insertBefore(t,self.body)
+        t_new = self.body.previousSibling
+        try:
+            page_master = self.page_master
+            t_new.appendChild(page_master.cloneNode(deep=1))
+            t_new.appendChild(outline_styles[0].cloneNode(deep=1))
+        except:
+            pass
+
+    def normalizeLength(self):
+        """Normalize all lengthes to floats (i.e: 1 inch = 72).
+        Always use this after "normalizeContent" and "transferStyles"!"""
+        # TODO: The complex attributes of table cell styles are not transferred yet.
+        #all_styles = self.content_dom.getElementsByTagName("style:properties")
+        #all_styles += self.content_dom.getElementsByTagName("draw:image")
+        all_styles = self.content_dom.getElementsByTagName("*")
+        for s in all_styles:
+            for x in s._attrs.keys():
+                v = s.getAttribute(x)
+                s.setAttribute(x,"%s" % self._lengthToFloat(v))
+                # convert float to string first!
+
+    def normalizeTableColumns(self):
+        """Handle this strange table:number-columns-repeated attribute."""
+        columns = self.content_dom.getElementsByTagName("table:table-column")
+        for c in columns:
+            if c.hasAttribute("table:number-columns-repeated"):
+                number = int(c.getAttribute("table:number-columns-repeated"))
+                c.removeAttribute("table:number-columns-repeated")
+                for i in range(number-1):
+                    (c.parentNode).insertBefore(c.cloneNode(deep=1),c)
+
+    def buildStyleDict(self):
+        """Store all style:style-nodes from content.xml and styles.xml in self.style_dict.
+        Caution: in this dict the nodes from two dom apis are merged!"""
+        for st in (self.styles_dom,self.content_dom):
+            for s in st.getElementsByTagName("style:style"):
+                name = s.getAttribute("style:name").encode("utf-8")
+                self.style_dict[name] = s
+        return True
+
+    def toxml(self):
+        return self.content_dom.toxml(encoding="utf-8")
+
+    def getStylePropertiesDict(self,style_name):
+        res = {}
+
+        if self.style_dict[style_name].hasAttribute("style:parent-style-name"):
+            parent = self.style_dict[style_name].getAttribute("style:parent-style-name").encode("utf-8")
+            res = self.getStylePropertiesDict(parent)
+
+        childs = self.style_dict[style_name].childNodes
+        for c in childs:
+            if c.nodeType == c.ELEMENT_NODE and c.nodeName.find("properties")>0 :
+                for attr in c._attrs.keys():
+                    res[attr] = c.getAttribute(attr).encode("utf-8")
+        return res
+
+class PyOpenOffice(object):
+    """This is the main class which provides all functionality."""
+    def __init__(self, path='.', save_pict=False):
+        self.path = path
+        self.save_pict = save_pict
+        self.images = {}
+
+    def oo_read(self,fname):
+        z = zipfile.ZipFile(fname,"r")
+        content = z.read('content.xml')
+        style = z.read('styles.xml')
+        all = z.namelist()
+        for a in all:
+            if a[:9]=='Pictures/' and len(a)>10:
+                pic_content = z.read(a)
+                self.images[a[9:]] = pic_content
+                if self.save_pict:
+                    f=open(os.path.join(self.path, os.path.basename(a)),"wb")
+                    f.write(pic_content)
+                    f.close()
+        z.close()
+        return content,style
+
+    def oo_replace(self,content):
+        regex = [
+            (r"<para[^>]*/>", ""),
+            #(r"<text:ordered-list.*?>(.*?)</text:ordered-list>", "$1"),
+            #(r"<text:unordered-list.*?>(.*?)</text:unordered-list>", "$1"),
+            (r"<para(.*)>(.*?)<text:line-break[^>]*/>", "<para$1>$2</para><para$1>"),
+        ]
+        for key,val in regex:
+            content = re.sub(key, val, content)
+        return content
+
+    def unpackNormalize(self,sourcefile):
+        c,s = self.oo_read(sourcefile)
+        c = self.oo_replace(c)
+        dom = DomApi(c,s)
+        dom.normalizeStyleProperties()
+        dom.transferStylesXml()
+        dom.normalizeLength()
+        dom.normalizeTableColumns()
+        new_c = dom.toxml()
+        return new_c
+
+def sxw2rml(sxw_file, xsl, output='.', save_pict=False):
+    from lxml import etree
+    from StringIO import StringIO
+
+    tool = PyOpenOffice(output, save_pict = save_pict)
+    res = tool.unpackNormalize(sxw_file)
+    
+    f = StringIO(xsl)
+    styledoc = etree.parse(f)
+    style = etree.XSLT(styledoc)
+    
+    f = StringIO(res)
+    doc = etree.parse(f)
+    result = style(doc)
+    root = etree.XPathEvaluator(result)("/document/stylesheet")
+    
+    if root:
+        root=root[0]
+        images = etree.Element("images")
+        for img in tool.images:
+            node = etree.Element('image', name=img)
+            node.text = base64.encodestring(tool.images[img])
+            images.append(node)
+        root.append(images)
+
+    try:
+        xml = str(result)
+        return xml
+    except:
+        return result
+
+if __name__ == "__main__":
+    import optparse
+    parser = optparse.OptionParser(
+        version="Tiny Report v%s" % __version__,
+        usage = 'tiny_sxw2rml.py [options] file.sxw')
+    parser.add_option("-v", "--verbose", default=False, dest="verbose", help="enable basic debugging")
+    parser.add_option("-o", "--output", dest="output", default='.', help="directory of image output")
+    (opt, args) = parser.parse_args()
+    if len(args) != 1:
+        parser.error("incorrect number of arguments")
+
+    import sys
+    import StringIO
+
+    fname = sys.argv[1]
+    f = fname
+    xsl_file = 'normalized_oo2rml.xsl'
+    z = zipfile.ZipFile(fname,"r")
+    mimetype = z.read('mimetype')
+    if mimetype.split('/')[-1] == 'vnd.oasis.opendocument.text' :
+		xsl_file = 'normalized_odt2rml.xsl'
+    xsl = file(os.path.join(os.getcwd(), os.path.dirname(sys.argv[0]), xsl_file)).read()
+    result = sxw2rml(f, xsl, output=opt.output, save_pict=False)
+
+    print result
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+

=== added file 'shipping_api_ups/sale.py'
--- shipping_api_ups/sale.py	1970-01-01 00:00:00 +0000
+++ shipping_api_ups/sale.py	2011-10-06 16:08:52 +0000
@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 NovaPoint Group LLC (<http://www.novapointgroup.com>)
+#    Copyright (C) 2004-2010 OpenERP SA (<http://www.openerp.com>)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>
+#
+##############################################################################
+from osv import fields,osv
+
+class sale_order(osv.osv):
+    _inherit="sale.order"
+    
+    _columns= {
+
+        'payment_method':fields.selection([('cc_pre_auth','Credit Card – PreAuthorized'),
+                                           ('invoice','Invoice'),
+                                           ('cod','COD'),
+                                           ('p_i_a','Pay In Advance'),],'Payment Method'),
+        }
+sale_order()
\ No newline at end of file

=== added file 'shipping_api_ups/sale_view.xml'
--- shipping_api_ups/sale_view.xml	1970-01-01 00:00:00 +0000
+++ shipping_api_ups/sale_view.xml	2011-10-06 16:08:52 +0000
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+    <record id="sale_order_changes_for_shipping" model="ir.ui.view">
+            <field name="name">sale_order_changes_for_shipping</field>
+            <field name="model">sale.order</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="sale.view_order_form"/>
+            <field name="arch" type="xml">
+              <xpath expr="//field[@name='pricelist_id']" position="after">
+                		<field name="payment_method" invisible="1"/>
+              </xpath>
+            </field>
+        </record>
+        </data>
+</openerp>
\ No newline at end of file

=== added directory 'shipping_api_ups/security'
=== added file 'shipping_api_ups/security/ir.model.access.csv'
--- shipping_api_ups/security/ir.model.access.csv	1970-01-01 00:00:00 +0000
+++ shipping_api_ups/security/ir.model.access.csv	2011-10-06 16:08:52 +0000
@@ -0,0 +1,5 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"security_ups_account_shipping_user","security.ups.account.shipping.user","model_ups_account_shipping","base.group_sale_salesman",1,1,1,0
+"security_ups_account_shipping_manager","security.ups.account.shipping.manager","model_ups_account_shipping","base.group_erp_manager",1,1,1,1
+"security_ups_shipping_service_type_user","security.ups.shipping.service.type.user","model_ups_shipping_service_type","base.group_sale_salesman",1,1,1,0
+"security_ups_shipping_service_type_manager","security.ups.shipping.service.type.manager","model_ups_shipping_service_type","base.group_erp_manager",1,1,1,1
\ No newline at end of file

=== added file 'shipping_api_ups/shipping_report.xml'
--- shipping_api_ups/shipping_report.xml	1970-01-01 00:00:00 +0000
+++ shipping_api_ups/shipping_report.xml	2011-10-06 16:08:52 +0000
@@ -0,0 +1,44 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+    <report id="ship_label_print"
+            string="Print Label"
+            model="stock.packages"
+            name="ship.label.print"
+            rml="addons/shipping_api_ups/report/label_print.rml"
+            menu="False"
+            auto="False"/>
+    <report id="ship_log_label_print"
+            string="Print Label"
+            model="shipping.move"
+            name="ship.log.label.print"
+            rml="addons/shipping_api_ups/report/label_print.rml"
+            menu="False"
+            auto="False"/>
+       <report id="quick_ship_label_print"
+            string="Print Label"
+            model="quick.ship"
+            name="quick.ship.label.print"
+            rml="addons/shipping_api_ups/report/label_print.rml"
+            menu="False"
+            auto="False"/>
+       <report id="multiple_label_print"
+            string="Print Label"
+            model="stock.picking"
+            name="multiple.label.print"
+            rml="addons/shipping_api_ups/report/multiple_label_print.rml"
+            menu="False"
+            auto="False"/>
+            
+            
+            
+        <report id="summary_report_print"
+            string="Summary Report"
+            model="shipping.move"
+            name="summary_report_print"
+            rml="addons/shipping_api_ups/report/summary_report.rml"
+            auto="False"
+            header = "False"
+            menu="True"/>            
+     </data>
+</openerp>

=== added file 'shipping_api_ups/stock.py'
--- shipping_api_ups/stock.py	1970-01-01 00:00:00 +0000
+++ shipping_api_ups/stock.py	2011-10-06 16:08:52 +0000
@@ -0,0 +1,2921 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 NovaPoint Group LLC (<http://www.novapointgroup.com>)
+#    Copyright (C) 2004-2010 OpenERP SA (<http://www.openerp.com>)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>
+#
+##############################################################################
+
+
+from osv import fields,osv
+from xml.dom.minidom import Document
+from tools.translate import _
+import httplib
+import xml2dic
+import base64
+import time
+import datetime
+from urlparse import urlparse
+import Image
+import tempfile
+import re
+
+pack_type={'01' : 'UPS Letter',
+'02' : 'Customer Supplied Package',
+'03' : 'Tube',
+'04' : 'PAK',
+'21' : 'UPS ExpressBox',
+'24' : 'UPS 25KG Box',
+'25' : 'UPS 10KG Box',
+'30' : 'Pallet',
+'2a' : 'Small Express Box',
+'2b' : 'Medium Express Box',
+'2c' : 'Large Express Box'}
+
+
+class email_template(osv.osv):
+
+    _inherit = "email.template"
+
+    _columns = {
+        'ship_mail' : fields.boolean('Ship Confirm Mail', help='Check this field to send mail when shipping is done.'),
+        }
+
+
+email_template()
+
+
+
+class shipping_move(osv.osv):
+    _inherit = "shipping.move"
+    _columns = {
+
+            'shipment_identific_no': fields.char('ShipmentIdentificationNumber', size=64, ),
+            'logo':fields.binary('Logo'),
+            'tracking_url':fields.char('Tracking URL', size=512, ),
+            'service': fields.many2one('ups.shipping.service.type', 'Shipping Service'),
+
+             }
+    def print_label(self, cr, uid, ids, context=None):
+        if not ids: return []
+
+#        check_layout = self.browse(cr, uid, ids[0], context=context).company_id.check_layout
+
+        return {
+            'type': 'ir.actions.report.xml',
+            'report_name':'ship.log.label.print',
+            'datas': {
+                    'model':'shipping.move',
+                    'id': ids and ids[0] or False,
+                    'ids': ids and ids or [],
+                    'report_type': 'pdf'
+                },
+            'nodestroy': True
+            }
+    def getTrackingUrl(self,cr, uid, ids, context=None):
+        ship_log_obj = self.browse(cr, uid, ids[0], context=context)
+        if ship_log_obj.tracking_no:
+            tracking_url = """http://wwwapps.ups.com/WebTracking/processInputRequest?sort_by=status&tracknums_displayed=1&TypeOfInquiryNumber=T&loc=en_US&InquiryNumber1=%s&track.x=0&track.y=0""" % ship_log_obj.tracking_no
+
+
+shipping_move()
+
+
+
+class stock_picking(osv.osv):
+
+    _inherit = "stock.picking"
+    _columns={
+            'ups_service': fields.many2one('ups.shipping.service.type','Service',help='The specific shipping service offered'),
+            'shipper': fields.many2one('ups.account.shipping','Shipper',help='The specific user ID and shipper. Setup in the company configuration.'),
+            'shipment_digest': fields.text('ShipmentDigest'),
+            'negotiated_rates': fields.float('NegotiatedRates'),
+            'shipment_identific_no': fields.char('ShipmentIdentificationNumber', size=64, ),
+            'tracking_no': fields.char('TrackingNumber', size=64, ),
+            'logo':fields.binary('Logo'),
+            'trade_mark': fields.related('shipper','trademark',type='char',size=1024,string='Trademark'),
+             }
+    
+    def action_process(self, cr, uid, ids, context=None):
+        deliv_order = self.browse(cr, uid, type(ids)==type([]) and ids[0] or ids, context=context)
+        do_transaction = True
+        if deliv_order.sale_id and deliv_order.sale_id.payment_method == 'cc_pre_auth' and not deliv_order.sale_id.invoiced:
+            
+            rel_voucher_id = deliv_order.sale_id.rel_account_voucher_id and deliv_order.sale_id.rel_account_voucher_id.id or False
+            if rel_voucher_id and deliv_order.sale_id.rel_account_voucher_id.state != 'posted' and deliv_order.sale_id.rel_account_voucher_id.cc_auth_code:
+                do_transaction = False
+                self.pool.get('account.voucher').write(cr,uid,[rel_voucher_id],{'cc_p_authorize':False,'cc_charge':True})
+                do_transaction = self.pool.get('account.voucher').authorize(cr, uid, [rel_voucher_id], context=context)
+        if  not do_transaction:
+            self.write(cr,uid,ids,{'ship_state':'hold','ship_message':'Unable to process creditcard payment.'})
+            cr.commit()
+            raise osv.except_osv(_('Final credit card charge cannot be completed!'),_("Please hold shipment and contact customer service..") )
+        return super(stock_picking, self).action_process(cr, uid, ids, context=context)
+    
+    def action_done(self, cr, uid, ids, context=None):
+
+        res = super(stock_picking, self).action_done(cr, uid, ids, context=context)
+        if ids:
+            for stock_pick_obj in self.pool.get('stock.picking').browse(cr,uid,ids):
+                vals={}
+                if stock_pick_obj.sale_id:
+                    if stock_pick_obj.sale_id.ship_method:
+                        ups_shipping_service_type_ids=self.pool.get('ups.shipping.service.type').search(cr,uid,[('description','like',stock_pick_obj.sale_id.ship_method)])
+                        if ups_shipping_service_type_ids:
+                          vals['ups_service']=ups_shipping_service_type_ids[0]
+                          ups_shipping_service_type_obj=self.pool.get('ups.shipping.service.type').browse(cr,uid,ups_shipping_service_type_ids[0])
+                          if ups_shipping_service_type_obj.ups_account_id:
+                            vals['shipper']=ups_shipping_service_type_obj.ups_account_id.id
+                            if ups_shipping_service_type_obj.ups_account_id.logistic_company_id:
+                                vals['logis_company']=ups_shipping_service_type_obj.ups_account_id.logistic_company_id.id
+                if vals:
+                    self.write(cr,uid,ids,vals)
+        return True
+    def print_labels(self, cr, uid, ids, context=None):
+        if not ids: return []
+#        check_layout = self.browse(cr, uid, ids[0], context=context).company_id.check_layout
+        return {
+            'type': 'ir.actions.report.xml',
+            'report_name':'multiple.label.print',
+            'datas': {
+                    'model':'stock.picking',
+                    'id': ids and ids[0] or False,
+                    'ids': ids and ids or [],
+                    'report_type': 'pdf'
+                },
+            'nodestroy': True
+            }
+
+    def on_change_sale_id(self, cr, uid, ids, sale_id=False, state=False, context=None):
+            vals={}
+            if sale_id:
+                sale_order_obj=self.pool.get('sale.order').browse(cr,uid,sale_id)
+                ups_shipping_service_ids=self.pool.get('ups.shipping.service.type').search(cr,uid,[('description','=',sale_order_obj.ship_method)])
+
+                if type(ups_shipping_service_ids)==type([]) and len(ups_shipping_service_ids)>0:
+                      vals['ups_service']=ups_shipping_service_ids[0]
+                      ups_shipping_account_ids=self.pool.get('ups.account.shipping').search(cr,uid,[('ups_shipping_service_ids','in',ups_shipping_service_ids[0])])
+
+                      if type(ups_shipping_account_ids)==type([]) and len(ups_shipping_account_ids)>0:
+                        vals['shipper']=ups_shipping_account_ids[0]
+                        logistic_company_ids=self.pool.get('logistic.company').search(cr,uid,[('ups_shipping_account_ids','in',ups_shipping_account_ids[0])])
+
+                        if type(logistic_company_ids)==type([]) and len(logistic_company_ids)>0:
+                            vals['logis_company']=logistic_company_ids[0]
+
+            return {'value':vals}
+
+
+    def process_void(self,cr, uid, ids, context=None):
+        error_flag = False
+        if type(ids)==type([]):
+            pick_obj=self.pool.get('stock.picking').browse(cr, uid, ids[0])
+        else:
+            pick_obj=self.pool.get('stock.picking').browse(cr, uid, ids)
+
+
+###create the acces req xml first
+        data_for_Access_Request={
+                                    'AccessLicenseNumber':pick_obj.shipper.id and pick_obj.shipper.accesslicensenumber or '',
+                                    'UserId':pick_obj.shipper.id and pick_obj.shipper.userid or '',
+                                    'Password':pick_obj.shipper.id and pick_obj.shipper.password or ''
+                                }
+        response = ''
+        for pack in pick_obj.packages_ids:
+
+            data_for_void_shipment={'VoidShipmentRequest':{'Request':{
+                                                        'RequestAction':"1",
+                                                      'TransactionReference':{'CustomerContext':"",},
+                                                      },
+                                            'ShipmentIdentificationNumber':pack.shipment_identific_no or '',
+
+                                                'ExpandedVoidShipment':{
+                                                                        'ShipmentIdentificationNumber':pack.shipment_identific_no or '',
+                                                                        'TrackingNumber':pack.tracking_no or ''
+                                                                        }
+                                                            }
+                                            }
+
+
+            doc2=Document()
+            VoidShipmentRequest = doc2.createElement("VoidShipmentRequest")
+            doc2.appendChild(VoidShipmentRequest)
+
+            Request = doc2.createElement("Request")
+            VoidShipmentRequest.appendChild(Request)
+
+
+            RequestAction = doc2.createElement("RequestAction")
+            ptext = doc2.createTextNode(data_for_void_shipment["VoidShipmentRequest"]['Request']['RequestAction'])
+            RequestAction.appendChild(ptext)
+            Request.appendChild(RequestAction)
+
+            TransactionReference = doc2.createElement("TransactionReference")
+            Request.appendChild(TransactionReference)
+
+            CustomerContext = doc2.createElement("CustomerContext")
+            ptext = doc2.createTextNode(data_for_void_shipment["VoidShipmentRequest"]['Request']['TransactionReference']['CustomerContext'])
+            CustomerContext.appendChild(ptext)
+            TransactionReference.appendChild(CustomerContext)
+
+#            ShipmentIdentificationNumber = doc2.createElement("ShipmentIdentificationNumber")
+#            ptext = doc2.createTextNode(data_for_void_shipment["VoidShipmentRequest"]['ShipmentIdentificationNumber'])
+#            ShipmentIdentificationNumber.appendChild(ptext)
+#            VoidShipmentRequest.appendChild(ShipmentIdentificationNumber)
+    #
+
+
+            ExpandedVoidShipment = doc2.createElement("ExpandedVoidShipment")
+            VoidShipmentRequest.appendChild(ExpandedVoidShipment)
+
+            ShipmentIdentificationNumber = doc2.createElement("ShipmentIdentificationNumber")
+            ptext = doc2.createTextNode(data_for_void_shipment["VoidShipmentRequest"]['ExpandedVoidShipment']['ShipmentIdentificationNumber'])
+            ShipmentIdentificationNumber.appendChild(ptext)
+            ExpandedVoidShipment.appendChild(ShipmentIdentificationNumber)
+
+            TrackingNumber = doc2.createElement("TrackingNumber")
+            ptext = doc2.createTextNode(data_for_void_shipment["VoidShipmentRequest"]['ExpandedVoidShipment']['TrackingNumber'])
+            TrackingNumber.appendChild(ptext)
+            ExpandedVoidShipment.appendChild(TrackingNumber)
+
+            Request_string2=doc2.toprettyxml()
+
+
+
+            doc1 = Document()
+            AccessRequest = doc1.createElement("AccessRequest")
+            AccessRequest.setAttribute("xml:lang", "en-US")
+            doc1.appendChild(AccessRequest)
+
+
+            AccessLicenseNumber = doc1.createElement("AccessLicenseNumber")
+            ptext = doc1.createTextNode(data_for_Access_Request["AccessLicenseNumber"])
+            AccessLicenseNumber.appendChild(ptext)
+            AccessRequest.appendChild(AccessLicenseNumber)
+
+            UserId = doc1.createElement("UserId")
+            ptext = doc1.createTextNode(data_for_Access_Request["UserId"])
+            UserId.appendChild(ptext)
+            AccessRequest.appendChild(UserId)
+
+            Password = doc1.createElement("Password")
+            ptext = doc1.createTextNode(data_for_Access_Request["Password"])
+            Password.appendChild(ptext)
+            AccessRequest.appendChild(Password)
+
+            Request_string1=doc1.toprettyxml()
+
+            Request_string=Request_string1+Request_string2
+
+
+#            Request_string = '''<?xml version="1.0" ?>
+#<AccessRequest xml:lang='en-US'>
+#<AccessLicenseNumber>3C70E997ECE04388</AccessLicenseNumber>
+#<UserId>kdunn.cva</UserId>
+#<Password>heckethorn</Password>
+#</AccessRequest>
+#<?xml version="1.0" encoding="UTF-8" ?>
+#<VoidShipmentRequest>
+#<Request>
+#<TransactionReference>
+#<CustomerContext>Customer Transaction ID</CustomerContext>
+#<XpciVersion>1.0001</XpciVersion>
+#</TransactionReference>
+#<RequestAction>Void</RequestAction>
+#<RequestOption />
+#</Request>
+#<ExpandedVoidShipment>
+#<ShipmentIdentificationNumber>
+#1Z2220060294314162
+#</ShipmentIdentificationNumber>
+#<TrackingNumber>1Z2220060291994175</TrackingNumber>
+#</ExpandedVoidShipment>
+#</VoidShipmentRequest>'''
+            if pick_obj.logis_company.test_mode:
+                void_web = pick_obj.logis_company.ship_void_test_web or ''
+                void_port = pick_obj.logis_company.ship_void_test_port
+            else:
+                void_web = pick_obj.logis_company.ship_void_web or ''
+                void_port = pick_obj.logis_company.ship_void_port
+            if void_web:
+                parse_url = urlparse(void_web)
+                serv = parse_url.netloc
+                serv_path = parse_url.path
+            else:
+                raise osv.except_osv(_('Unable to find Shipping URL!'),_("Please configure the shipping company with websites.") )
+
+
+            conn=httplib.HTTPSConnection(serv,void_port)
+            res=conn.request("POST",serv_path,Request_string)
+            res=conn.getresponse()
+            result = res.read()
+            response_dic=xml2dic.main(result)
+            response = ''
+            error_flag=False
+            for elm in response_dic['VoidShipmentResponse'][0]['Response']:
+                if 'ResponseStatusCode' in elm.keys():
+                    response += 'ResponseStatusCode:'+str(elm['ResponseStatusCode'])+'\n'
+                if 'ResponseStatusDescription' in elm.keys():
+                    response += 'ResponseStatusDescription:'+str(elm['ResponseStatusDescription'])+'\n'
+                if 'Error' in elm.keys():
+                    error_flag = True
+                    response += 'Error:'+str(elm['Error'])+'\n'
+
+
+            response = 'Void:\n'+response
+            self.pool.get('stock.packages').write(cr,uid,pack.id,{'ship_message':str(response)})
+
+        if not error_flag:
+            self.pool.get('stock.picking').write(cr, uid, ids,{'ship_state':'void','ship_message':''})
+        else:
+            self.pool.get('stock.picking').write(cr, uid, ids,{'ship_message':response})
+        return True
+
+
+    def get_package(self,pack_obj):
+        if not pack_obj:
+            return []
+        else:
+            ret = []
+            ret.append({
+                'Description':"",'PackagingType':{'Code':pack_obj.package_type or "",'Description':pack_type.get(pack_obj.package_type , "")},#PackagingType
+                        'Dimensions':{'UnitOfMeasurement':{'Code':"IN",'Description':"Inches"},'Length':str(pack_obj.length or "0"),'Width':str(pack_obj.width or "0"),'Height':str(pack_obj.height or "0")},#Dimensions
+                        'PackageWeight':{'UnitOfMeasurement':{'Code':"LBS",'Description':"Pounds"},'Weight':str(pack_obj.weight or "0")},
+#                            'LargePackageIndicator':"",
+                        'ReferenceNumber':{'BarCodeIndicator':"",'Code':pack_obj.ref1 or "",'Value':""},
+#                            'AdditionalHandling':"",
+#                            'PackageServiceOptions':{'DeliveryConfirmation':{'DCISType':"",'DCISNumber':""},#DeliveryConfirmation
+#                                        'InsuredValue':{'Type':"",'Code':"",'Description':"",
+#                                                'CurrencyCode':"",'MonetaryValue':""
+#                                         },#InsuredValue
+#                                        'COD':{'CODCode':"",'CODFundsCode':"",
+#                                                'CODAmount':{'CurrencyCode':"",
+#                                                        'MonetaryValue':""
+#                                                  },#CODAmount
+#                                            },#COD
+#                                        'VerbalConfirmation':{ContactInfo:{'Name':"",'PhoneNumber':""}#ContactInfo
+#                                            },#VerbalConfirmation
+#                                        'ShipperReleaseIndicator':"",
+#                                        'Notification':{'NotificationCode':"",
+#                                            'EMailMessage':{'EMailAddress':"",'UndeliverableEMailAddress':"",
+#                                                'FromEMailAddress':"",'FromName':"",'Memo':"",
+#                                                'Subject':"",'SubjectCode':""}#EMailMessage
+#                                        },#Notification,
+#                                        'ReturnsFlexibleAccessIndicator':"",
+#                        }#PackageServiceOptions
+                })
+            return ret
+
+    def fill_addr(self,addr_id):
+        ret = {'AddressLine1':addr_id and addr_id.street or '',
+         'AddressLine2':addr_id and addr_id.street2 or '',
+         'AddressLine3':"",
+        'City':addr_id and addr_id.city or '',
+        'StateProvinceCode':addr_id and addr_id.state_id.id and addr_id.state_id.code or '',
+        'PostalCode':addr_id and addr_id.zip or '',
+        'CountryCode':addr_id and addr_id.country_id.id and addr_id.country_id.code or '',
+        'ResidentialAddress':"",
+        }
+
+        if addr_id and ('zip_id' in addr_id._columns.keys()):
+            ret['PostalCode'] = addr_id.zip_id.id and str(addr_id.zip_id.zipcode) or ''
+        return ret
+
+    def create_ship_accept_request(self,cr, uid, ids,package_id):
+        package_obj=self.pool.get('stock.packages').browse(cr, uid, package_id)
+
+###create the acces req xml first
+        data_for_Access_Request={
+                                    'AccessLicenseNumber':package_obj.pick_id.shipper.id and package_obj.pick_id.shipper.accesslicensenumber or '',
+                                    'UserId':package_obj.pick_id.shipper.id and package_obj.pick_id.shipper.userid or '',
+                                    'Password':package_obj.pick_id.shipper.id and package_obj.pick_id.shipper.password or ''
+                                }
+
+        doc1 = Document()
+        AccessRequest = doc1.createElement("AccessRequest")
+        AccessRequest.setAttribute("xml:lang", "en-US")
+        doc1.appendChild(AccessRequest)
+
+
+        AccessLicenseNumber = doc1.createElement("AccessLicenseNumber")
+        ptext = doc1.createTextNode(data_for_Access_Request["AccessLicenseNumber"])
+        AccessLicenseNumber.appendChild(ptext)
+        AccessRequest.appendChild(AccessLicenseNumber)
+
+        UserId = doc1.createElement("UserId")
+        ptext = doc1.createTextNode(data_for_Access_Request["UserId"])
+        UserId.appendChild(ptext)
+        AccessRequest.appendChild(UserId)
+
+        Password = doc1.createElement("Password")
+        ptext = doc1.createTextNode(data_for_Access_Request["Password"])
+        Password.appendChild(ptext)
+        AccessRequest.appendChild(Password)
+
+        Request_string1=doc1.toprettyxml()
+
+
+
+        data_for_Ship_Accept = {'ShipmentAcceptRequest':{
+                                                        'Request':{
+                                                                  'RequestAction':'ShipAccept',
+                                                                  'TransactionReference':{'CustomerContext':''}
+                                                                  },
+                                                        'ShipmentDigest':package_obj.shipment_digest
+                                                        }
+                                    }
+
+
+        doc2 = Document()
+        ShipmentAcceptRequest = doc2.createElement("ShipmentAcceptRequest")
+        ShipmentAcceptRequest.setAttribute("xml:lang", "en-US")
+        doc2.appendChild(ShipmentAcceptRequest)
+
+
+
+        Request = doc2.createElement("Request")
+        ShipmentAcceptRequest.appendChild(Request)
+
+
+        RequestAction = doc2.createElement("RequestAction")
+        ptext = doc1.createTextNode(data_for_Ship_Accept['ShipmentAcceptRequest']["Request"]['RequestAction'])
+        RequestAction.appendChild(ptext)
+        Request.appendChild(RequestAction)
+
+
+        TransactionReference = doc2.createElement("TransactionReference")
+        Request.appendChild(TransactionReference)
+
+        CustomerContext = doc2.createElement("CustomerContext")
+        ptext = doc1.createTextNode(data_for_Ship_Accept['ShipmentAcceptRequest']["Request"]['TransactionReference']['CustomerContext'])
+        CustomerContext.appendChild(ptext)
+        TransactionReference.appendChild(CustomerContext)
+
+        ShipmentDigest = doc2.createElement("ShipmentDigest")
+        ptext = doc1.createTextNode(data_for_Ship_Accept['ShipmentAcceptRequest']["ShipmentDigest"])
+        ShipmentDigest.appendChild(ptext)
+        ShipmentAcceptRequest.appendChild(ShipmentDigest)
+
+        Request_string2=doc2.toprettyxml()
+        request_string=Request_string1+Request_string2
+
+        return request_string
+
+    def process_ship_accept(self,cr, uid, ids,ship_move_ids,pack_obj,context=None):
+
+
+        shipment_accept_request_xml=self.create_ship_accept_request(cr, uid, ids,pack_obj.id)
+
+        if pack_obj.pick_id.logis_company.test_mode:
+            acce_web = pack_obj.pick_id.logis_company.ship_accpt_test_web or ''
+            acce_port = pack_obj.pick_id.logis_company.ship_accpt_test_port
+        else:
+            acce_web = pack_obj.pick_id.logis_company.ship_accpt_web or ''
+            acce_port = pack_obj.pick_id.logis_company.ship_accpt_port
+        if acce_web:
+            parse_url = urlparse(acce_web)
+            serv = parse_url.netloc
+            serv_path = parse_url.path
+        else:
+            raise osv.except_osv(_('Unable to find Shipping URL!'),_("Please configure the shipping company with websites.") )
+
+
+
+        conn=httplib.HTTPSConnection(serv,acce_port)
+        res=conn.request("POST",serv_path,shipment_accept_request_xml)
+        res=conn.getresponse()
+        result = res.read()
+        response_dic=xml2dic.main(result)
+        NegotiatedRates=''
+        ShipmentIdentificationNumber=''
+        TrackingNumber=''
+        label_image=''
+        if response_dic['ShipmentAcceptResponse'][0]['Response'][0]['ResponseStatusCode'] == '1':
+            if len(response_dic['ShipmentAcceptResponse'])>1 and response_dic['ShipmentAcceptResponse'][1].has_key('ShipmentResults'):
+                if len(response_dic['ShipmentAcceptResponse'][1]['ShipmentResults'])>1 and response_dic['ShipmentAcceptResponse'][1]['ShipmentResults'][1].has_key('NegotiatedRates'):
+                    if  len(response_dic['ShipmentAcceptResponse'][1]['ShipmentResults'][1]['NegotiatedRates'])>0 and response_dic['ShipmentAcceptResponse'][1]['ShipmentResults'][1]['NegotiatedRates'][0].has_key('NetSummaryCharges'):
+                        if len(response_dic['ShipmentAcceptResponse'][1]['ShipmentResults'][1]['NegotiatedRates'][0]['NetSummaryCharges'])>0 and response_dic['ShipmentAcceptResponse'][1]['ShipmentResults'][1]['NegotiatedRates'][0]['NetSummaryCharges'][0].has_key('GrandTotal'):
+                           NegotiatedRates=response_dic['ShipmentAcceptResponse'][1]['ShipmentResults'][1]['NegotiatedRates'][0]['NetSummaryCharges'][0]['GrandTotal'][1]['MonetaryValue']
+
+                if len(response_dic['ShipmentAcceptResponse'][1]['ShipmentResults'])>0 and response_dic['ShipmentAcceptResponse'][1]['ShipmentResults'][3].has_key('ShipmentIdentificationNumber'):
+                    ShipmentIdentificationNumber=response_dic['ShipmentAcceptResponse'][1]['ShipmentResults'][3]['ShipmentIdentificationNumber']
+
+                if len(response_dic['ShipmentAcceptResponse'][1]['ShipmentResults'])>4 and response_dic['ShipmentAcceptResponse'][1]['ShipmentResults'][4].has_key('PackageResults') :
+                    if len(response_dic['ShipmentAcceptResponse'][1]['ShipmentResults'][4]['PackageResults'])>0:
+                        TrackingNumber=response_dic['ShipmentAcceptResponse'][1]['ShipmentResults'][4]['PackageResults'][0]['TrackingNumber']
+
+                    if len(response_dic['ShipmentAcceptResponse'][1]['ShipmentResults'][4]['PackageResults'])>2 and response_dic['ShipmentAcceptResponse'][1]['ShipmentResults'][4]['PackageResults'][2].has_key('LabelImage') :
+                        label_image =response_dic['ShipmentAcceptResponse'][1]['ShipmentResults'][4]['PackageResults'][2]['LabelImage'][1]['GraphicImage']
+        if TrackingNumber:
+            tracking_url = pack_obj.pick_id.logis_company.ship_tracking_url
+            if tracking_url:
+                try:
+                    tracking_url = tracking_url%TrackingNumber
+                except Exception, e:
+                    tracking_url = "Invalid tracking url on shipping company"
+#            tracking_url = """http://wwwapps.ups.com/WebTracking/processInputRequest?sort_by=status&tracknums_displayed=1&TypeOfInquiryNumber=T&loc=en_US&InquiryNumber1=%s&track.x=0&track.y=0""" % TrackingNumber
+        else:
+            tracking_url = ''
+        if label_image:
+            im_in_raw=base64.decodestring(label_image)
+            path=tempfile.mktemp()
+            temp=file(path,'wb')
+            temp.write(im_in_raw)
+            temp.close()
+            new_im=Image.open(path)
+            new_im=new_im.rotate(270)
+            new_im.save(path,'JPEG')
+            label_from_file=open(path,'rb')
+            label_image=base64.encodestring(label_from_file.read())
+            label_from_file.close()
+
+        self.pool.get('stock.packages').write(cr,uid,[pack_obj.id],{'tracking_no':TrackingNumber or "",
+                                                                     'shipment_identific_no':ShipmentIdentificationNumber or "",
+                                                                     'negotiated_rates':NegotiatedRates or '',
+                                                                     'logo':label_image,
+                                                                     'ship_state':'in_process',
+                                                                     'tracking_url':tracking_url})
+
+        if ship_move_ids.get(pack_obj.id):
+            if TrackingNumber:
+                tracking_url = pack_obj.pick_id.logis_company.ship_tracking_url
+                if tracking_url:
+                    try:
+                        tracking_url = tracking_url%TrackingNumber
+                    except Exception, e:
+                        tracking_url = "Invalid tracking url on shipping company"
+            else:
+                tracking_url = ''
+            self.pool.get('shipping.move').write(cr, uid, [ship_move_ids.get(pack_obj.id)], {'tracking_no':TrackingNumber or "",
+                                                                     'shipment_identific_no':ShipmentIdentificationNumber or "",
+                                                                     'ship_cost':NegotiatedRates or '',
+                                                                     'logo':label_image,
+                                                                     'state':'ready_pick',
+                                                                     'tracking_url':tracking_url})
+#        t_string="Package id : "+str(pack_obj.id)
+#        t_string+="\n"+(pack_obj.pick_id.ship_message or '')
+#        self.pool.get('stock.picking').write(cr, uid,[pack_obj.pick_id.id], {'ship_message': t_string})
+
+        return True
+    def add_product(self, cr, uid, package_obj):
+        prods = []
+        tot_weight = 0
+        for pkg in package_obj.pick_id.packages_ids:
+            tot_weight += pkg.weight
+        for move_lines in package_obj.pick_id.move_lines:
+            product_id = move_lines.product_id
+            if move_lines.product_id.supply_method == 'produce':
+                produce = "Yes"
+            else:
+                produce = "NO[1]" 
+            product={'Description':move_lines.product_id.description or " ",
+             'Unit':{'Number':str(int(move_lines.product_qty) or 0),
+                     'Value':str((move_lines.product_id.list_price * move_lines.product_qty) or 0),
+                     'UnitOfMeasurement':{'Code':"LBS",'Description':"Pounds"}
+                    },
+             'CommodityCode':package_obj.pick_id.comm_code or "",
+             'PartNumber':"",
+             'OriginCountryCode':package_obj.pick_id.address_id and package_obj.pick_id.address_id.country_id and package_obj.pick_id.address_id.country_id.code or "",
+             'JointProductionIndicator':"",
+             'NetCostCode':"NO",
+#             'NetCostDateRange':{'BeginDate':"",'EndDate':""},    Not required
+             'PreferenceCriteria':"B",
+             'ProducerInfo':produce,
+             'MarksAndNumbers':"",
+             'NumberOfPackagesPerCommodity':str(len(package_obj.pick_id.packages_ids)),
+             'ProductWeight':{'UnitOfMeasurement':{'Code':"LBS",'Description':"Pounds"},
+                               'Weight':"%.1f"%(tot_weight or '0')},
+             'VehicleID':"",
+#             THis is only needed for sed
+#             'ScheduleB':{'Number':"",
+#                          'Quantity':"",
+#                          'UnitOfMeasurement':{'Code':"",'Description':""},
+#                          'ExportType':"",
+#                          'SEDTotalValue':""
+#                          },
+                }
+            prods.append(product)
+        return prods
+    def create_comm_inv(self, cr, uid, package_obj):
+        invoice_id = False
+        if package_obj.pick_id.sale_id:
+            if package_obj.pick_id.sale_id.invoice_ids:
+                invoice_id = package_obj.pick_id.sale_id.invoice_ids[0]
+        user = self.pool.get('res.users').browse(cr, uid, uid)
+        comm_inv={    'FormType':"01",
+#            'AdditionalDocumentIndicator':"",        Not required
+#            'FormGroupIdName':"",        Not required
+            'Product':[],#Placed out of this dictionary for common use
+            'InvoiceNumber':"",
+            'InvoiceDate':"",
+            'PurchaseOrderNumber':"",
+            'TermsOfShipment':"",
+            'ReasonForExport':"SALE",
+            'Comments':"",
+            'DeclarationStatement':"I hereby certify that the good covered by this shipment qualifies as an originating good for purposes of preferential tariff treatment under the NAFTA.",
+#            'Discount':{'MonetaryValue':"0"},#Discount                           Not Required
+#            'FreightCharges':{'MonetaryValue':""},#FreightCharges                Not Required
+#            'InsuranceCharges':{'MonetaryValue':""},#InsuranceCharges            Not Required
+#            'OtherCharges':{'MonetaryValue':"",'Description':""},#OtherCharges   Not Required
+            'CurrencyCode':user.company_id.currency_id.name or "",
+#            'InBondCode':"",                                Not Required
+#            'EntryNumber':"",                               Not Required
+#            'PointOfOrigin':"",                             Not Required
+        }
+        if invoice_id:
+            comm_inv['InvoiceNumber'] = invoice_id.number or '/'
+            if invoice_id.date_invoice:
+                d=invoice_id.date_invoice
+                comm_inv['InvoiceDate'] = d[:4]+d[5:7]+d[8:10]
+        if not comm_inv['InvoiceDate']:
+            comm_inv['InvoiceDate'] = time.strftime("%Y%m%d")
+        
+        return comm_inv
+    def create_cer_orig(self, cr, uid, package_obj):
+        cer_orig={    
+            'FormType':"03",
+#            'AdditionalDocumentIndicator':"",                            Not Required
+#            'FormGroupIdName':"",                                        Not Required
+            'Product':[],#Placed out of this dictionary for common use
+            'ExportDate':time.strftime("%Y%m%d"),
+            'ExportingCarrier':package_obj.pick_id.exp_carrier or "",
+        }
+        return cer_orig
+    def create_nafta_cer_orig(self, cr, uid, package_obj):
+        addr = {}
+        if package_obj.pick_id.prod_address_id:
+            addr_id = package_obj.pick_id.prod_address_id
+            
+            addr = {'AddressLine1':addr_id.street or "",
+                                  'AddressLine2':addr_id.street2 or "",
+                                  'City':addr_id.city or "",
+                                  'StateProvinceCode':addr_id.state_id and addr_id.state_id.code or "",
+                                  'PostalCode':addr_id.zip or "",
+                                  'CountryCode':addr_id.country_id and addr_id.country_id.code or "",
+                                  }
+        beg_date=" "
+        end_date=" "
+        if package_obj.pick_id.blanket_begin_date:
+            beg_date = package_obj.pick_id.blanket_begin_date
+            beg_date = beg_date[:4]+beg_date[5:7]+beg_date[8:10]
+        if package_obj.pick_id.blanket_end_date:
+            end_date = package_obj.pick_id.blanket_end_date
+            end_date = end_date[:4]+end_date[5:7]+end_date[8:10]
+        nafta_cer_orig={    'FormType':"04",
+#             'AdditionalDocumentIndicator':"",                            Not Required
+#             'FormGroupIdName':"",                                        Not Required
+             'Contacts':{
+
+                            'Producer':{'Option':package_obj.pick_id.prod_option or "",
+                                        'CompanyName':package_obj.pick_id.prod_company or "",
+                                        'TaxIdentificationNumber':package_obj.pick_id.prod_tax_id_no or "",
+                                        'Address':addr,#Address
+                                        },#Producer
+                         },#Contacts
+             'BlanketPeriod':{
+                              'BeginDate':beg_date,
+                              'EndDate':end_date,
+
+                              },
+             'Product':[],#Placed out of this dictionary for common use
+        }
+        return nafta_cer_orig
+#    def create_sed(self, package_obj):
+#        sed ={    'FormType':"02",
+#             'AdditionalDocumentIndicator':"",
+#             'FormGroupIdName':"",
+#             'SEDFilingOption':"01",
+#             'Contacts':{
+#                         'ForwardAgent':{'CompanyName':"",
+#                                         'TaxIdentificationNumber':"",
+#                                         'Address':{'AddressLine1':"",
+#                                                    'AddressLine2':"",
+#                                                    'City':"",
+#                                                    'StateProvinceCode':"",
+#                                                    'PostalCode':"",
+#                                                    'CountryCode':"",
+#                                                    },#Address
+#
+#                                            },#ForwardAgent
+#                           'UltimateConsignee':{'CompanyName':"",
+#                                                'Address':{'AddressLine1':"",
+#                                                           'AddressLine2':"",
+#                                                           'City':"",
+#                                                            'StateProvinceCode':"",
+#                                                            'PostalCode':"",
+#                                                            'CountryCode':"",
+#                                                            },#Address
+#                                                },#UltimateConsignee
+#
+#                           'IntermediateConsignee':{'CompanyName':"",
+#                                                    'Address':{'AddressLine1':"",
+#                                                               'AddressLine2':"",
+#                                                               'City':"",
+#                                                               'StateProvinceCode':"",
+#                                                               'PostalCode':"",
+#                                                               'CountryCode':"",
+#                                                               },#Address
+#                                                    },#IntermediateConsignee
+#
+#                            'Producer':{'Option':"",
+#                                        'CompanyName':"",
+#                                        'TaxIdentificationNumber':"",
+#                                        'Address':{'AddressLine1':"",
+#                                                   'AddressLine2':"",
+#                                                   'City':"",
+#                                                   'StateProvinceCode':"",
+#                                                   'PostalCode':"",
+#                                                   'CountryCode':"",
+#                                                   },#Address
+#                                        },#Producer
+#                         },#Contacts
+#             'Product':[],#Placed out of this dictionary for common use
+#            'ExportDate':"",
+#            'ExportingCarrier':"",
+#            'CarrierID':"",
+#            'InBondCode':"",
+#            'EntryNumber':"",
+#            'PointOfOrigin':"",
+#            'ModeOfTransport':"",
+#            'PortOfExport':"",
+#            'PortOfUnloading':"",
+#            'LoadingPier':"",
+#            'PartiesToTransaction':"",
+#            'RoutedExportTransactionIndicator':False,#Make it true to add this
+#            'ContainerizedIndicator':False,#Make it true to add this
+#            'License':{ 'Number':"",
+#                        'Date':"",
+#                        'ExceptionCode':"",},
+#            'ECCNNumber':"",
+#        }
+#        return sed
+    
+    def create_forms(self, cr, uid, package_obj):
+        comm_inv = {}
+        cer_orig = {}
+        nafta_cer_orig = {}
+        sed = {}
+        if package_obj.pick_id.comm_inv:
+            comm_inv = self.create_comm_inv(cr, uid, package_obj)
+        if package_obj.pick_id.cer_orig:
+            cer_orig = self.create_cer_orig(cr, uid, package_obj)
+        if package_obj.pick_id.nafta_cer_orig:
+            nafta_cer_orig = self.create_nafta_cer_orig(cr, uid, package_obj)
+#        if package_obj.pick_id.sed:
+#            sed = self.create_sed(package_obj)
+        prod = self.add_product(cr, uid, package_obj)
+#        asd
+        ret = {'comm_inv':comm_inv,'cer_orig':cer_orig,'nafta_cer_orig':nafta_cer_orig,'sed':sed,'prod':prod}
+        return ret
+    def create_ship_confirm_request(self,cr, uid,package_id):
+            package_obj=self.pool.get('stock.packages').browse(cr, uid, package_id)
+
+###create the acces req xml first
+            data_for_Access_Request={
+                                        'AccessLicenseNumber':package_obj.pick_id.shipper.id and package_obj.pick_id.shipper.accesslicensenumber or '',
+                                        'UserId':package_obj.pick_id.shipper.id and package_obj.pick_id.shipper.userid or '',
+                                        'Password':package_obj.pick_id.shipper.id and package_obj.pick_id.shipper.password or ''
+                                    }
+
+            doc1 = Document()
+            AccessRequest = doc1.createElement("AccessRequest")
+            AccessRequest.setAttribute("xml:lang", "en-US")
+            doc1.appendChild(AccessRequest)
+
+
+            AccessLicenseNumber = doc1.createElement("AccessLicenseNumber")
+            ptext = doc1.createTextNode(data_for_Access_Request["AccessLicenseNumber"])
+            AccessLicenseNumber.appendChild(ptext)
+            AccessRequest.appendChild(AccessLicenseNumber)
+
+            UserId = doc1.createElement("UserId")
+            ptext = doc1.createTextNode(data_for_Access_Request["UserId"])
+            UserId.appendChild(ptext)
+            AccessRequest.appendChild(UserId)
+
+            Password = doc1.createElement("Password")
+            ptext = doc1.createTextNode(data_for_Access_Request["Password"])
+            Password.appendChild(ptext)
+            AccessRequest.appendChild(Password)
+
+            Request_string1=doc1.toprettyxml()
+
+
+###create the shipment acces req xml
+            data_for_confirm_request={'ShipmentConfirmRequest':{
+
+                                  'Request':{'RequestAction':"ShipConfirm",#-----must be ShipConfirm
+                                            'RequestOption':package_obj.pick_id.address_validate or "nonvalidate",#----------adress validation
+                                            'TransactionReference':{'CustomerContext':"",},#---------optional data
+                                            },#Request
+
+                                  'Shipment':{'Description':package_obj.description or "Shipping",
+                                              'ReturnService':{'Code':"8", 'DocumentsOnly':"" },
+                                              'Shipper':{ 'Name':package_obj.pick_id.shipper.id and package_obj.pick_id.shipper.name or "",
+                                                          'AttentionName':package_obj.pick_id.shipper.id and package_obj.pick_id.shipper.atten_name or "",
+                                                          'ShipperNumber':package_obj.pick_id.shipper.id and package_obj.pick_id.shipper.acc_no or "",
+                                                          'TaxIdentificationNumber':package_obj.pick_id.shipper.id and package_obj.pick_id.shipper.tax_id_no or "",
+                                                          'PhoneNumber':package_obj.pick_id.shipper.id and package_obj.pick_id.shipper.address and package_obj.pick_id.shipper.address.phone or "",
+                                                          'FaxNumber':package_obj.pick_id.shipper.id and package_obj.pick_id.shipper.address and package_obj.pick_id.shipper.address.fax or "",
+                                                          'EMailAddress':package_obj.pick_id.shipper.id and package_obj.pick_id.shipper.address and package_obj.pick_id.shipper.address.email or "",
+                                                          'Address':self.fill_addr(package_obj.pick_id.shipper.id and package_obj.pick_id.shipper.address or '')
+                                                         },#Shipper
+
+                                              'ShipTo': {'CompanyName':package_obj.pick_id.address_id.partner_id and package_obj.pick_id.address_id.partner_id.name or '',
+                                                        'AttentionName':package_obj.pick_id.inv_att_name or "",
+                                                        'TaxIdentificationNumber':"",
+                                                        'PhoneNumber':package_obj.pick_id.address_id.id and package_obj.pick_id.address_id.phone or '',
+                                                        'FaxNumber':package_obj.pick_id.address_id.id and package_obj.pick_id.address_id.fax or '',
+                                                        'EMailAddress':package_obj.pick_id.address_id.id and package_obj.pick_id.address_id.email or '',
+                                                        'Address':self.fill_addr(package_obj.pick_id.address_id.id and package_obj.pick_id.address_id),
+                                                        'LocationID':"",
+                                                         },#ShipTo
+
+
+
+                                              'ShipFrom':{'CompanyName':package_obj.pick_id.shipper.id and package_obj.pick_id.shipper.name or "",
+                                                          'AttentionName':package_obj.pick_id.shipper.id and package_obj.pick_id.shipper.atten_name or "",
+                                                          'TaxIdentificationNumber':package_obj.pick_id.ship_from_tax_id_no or '',
+                                                          'PhoneNumber':package_obj.pick_id.address_id.id and package_obj.pick_id.ship_from_address.phone or '',
+                                                          'FaxNumber':package_obj.pick_id.address_id.id and package_obj.pick_id.ship_from_address.fax or '',
+                                                          'Address':self.fill_addr(package_obj.pick_id.ship_from_address.id and package_obj.pick_id.ship_from_address),
+                                                          },
+
+                                              'SoldTo':{'Option':package_obj.pick_id.inv_option or " ",
+                                                        'CompanyName':package_obj.pick_id.inv_company or "",
+                                                        'AttentionName':package_obj.pick_id.inv_att_name or "",
+                                                        'TaxIdentificationNumber':package_obj.pick_id.inv_tax_id_no or "",
+                                                        'PhoneNumber':package_obj.pick_id.inv_address_id and package_obj.pick_id.inv_address_id.phone or "",
+                                                        'Address':{'AddressLine1':package_obj.pick_id.inv_address_id and package_obj.pick_id.inv_address_id.street or "",
+                                                                   'AddressLine2':package_obj.pick_id.inv_address_id and package_obj.pick_id.inv_address_id.street2 or "",
+                                                                   'City':package_obj.pick_id.inv_address_id and package_obj.pick_id.inv_address_id.city or "",
+                                                                   'StateProvinceCode':package_obj.pick_id.inv_address_id and package_obj.pick_id.inv_address_id.state_id and package_obj.pick_id.inv_address_id.state_id.code or "",
+                                                                   'PostalCode':package_obj.pick_id.inv_address_id and package_obj.pick_id.inv_address_id.zip or "",
+                                                                   'CountryCode':package_obj.pick_id.inv_address_id and package_obj.pick_id.inv_address_id.country_id and package_obj.pick_id.inv_address_id.country_id.code or "",}
+                                                      },#SoldTo,
+
+                                              'PaymentInformation':{'Prepaid':{
+                                                                            'BillShipper':{'AccountNumber':package_obj.pick_id.shipper and package_obj.pick_id.shipper.acc_no or "",
+#                                                                                           'CreditCard':{'Type':"",
+#                                                                                                      'Number':"",
+#                                                                                                      'ExpirationDate':"",
+#                                                                                                      'SecurityCode':"",
+#                                                                                                      'Address':{'AddressLine1':"",
+#                                                                                                                 'AddressLine2':"",
+#                                                                                                                 'AddressLine3':"",
+#                                                                                                                 'City':"",
+#                                                                                                                 'StateProvinceCode':"",
+#                                                                                                                 'PostalCode':"",
+#                                                                                                                 'CountryCode':"",},
+#                                                                                                      },#CreditCard
+                                                                                            },#BillShipper
+                                                                                },#Prepaid
+#                                                                            'BillThirdParty':{'BillThirdPartyShipper':{'AccountNumber':"",
+#                                                                                                                            'ThirdParty':{
+#                                                                                                                                          'Address':{'PostalCode':"",
+#                                                                                                                                                     'CountryCode':"",},#Address
+#                                                                                                                                         },#ThirdParty
+#                                                                                                                        },#BillThirdPartyShipper
+#
+#                                                                                                        },#BillThirdParty
+#
+#                                                                            'FreightCollect':{'BillReceiver':{'AccountNumber':"",
+#                                                                                                              'Address':{'PostalCode':"",},#Address
+#                                                                                                 },#BillReceiver
+#                                                                                 },#FreightCollect
+#
+#                                                                           'ConsigneeBilled':"",
+                                                                  },#PaymentInformation,
+
+#                                 'ItemizedPaymentInformation':{ 'ShipmentCharge':{'Type':"",
+#                                                                                 'BillShipper':{'AccountNumber':"",
+#                                                                                                'CreditCard':{'Type':"",
+#                                                                                                              'Number':"",
+#                                                                                                               'ExpirationDate':"",
+#                                                                                                               'SecurityCode':"",
+#                                                                                                               'Address':{'AddressLine1':"",
+#                                                                                                                          'AddressLine2':"",
+#                                                                                                                          'AddressLine3':"",
+#                                                                                                                          'City':"",
+#                                                                                                                          'StateProvinceCode':"",
+#                                                                                                                          'PostalCode':"",
+#                                                                                                                          'CountryCode':"",},
+#                                                                                                                },#CreditCard
+#                                                                                                    },#BillShipper
+#                                                                             'BillReceiver':{'AccountNumber':"",'Address':{'PostalCode':"",},#Address
+#                                                                                            },#BillReceiver
+#                                                                             'BillThirdParty':{'BillThirdPartyShipper':{'AccountNumber':"",
+#                                                                                                                        'ThirdParty':{
+#                                                                                                                    'Address':{'PostalCode':"",'CountryCode':"",},#Address
+#                                                                                                                                    },#ThirdParty
+#                                                                                                                   },#BillThirdPartyShipper
+#
+#                                                                                                'BillThirdPartyConsignee':{'AccountNumber':"",'ThirdParty':{'Address':{'PostalCode':"",
+#                                                                                                                                                                    'CountryCode':"",}, #Address
+#                                                                                                                                                            },#ThirdParty
+#                                                                                                                           },#BillThirdPartyConsignee
+#                                                                                                },#BillThirdParty
+#                                                                             'ConsigneeBilled':"",
+#                                                                                     },#ShipmentCharge
+#                                                                'SplitDutyVATIndicator':"",
+#                                                            },#ItemizedPaymentInformation
+
+                                 'GoodsNotInFreeCirculationIndicator':"",
+                                 'RateInformation':{'NegotiatedRatesIndicator':""},#RateInformation
+#                                 'MovementReferenceNumber':"",
+#                                 'ReferenceNumber':{'BarCodeIndicator':"",'Code':"",'Value':"",},#ReferenceNumber,
+                                 'Service':{'Code':package_obj.pick_id.ups_service.id and str(package_obj.pick_id.ups_service.shipping_service_code) or "",
+                                            'Description':package_obj.pick_id.ups_service.id and package_obj.pick_id.ups_service.description or ""},#Service
+                                 'InvoiceLineTotal':{'CurrencyCode':"",'MonetaryValue':str(int(package_obj.pick_id.sale_id.amount_total)) or ""},#InvoiceLineTotal
+                                 'ShipmentServiceOptions':{'SaturdayDelivery':"",
+#                                                           'COD':{'CODCode':"",'CODFundsCode':"",
+#                                                                                        'CODAmount':{'CurrencyCode':"",
+#                                                                                                     'MonetaryValue':""
+#                                                                                                    },#CODAmount
+#                                                                                        },#COD
+                                                           'Notification':[],
+                                                           'LabelDelivery':{'LabelLinkIndicator':"",
+                                                                            'EMailMessage':{'EMailAddress':"[e-mail]",
+                                                                                           'UndeliverableEMailAddress':"",
+                                                                                           'FromEMailAddress':"[e-mail]",
+                                                                                           'FromName':"",
+                                                                                           'Memo':"",
+                                                                                           'Subject':"",
+                                                                                           'SubjectCode':""}#EMailMessage
+                                                                            },#LabelDelivery
+
+                                                           'InternationalForms':self.create_forms(cr, uid, package_obj),#InternationalForms
+#                                                           'ReturnOfDocumentIndicator':"",
+#                                                           'ImportControlIndicator':"",
+#                                                           'LabelMethod':{'Code':"",'Description':"",},#LabelMethod
+#                                                           'CommercialInvoiceRemovalIndicator':"",
+#                                                           'UPScarbonneutralIndicator':"",
+#                                                           'DeliveryConfirmation':{'DCISType':"1",}#DeliveryConfirmation
+                                                         },#ShipmentServiceOptions,
+                                 'Package':self.get_package(package_obj)## this is done in different file
+                                                },#Shipment
+                'LabelSpecification':{'LabelPrintMethod':{'Code':"GIF", 'Description':"GIF",},
+                                      'HTTPUserAgent':"",
+                                      'LabelStockSize':{'Height':"6",'Width':"6"},
+                                      'LabelImageFormat':{'Code':"GIF",'Description':"GIF"},
+                                    },#LabelSpecification
+
+            },#ShipmentConfirmRequest
+        }
+
+
+
+
+            comm_inv = data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["ShipmentServiceOptions"]["InternationalForms"]['comm_inv']
+            cer_orig = data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["ShipmentServiceOptions"]["InternationalForms"]['cer_orig']
+            nafta_cer_orig = data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["ShipmentServiceOptions"]["InternationalForms"]['nafta_cer_orig']
+            sed = False #data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["ShipmentServiceOptions"]["InternationalForms"]['sed']
+            prod = data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["ShipmentServiceOptions"]["InternationalForms"]['prod']
+            
+
+            doc2 = Document()
+            ShipmentConfirmRequest = doc2.createElement("ShipmentConfirmRequest")
+            doc2.appendChild(ShipmentConfirmRequest)
+
+            Request = doc2.createElement("Request")
+            ShipmentConfirmRequest.appendChild(Request)
+
+            RequestAction = doc2.createElement("RequestAction")
+            ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Request"]["RequestAction"])
+            RequestAction.appendChild(ptext)
+            Request.appendChild(RequestAction)
+
+            RequestOption = doc2.createElement("RequestOption")
+            ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Request"]["RequestOption"])
+            RequestOption.appendChild(ptext)
+            Request.appendChild(RequestOption)
+
+            TransactionReference = doc2.createElement("TransactionReference")
+            Request.appendChild(TransactionReference)
+
+            CustomerContext = doc2.createElement("CustomerContext")
+            ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Request"]["TransactionReference"]['CustomerContext'])
+            CustomerContext.appendChild(ptext)
+            TransactionReference.appendChild(CustomerContext)
+
+            Shipment = doc2.createElement("Shipment")
+            ShipmentConfirmRequest.appendChild(Shipment)
+
+            Description = doc2.createElement("Description")
+            ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["Description"])
+            Description.appendChild(ptext)
+            Shipment.appendChild(Description)
+            if package_obj.pick_id.with_ret_service:
+                ReturnService = doc2.createElement("ReturnService")
+                Shipment.appendChild(ReturnService)
+
+
+                Code = doc2.createElement("Code")
+                ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["ReturnService"]["Code"])
+                Code.appendChild(ptext)
+                ReturnService.appendChild(Code)
+    #
+    #        DocumentsOnly = doc2.createElement("DocumentsOnly")
+    #        ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["ReturnService"]["DocumentsOnly"])
+    #        DocumentsOnly.appendChild(ptext)
+    #        ReturnService.appendChild(DocumentsOnly)
+
+            Shipper = doc2.createElement("Shipper")
+            Shipment.appendChild(Shipper)
+
+            Name = doc2.createElement("Name")
+            ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["Shipper"]["Name"])
+            Name.appendChild(ptext)
+            Shipper.appendChild(Name)
+
+            AttentionName = doc2.createElement("AttentionName")
+            ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["Shipper"]["AttentionName"])
+            AttentionName.appendChild(ptext)
+            Shipper.appendChild(AttentionName)
+
+            ShipperNumber = doc2.createElement("ShipperNumber")
+            ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["Shipper"]["ShipperNumber"])
+            ShipperNumber.appendChild(ptext)
+            Shipper.appendChild(ShipperNumber)
+
+            TaxIdentificationNumber = doc2.createElement("TaxIdentificationNumber")
+            ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["Shipper"]["TaxIdentificationNumber"])
+            TaxIdentificationNumber.appendChild(ptext)
+            Shipper.appendChild(TaxIdentificationNumber)
+            PhoneNumber = doc2.createElement("PhoneNumber")
+            ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["Shipper"]["PhoneNumber"])
+            PhoneNumber.appendChild(ptext)
+            Shipper.appendChild(PhoneNumber)
+
+            FaxNumber = doc2.createElement("FaxNumber")
+            ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["Shipper"]["FaxNumber"])
+            FaxNumber.appendChild(ptext)
+            Shipper.appendChild(FaxNumber)
+
+            EMailAddress = doc2.createElement("EMailAddress")
+            ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["Shipper"]["EMailAddress"])
+            EMailAddress.appendChild(ptext)
+            Shipper.appendChild(EMailAddress)
+
+            #################address
+            Address = doc2.createElement("Address")
+            Shipper.appendChild(Address)
+
+            AddressLine1 = doc2.createElement("AddressLine1")
+            ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["Shipper"]["Address"]["AddressLine1"])
+            AddressLine1.appendChild(ptext)
+            Address.appendChild(AddressLine1)
+
+            AddressLine2 = doc2.createElement("AddressLine2")
+            ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["Shipper"]["Address"]["AddressLine2"])
+            AddressLine2.appendChild(ptext)
+            Address.appendChild(AddressLine2)
+
+            AddressLine3 = doc2.createElement("AddressLine3")
+            ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["Shipper"]["Address"]["AddressLine3"])
+            AddressLine3.appendChild(ptext)
+            Address.appendChild(AddressLine3)
+
+            City = doc2.createElement("City")
+            ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["Shipper"]["Address"]["City"])
+            City.appendChild(ptext)
+            Address.appendChild(City)
+
+            StateProvinceCode = doc2.createElement("StateProvinceCode")
+            ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["Shipper"]["Address"]["StateProvinceCode"])
+            StateProvinceCode.appendChild(ptext)
+            Address.appendChild(StateProvinceCode)
+
+            PostalCode = doc2.createElement("PostalCode")
+            ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["Shipper"]["Address"]["PostalCode"])
+            PostalCode.appendChild(ptext)
+            Address.appendChild(PostalCode)
+            CountryCode = doc2.createElement("CountryCode")
+            ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["Shipper"]["Address"]["CountryCode"])
+            CountryCode.appendChild(ptext)
+            Address.appendChild(CountryCode)
+
+            ShipTo = doc2.createElement("ShipTo")
+            Shipment.appendChild(ShipTo)
+            CompanyName = doc2.createElement("CompanyName")
+            ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["ShipTo"]["CompanyName"])
+            CompanyName.appendChild(ptext)
+            ShipTo.appendChild(CompanyName)
+
+            AttentionName = doc2.createElement("AttentionName")
+            ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["ShipTo"]["AttentionName"])
+            AttentionName.appendChild(ptext)
+            ShipTo.appendChild(AttentionName)
+
+            TaxIdentificationNumber = doc2.createElement("TaxIdentificationNumber")
+            ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["ShipTo"]["TaxIdentificationNumber"])
+            TaxIdentificationNumber.appendChild(ptext)
+            ShipTo.appendChild(TaxIdentificationNumber)
+
+            PhoneNumber = doc2.createElement("PhoneNumber")
+            ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["ShipTo"]["PhoneNumber"])
+            PhoneNumber.appendChild(ptext)
+            ShipTo.appendChild(PhoneNumber)
+
+            FaxNumber = doc2.createElement("FaxNumber")
+            ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["ShipTo"]["FaxNumber"])
+            FaxNumber.appendChild(ptext)
+            ShipTo.appendChild(FaxNumber)
+
+            EMailAddress = doc2.createElement("EMailAddress")
+            ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["ShipTo"]["EMailAddress"])
+            EMailAddress.appendChild(ptext)
+            ShipTo.appendChild(EMailAddress)
+
+            LocationID = doc2.createElement("LocationID")
+            ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["ShipTo"]["LocationID"])
+            LocationID.appendChild(ptext)
+            ShipTo.appendChild(LocationID)
+
+            Address = doc2.createElement("Address")
+            ShipTo.appendChild(Address)
+            AddressLine1 = doc2.createElement("AddressLine1")
+            ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["ShipTo"]["Address"]["AddressLine1"])
+            AddressLine1.appendChild(ptext)
+            Address.appendChild(AddressLine1)
+
+            AddressLine2 = doc2.createElement("AddressLine2")
+            ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["ShipTo"]["Address"]["AddressLine2"])
+            AddressLine2.appendChild(ptext)
+            Address.appendChild(AddressLine2)
+
+            AddressLine2 = doc2.createElement("AddressLine3")
+            ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["ShipTo"]["Address"]["AddressLine3"])
+            AddressLine3.appendChild(ptext)
+            Address.appendChild(AddressLine3)
+
+            City = doc2.createElement("City")
+            ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["ShipTo"]["Address"]["City"])
+            City.appendChild(ptext)
+            Address.appendChild(City)
+
+            StateProvinceCode = doc2.createElement("StateProvinceCode")
+            ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["ShipTo"]["Address"]["StateProvinceCode"])
+            StateProvinceCode.appendChild(ptext)
+            Address.appendChild(StateProvinceCode)
+
+            PostalCode = doc2.createElement("PostalCode")
+            ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["ShipTo"]["Address"]["PostalCode"])
+            PostalCode.appendChild(ptext)
+            Address.appendChild(PostalCode)
+
+            CountryCode = doc2.createElement("CountryCode")
+            ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["ShipTo"]["Address"]["CountryCode"])
+            CountryCode.appendChild(ptext)
+            Address.appendChild(CountryCode)
+            if package_obj.pick_id.ship_from:
+                ShipFrom = doc2.createElement("ShipFrom")
+                Shipment.appendChild(ShipFrom)
+                CompanyName = doc2.createElement("CompanyName")
+                ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["ShipFrom"]["CompanyName"])
+                CompanyName.appendChild(ptext)
+                ShipFrom.appendChild(CompanyName)
+
+                AttentionName = doc2.createElement("AttentionName")
+                ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["ShipFrom"]["AttentionName"])
+                AttentionName.appendChild(ptext)
+                ShipFrom.appendChild(AttentionName)
+
+                TaxIdentificationNumber = doc2.createElement("TaxIdentificationNumber")
+                ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["ShipFrom"]["TaxIdentificationNumber"])
+                TaxIdentificationNumber.appendChild(ptext)
+                ShipFrom.appendChild(TaxIdentificationNumber)
+
+                PhoneNumber = doc2.createElement("PhoneNumber")
+                ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["ShipFrom"]["PhoneNumber"])
+                PhoneNumber.appendChild(ptext)
+                ShipFrom.appendChild(PhoneNumber)
+
+                FaxNumber = doc2.createElement("FaxNumber")
+                ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["ShipFrom"]["FaxNumber"])
+                FaxNumber.appendChild(ptext)
+                ShipFrom.appendChild(FaxNumber)
+
+                Address = doc2.createElement("Address")
+                ShipFrom.appendChild(Address)
+                AddressLine1 = doc2.createElement("AddressLine1")
+                ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["ShipFrom"]["Address"]["AddressLine1"])
+                AddressLine1.appendChild(ptext)
+                Address.appendChild(AddressLine1)
+
+                AddressLine2 = doc2.createElement("AddressLine2")
+                ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["ShipFrom"]["Address"]["AddressLine2"])
+                AddressLine2.appendChild(ptext)
+                Address.appendChild(AddressLine2)
+
+                AddressLine3 = doc2.createElement("AddressLine3")
+                ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["ShipFrom"]["Address"]["AddressLine3"])
+                AddressLine3.appendChild(ptext)
+                Address.appendChild(AddressLine3)
+
+                City = doc2.createElement("City")
+                ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["ShipFrom"]["Address"]["City"])
+                City.appendChild(ptext)
+                Address.appendChild(City)
+
+                StateProvinceCode = doc2.createElement("StateProvinceCode")
+                ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["ShipFrom"]["Address"]["StateProvinceCode"])
+                StateProvinceCode.appendChild(ptext)
+                Address.appendChild(StateProvinceCode)
+
+#                PostalCode = doc2.createElement("PostalCode")
+#                ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["ShipFrom"]["Address"]["PostalCode"])
+#                PostalCode.appendChild(ptext)
+#                Address.appendChild(PostalCode)
+
+                CountryCode = doc2.createElement("CountryCode")
+                ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["ShipFrom"]["Address"]["CountryCode"])
+                CountryCode.appendChild(ptext)
+                Address.appendChild(CountryCode)
+
+
+###################
+            if comm_inv or nafta_cer_orig:
+                SoldTo = doc2.createElement("SoldTo")
+                Shipment.appendChild(SoldTo)
+#                if data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["SoldTo"]["Option"] != ' ':
+                Option = doc2.createElement("Option")
+                ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["SoldTo"]["Option"])
+                Option.appendChild(ptext)
+                SoldTo.appendChild(Option)
+                
+                CompanyName = doc2.createElement("CompanyName")
+                ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["SoldTo"]["CompanyName"])
+                CompanyName.appendChild(ptext)
+                SoldTo.appendChild(CompanyName)
+#                else:  
+                CompanyName = doc2.createElement("CompanyName")
+                ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["SoldTo"]["CompanyName"])
+                CompanyName.appendChild(ptext)
+                SoldTo.appendChild(CompanyName)
+    
+                AttentionName = doc2.createElement("AttentionName")
+                ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["SoldTo"]["AttentionName"])
+                AttentionName.appendChild(ptext)
+                SoldTo.appendChild(AttentionName)
+    
+                TaxIdentificationNumber = doc2.createElement("TaxIdentificationNumber")
+                ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["SoldTo"]["TaxIdentificationNumber"])
+                TaxIdentificationNumber.appendChild(ptext)
+                SoldTo.appendChild(TaxIdentificationNumber)
+    
+                PhoneNumber = doc2.createElement("PhoneNumber")
+                ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["SoldTo"]["PhoneNumber"])
+                PhoneNumber.appendChild(ptext)
+                SoldTo.appendChild(PhoneNumber)
+    
+    
+                Address = doc2.createElement("Address")
+                SoldTo.appendChild(Address)
+                AddressLine1 = doc2.createElement("AddressLine1")
+                ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["SoldTo"]["Address"]["AddressLine1"])
+                AddressLine1.appendChild(ptext)
+                Address.appendChild(AddressLine1)
+    
+                AddressLine2 = doc2.createElement("AddressLine2")
+                ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["SoldTo"]["Address"]["AddressLine2"])
+                AddressLine2.appendChild(ptext)
+                Address.appendChild(AddressLine2)
+    
+    
+                City = doc2.createElement("City")
+                ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["SoldTo"]["Address"]["City"])
+                City.appendChild(ptext)
+                Address.appendChild(City)
+    
+                StateProvinceCode = doc2.createElement("StateProvinceCode")
+                ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["SoldTo"]["Address"]["StateProvinceCode"])
+                StateProvinceCode.appendChild(ptext)
+                Address.appendChild(StateProvinceCode)
+    
+                PostalCode = doc2.createElement("PostalCode")
+                ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["SoldTo"]["Address"]["PostalCode"])
+                PostalCode.appendChild(ptext)
+                Address.appendChild(PostalCode)
+    
+                CountryCode = doc2.createElement("CountryCode")
+                ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["SoldTo"]["Address"]["CountryCode"])
+                CountryCode.appendChild(ptext)
+                Address.appendChild(CountryCode)
+
+#########################
+            PaymentInformation = doc2.createElement("PaymentInformation")
+            Shipment.appendChild(PaymentInformation)
+            Prepaid = doc2.createElement("Prepaid")
+            PaymentInformation.appendChild(Prepaid)
+
+            BillShipper = doc2.createElement("BillShipper")
+            Prepaid.appendChild(BillShipper)
+
+            AccountNumber = doc2.createElement("AccountNumber")
+            ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["PaymentInformation"]["Prepaid"]["BillShipper"]["AccountNumber"])
+            AccountNumber.appendChild(ptext)
+            BillShipper.appendChild(AccountNumber)
+
+    #        CreditCard = doc2.createElement("CreditCard")
+    #        BillShipper.appendChild(CreditCard)
+    #        Type = doc2.createElement("Type")
+    #        ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["PaymentInformation"]["Prepaid"]["BillShipper"]["CreditCard"]["Type"])
+    #        Type.appendChild(ptext)
+    #        CreditCard.appendChild(Type)
+    #
+    #        ExpirationDate = doc2.createElement("ExpirationDate")
+    #        ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["PaymentInformation"]["Prepaid"]["BillShipper"]["CreditCard"]["ExpirationDate"])
+    #        ExpirationDate.appendChild(ptext)
+    #        CreditCard.appendChild(ExpirationDate)
+    #
+    #        Number = doc2.createElement("Number")
+    #        ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["PaymentInformation"]["Prepaid"]["BillShipper"]["CreditCard"]["Number"])
+    #        Number.appendChild(ptext)
+    #        CreditCard.appendChild(Number)
+    #
+    #        SecurityCode = doc2.createElement("SecurityCode")
+    #        ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["PaymentInformation"]["Prepaid"]["BillShipper"]["CreditCard"]["SecurityCode"])
+    #        SecurityCode.appendChild(ptext)
+    #        CreditCard.appendChild(SecurityCode)
+    #
+    #
+    #        Address = doc2.createElement("Address")
+    #        CreditCard.appendChild(Address)
+    #        AddressLine1 = doc2.createElement("AddressLine1")
+    #        ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["PaymentInformation"]["Prepaid"]["BillShipper"]["CreditCard"]["Address"]["AddressLine1"])
+    #        AddressLine1.appendChild(ptext)
+    #        Address.appendChild(AddressLine1)
+    #
+    #        AddressLine2 = doc2.createElement("AddressLine2")
+    #        ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["PaymentInformation"]["Prepaid"]["BillShipper"]["CreditCard"]["Address"]["AddressLine2"])
+    #        AddressLine2.appendChild(ptext)
+    #        Address.appendChild(AddressLine2)
+    #
+    #        AddressLine3 = doc2.createElement("AddressLine3")
+    #        ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["PaymentInformation"]["Prepaid"]["BillShipper"]["CreditCard"]["Address"]["AddressLine3"])
+    #        AddressLine3.appendChild(ptext)
+    #        Address.appendChild(AddressLine3)
+    #
+    #
+    #        City = doc2.createElement("City")
+    #        ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["PaymentInformation"]["Prepaid"]["BillShipper"]["CreditCard"]["Address"]["City"])
+    #        City.appendChild(ptext)
+    #        Address.appendChild(City)
+    #
+    #        StateProvinceCode = doc2.createElement("StateProvinceCode")
+    #        ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["PaymentInformation"]["Prepaid"]["BillShipper"]["CreditCard"]["Address"]["StateProvinceCode"])
+    #        StateProvinceCode.appendChild(ptext)
+    #        Address.appendChild(StateProvinceCode)
+    #
+    #        PostalCode = doc2.createElement("PostalCode")
+    #        ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["PaymentInformation"]["Prepaid"]["BillShipper"]["CreditCard"]["Address"]["PostalCode"])
+    #        PostalCode.appendChild(ptext)
+    #        Address.appendChild(PostalCode)
+    #
+    #        CountryCode = doc2.createElement("CountryCode")
+    #        ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["PaymentInformation"]["Prepaid"]["BillShipper"]["CreditCard"]["Address"]["CountryCode"])
+    #        PostalCode.appendChild(ptext)
+    #        Address.appendChild(CountryCode)
+
+
+
+
+    #        BillThirdParty = doc2.createElement("BillThirdParty")
+    #        PaymentInformation.appendChild(BillThirdParty)
+    #        BillThirdPartyShipper = doc2.createElement("BillThirdPartyShipper")
+    #        BillThirdParty.appendChild(BillThirdPartyShipper)
+    #
+    #        AccountNumber = doc2.createElement("AccountNumber")
+    #        ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["PaymentInformation"]["BillThirdParty"]['BillThirdPartyShipper']['AccountNumber'])
+    #        AccountNumber.appendChild(ptext)
+    #        BillThirdPartyShipper.appendChild(AccountNumber)
+    #
+    #        ThirdParty = doc2.createElement("ThirdParty")
+    #        BillThirdPartyShipper.appendChild(ThirdParty)
+    #        Address = doc2.createElement("Address")
+    #        ThirdParty.appendChild(Address)
+    #
+    #        PostalCode = doc2.createElement("PostalCode")
+    #        ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["PaymentInformation"]["BillThirdParty"]['BillThirdPartyShipper']['ThirdParty']['Address']['PostalCode'])
+    #        PostalCode.appendChild(ptext)
+    #        Address.appendChild(PostalCode)
+    #
+    #        CountryCode = doc2.createElement("CountryCode")
+    #        ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["PaymentInformation"]["BillThirdParty"]['BillThirdPartyShipper']['ThirdParty']['Address']['CountryCode'])
+    #        CountryCode.appendChild(ptext)
+    #        Address.appendChild(CountryCode)
+
+
+
+    #        FreightCollect = doc2.createElement("FreightCollect")
+    #        PaymentInformation.appendChild(FreightCollect)
+    #        BillReceiver = doc2.createElement("BillReceiver")
+    #        FreightCollect.appendChild(BillReceiver)
+    #        AccountNumber = doc2.createElement("AccountNumber")
+    #        ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["PaymentInformation"]["FreightCollect"]["BillReceiver"]["AccountNumber"])
+    #        AccountNumber.appendChild(ptext)
+    #        BillReceiver.appendChild(AccountNumber)
+    #
+    #        Address = doc2.createElement("Address")
+    #        BillReceiver.appendChild(Address)
+    #        PostalCode = doc2.createElement("PostalCode")
+    #        ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["PaymentInformation"]["FreightCollect"]["BillReceiver"]["Address"]["PostalCode"])
+    #        AccountNumber.appendChild(ptext)
+    #        Address.appendChild(PostalCode)
+
+    #        ConsigneeBilled = doc2.createElement("ConsigneeBilled")
+    #        ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["PaymentInformation"]["ConsigneeBilled"])
+    #        ConsigneeBilled.appendChild(ptext)
+    #        PaymentInformation.appendChild(ConsigneeBilled)
+
+
+
+
+    #        ItemizedPaymentInformation = doc2.createElement("ItemizedPaymentInformation")
+    #        Shipment.appendChild(ItemizedPaymentInformation)
+    #        ShipmentCharge = doc2.createElement("ShipmentCharge")
+    #        ItemizedPaymentInformation.appendChild(ShipmentCharge)
+    #        Type = doc2.createElement("Type")
+    #        ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["ItemizedPaymentInformation"]["ShipmentCharge"]["Type"])
+    #        Type.appendChild(ptext)
+    #        ShipmentCharge.appendChild(Type)
+    #
+    #        BillShipper = doc2.createElement("BillShipper")
+    #        ShipmentCharge.appendChild(BillShipper)
+    #
+    #        AccountNumber = doc2.createElement("AccountNumber")
+    #        ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["ItemizedPaymentInformation"]["ShipmentCharge"]["BillShipper"]["AccountNumber"])
+    #        AccountNumber.appendChild(ptext)
+    #        BillShipper.appendChild(AccountNumber)
+    #
+    #        CreditCard = doc2.createElement("CreditCard")
+    #        BillShipper.appendChild(CreditCard)
+    #
+    #        Type = doc2.createElement("Type")
+    #        ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["ItemizedPaymentInformation"]["ShipmentCharge"]["BillShipper"]["CreditCard"]["Type"])
+    #        Type.appendChild(ptext)
+    #        CreditCard.appendChild(Type)
+    #
+    #        ExpirationDate = doc2.createElement("ExpirationDate")
+    #        ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["ItemizedPaymentInformation"]["ShipmentCharge"]["BillShipper"]["CreditCard"]["ExpirationDate"])
+    #        ExpirationDate.appendChild(ptext)
+    #        CreditCard.appendChild(ExpirationDate)
+    #
+    #        SecurityCode = doc2.createElement("SecurityCode")
+    #        ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["ItemizedPaymentInformation"]["ShipmentCharge"]["BillShipper"]["CreditCard"]["SecurityCode"])
+    #        SecurityCode.appendChild(ptext)
+    #        CreditCard.appendChild(SecurityCode)
+    #
+    #        Address = doc2.createElement("Address")
+    #        CreditCard.appendChild(Address)
+    #        AddressLine1 = doc2.createElement("AddressLine1")
+    #        ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["ItemizedPaymentInformation"]["ShipmentCharge"]["BillShipper"]['CreditCard']["Address"]["AddressLine1"])
+    #        AddressLine1.appendChild(ptext)
+    #        Address.appendChild(AddressLine1)
+    #
+    #        AddressLine2 = doc2.createElement("AddressLine2")
+    #        ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["ItemizedPaymentInformation"]["ShipmentCharge"]["BillShipper"]['CreditCard']["Address"]["AddressLine2"])
+    #        AddressLine2.appendChild(ptext)
+    #        Address.appendChild(AddressLine2)
+    #
+    #        AddressLine3 = doc2.createElement("AddressLine3")
+    #        ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["ItemizedPaymentInformation"]["ShipmentCharge"]["BillShipper"]['CreditCard']["Address"]["AddressLine3"])
+    #        AddressLine3.appendChild(ptext)
+    #        Address.appendChild(AddressLine3)
+    #
+    #        City = doc2.createElement("City")
+    #        ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["ItemizedPaymentInformation"]["ShipmentCharge"]["BillShipper"]['CreditCard']["Address"]["City"])
+    #        City.appendChild(ptext)
+    #        Address.appendChild(City)
+    #
+    #        StateProvinceCode = doc2.createElement("StateProvinceCode")
+    #        ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["ItemizedPaymentInformation"]["ShipmentCharge"]["BillShipper"]['CreditCard']["Address"]["StateProvinceCode"])
+    #        StateProvinceCode.appendChild(ptext)
+    #        Address.appendChild(StateProvinceCode)
+    #
+    #        PostalCode = doc2.createElement("PostalCode")
+    #        ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["ItemizedPaymentInformation"]["ShipmentCharge"]["BillShipper"]['CreditCard']["Address"]["PostalCode"])
+    #        PostalCode.appendChild(ptext)
+    #        Address.appendChild(PostalCode)
+    #
+    #        CountryCode = doc2.createElement("CountryCode")
+    #        ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["ItemizedPaymentInformation"]["ShipmentCharge"]["BillShipper"]['CreditCard']["Address"]["CountryCode"])
+    #        CountryCode.appendChild(ptext)
+    #        Address.appendChild(CountryCode)
+    #
+    #        BillReceiver = doc2.createElement("BillReceiver")
+    #        ShipmentCharge.appendChild(BillReceiver)
+    #
+    #        AccountNumber = doc2.createElement("AccountNumber")
+    #        ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["ItemizedPaymentInformation"]["ShipmentCharge"]["BillReceiver"]["AccountNumber"])
+    #        AccountNumber.appendChild(ptext)
+    #        BillReceiver.appendChild(AccountNumber)
+    #
+    #        Address = doc2.createElement("Address")
+    #        BillReceiver.appendChild(Address)
+    #        PostalCode = doc2.createElement("PostalCode")
+    #        ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["ItemizedPaymentInformation"]["ShipmentCharge"]["BillReceiver"]["Address"]["PostalCode"])
+    #        PostalCode.appendChild(ptext)
+    #        Address.appendChild(PostalCode)
+    #
+    #
+    #        BillThirdParty = doc2.createElement("BillThirdParty")
+    #        ShipmentCharge.appendChild(BillThirdParty)
+    #        BillThirdPartyShipper = doc2.createElement("BillThirdPartyShipper")
+    #        BillThirdParty.appendChild(BillThirdPartyShipper)
+    #
+    #        AccountNumber = doc2.createElement("AccountNumber")
+    #        ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["ItemizedPaymentInformation"]["ShipmentCharge"]["BillThirdParty"]["BillThirdPartyShipper"]["AccountNumber"])
+    #        AccountNumber.appendChild(ptext)
+    #        BillThirdPartyShipper.appendChild(AccountNumber)
+    #
+    #        ThirdParty = doc2.createElement("ThirdParty")
+    #        BillThirdPartyShipper.appendChild(ThirdParty)
+    #        Address = doc2.createElement("Address")
+    #        ThirdParty.appendChild(Address)
+    #        PostalCode = doc2.createElement("PostalCode")
+    #        ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["ItemizedPaymentInformation"]["ShipmentCharge"]["BillThirdParty"]["BillThirdPartyShipper"]["ThirdParty"]["Address"]["PostalCode"])
+    #        PostalCode.appendChild(ptext)
+    #        Address.appendChild(PostalCode)
+    #
+    #        CountryCode = doc2.createElement("CountryCode")
+    #        ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["ItemizedPaymentInformation"]["ShipmentCharge"]["BillThirdParty"]["BillThirdPartyShipper"]["ThirdParty"]["Address"]["CountryCode"])
+    #        CountryCode.appendChild(ptext)
+    #        Address.appendChild(CountryCode)
+    #
+    #
+    #        BillThirdPartyConsignee = doc2.createElement("BillThirdPartyConsignee")
+    #        BillThirdParty.appendChild(BillThirdPartyConsignee)
+    #
+    #        AccountNumber = doc2.createElement("AccountNumber")
+    #        ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["ItemizedPaymentInformation"]["ShipmentCharge"]["BillThirdParty"]["BillThirdPartyConsignee"]["AccountNumber"])
+    #        AccountNumber.appendChild(ptext)
+    #        BillThirdPartyConsignee.appendChild(AccountNumber)
+    #
+    #        ThirdParty = doc2.createElement("ThirdParty")
+    #        BillThirdPartyConsignee.appendChild(ThirdParty)
+    #        Address = doc2.createElement("Address")
+    #        ThirdParty.appendChild(Address)
+    #        PostalCode = doc2.createElement("PostalCode")
+    #        ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["ItemizedPaymentInformation"]["ShipmentCharge"]["BillThirdParty"]["BillThirdPartyConsignee"]["ThirdParty"]["Address"]["PostalCode"])
+    #        PostalCode.appendChild(ptext)
+    #        Address.appendChild(PostalCode)
+    #
+    #        CountryCode = doc2.createElement("CountryCode")
+    #        ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["ItemizedPaymentInformation"]["ShipmentCharge"]["BillThirdParty"]["BillThirdPartyConsignee"]["ThirdParty"]["Address"]["CountryCode"])
+    #        CountryCode.appendChild(ptext)
+    #        Address.appendChild(CountryCode)
+    #
+    #        ConsigneeBilled = doc2.createElement("ConsigneeBilled")
+    #        ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["ItemizedPaymentInformation"]["ShipmentCharge"]["ConsigneeBilled"])
+    #        ConsigneeBilled.appendChild(ptext)
+    #        ShipmentCharge.appendChild(ConsigneeBilled)
+    #
+    #        SplitDutyVATIndicator = doc2.createElement("SplitDutyVATIndicator")
+    #        ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["ItemizedPaymentInformation"]["SplitDutyVATIndicator"])
+    #        SplitDutyVATIndicator.appendChild(ptext)
+    #        ItemizedPaymentInformation.appendChild(SplitDutyVATIndicator)
+
+            GoodsNotInFreeCirculationIndicator = doc2.createElement("GoodsNotInFreeCirculationIndicator")
+    #        ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["GoodsNotInFreeCirculationIndicator"])
+    #        GoodsNotInFreeCirculationIndicator.appendChild(ptext)
+            Shipment.appendChild(GoodsNotInFreeCirculationIndicator)
+
+            RateInformation = doc2.createElement("RateInformation")
+            Shipment.appendChild(RateInformation)
+            NegotiatedRatesIndicator = doc2.createElement("NegotiatedRatesIndicator")
+    #        ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["RateInformation"]["NegotiatedRatesIndicator"])
+    #        NegotiatedRatesIndicator.appendChild(ptext)
+            RateInformation.appendChild(NegotiatedRatesIndicator)
+
+    #        MovementReferenceNumber = doc2.createElement("MovementReferenceNumber")
+    #        ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["MovementReferenceNumber"])
+    #        MovementReferenceNumber.appendChild(ptext)
+    #        Shipment.appendChild(MovementReferenceNumber)
+
+    #        ReferenceNumber = doc2.createElement("ReferenceNumber")
+    #        Shipment.appendChild(ReferenceNumber)
+    #        BarCodeIndicator = doc2.createElement("BarCodeIndicator")
+    #        ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["ReferenceNumber"]["BarCodeIndicator"])
+    #        BarCodeIndicator.appendChild(ptext)
+    #        ReferenceNumber.appendChild(BarCodeIndicator)
+    #
+    #        Code = doc2.createElement("Code")
+    #        ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["ReferenceNumber"]["Code"])
+    #        Code.appendChild(ptext)
+    #        ReferenceNumber.appendChild(Code)
+    #
+    #        Value = doc2.createElement("Value")
+    #        ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["ReferenceNumber"]["Value"])
+    #        Value.appendChild(ptext)
+    #        ReferenceNumber.appendChild(Value)
+
+            Service = doc2.createElement("Service")
+            Shipment.appendChild(Service)
+            Code = doc2.createElement("Code")
+            ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["Service"]["Code"])
+            Code.appendChild(ptext)
+            Service.appendChild(Code)
+            Description = doc2.createElement("Description")
+            ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["Service"]["Description"])
+            Description.appendChild(ptext)
+            Service.appendChild(Description)
+
+            if (package_obj.pick_id.ship_from and package_obj.pick_id.ship_from_address.id and package_obj.pick_id.ship_from_address.country_id.code == 'US' or package_obj.pick_id.shipper.id and package_obj.pick_id.shipper.address.id and package_obj.pick_id.shipper.address.country_id.id and package_obj.pick_id.shipper.address.country_id.code == 'US') and  package_obj.pick_id.address_id.id and package_obj.pick_id.address_id.country_id.code in ('PR','CA'):
+                InvoiceLineTotal = doc2.createElement("InvoiceLineTotal")
+                Shipment.appendChild(InvoiceLineTotal)
+
+    #            CurrencyCode = doc2.createElement("CurrencyCode")
+    #            ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["InvoiceLineTotal"]["CurrencyCode"])
+    #            CurrencyCode.appendChild(ptext)
+    #            InvoiceLineTotal.appendChild(CurrencyCode)
+
+                MonetaryValue = doc2.createElement("MonetaryValue")
+                ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["InvoiceLineTotal"]["MonetaryValue"])
+                MonetaryValue.appendChild(ptext)
+                InvoiceLineTotal.appendChild(MonetaryValue)
+
+
+            ShipmentServiceOptions = doc2.createElement("ShipmentServiceOptions")
+            Shipment.appendChild(ShipmentServiceOptions)
+            if package_obj.pick_id.sat_delivery:
+                SaturdayDelivery = doc2.createElement("SaturdayDelivery")
+        #        ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["ShipmentServiceOptions"]["SaturdayDelivery"])
+        #        SaturdayDelivery.appendChild(ptext)
+                ShipmentServiceOptions.appendChild(SaturdayDelivery)
+    #        COD = doc2.createElement("COD")
+    #        ShipmentServiceOptions.appendChild(COD)
+    #        CODCode = doc2.createElement("CODCode")
+    #        ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["ShipmentServiceOptions"]["COD"]["CODCode"])
+    #        CODCode.appendChild(ptext)
+    #        COD.appendChild(CODCode)
+    #
+    #        CODFundsCode = doc2.createElement("CODFundsCode")
+    #        ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["ShipmentServiceOptions"]["COD"]["CODFundsCode"])
+    #        CODFundsCode.appendChild(ptext)
+    #        COD.appendChild(CODFundsCode)
+    #
+    #        CODAmount = doc2.createElement("CODAmount")
+    #        COD.appendChild(CODAmount)
+    #        CurrencyCode = doc2.createElement("CurrencyCode")
+    #        ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["ShipmentServiceOptions"]["COD"]["CODAmount"]["CurrencyCode"])
+    #        CurrencyCode.appendChild(ptext)
+    #        CODAmount.appendChild(CurrencyCode)
+    #
+    #        MonetaryValue = doc2.createElement("MonetaryValue")
+    #        ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["ShipmentServiceOptions"]["COD"]["CODAmount"]["MonetaryValue"])
+    #        MonetaryValue.appendChild(ptext)
+    #        CODAmount.appendChild(MonetaryValue)
+
+            Notification_count = len(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["ShipmentServiceOptions"]["Notification"])
+            for i in range (0,Notification_count):
+                Notification = doc2.createElement("Notification")
+                ShipmentServiceOptions.appendChild(Notification)
+                NotificationCode = doc2.createElement("NotificationCode")
+                ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["ShipmentServiceOptions"]["Notification"][i]["NotificationCode"])
+                NotificationCode.appendChild(ptext)
+                Notification.appendChild(NotificationCode)
+                EMailMessage = doc2.createElement("EMailMessage")
+                Notification.appendChild(EMailMessage)
+                UndeliverableEMailAddress = doc2.createElement("UndeliverableEMailAddress")
+                ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["ShipmentServiceOptions"]["Notification"][i]["EMailMessage"]["UndeliverableEMailAddress"])
+                UndeliverableEMailAddress.appendChild(ptext)
+                EMailMessage.appendChild(UndeliverableEMailAddress)
+
+                EMailAddress = doc2.createElement("EMailAddress")
+                ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["ShipmentServiceOptions"]["Notification"][i]["EMailMessage"]["EMailAddress"])
+                EMailAddress.appendChild(ptext)
+                EMailMessage.appendChild(EMailAddress)
+
+                FromEMailAddress = doc2.createElement("FromEMailAddress")
+                ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["ShipmentServiceOptions"]["Notification"][i]["EMailMessage"]["FromEMailAddress"])
+                FromEMailAddress.appendChild(ptext)
+                EMailMessage.appendChild(FromEMailAddress)
+
+                FromName = doc2.createElement("FromName")
+                ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["ShipmentServiceOptions"]["Notification"][i]["EMailMessage"]["FromName"])
+                FromName.appendChild(ptext)
+                EMailMessage.appendChild(FromName)
+
+                Memo = doc2.createElement("Memo")
+                ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["ShipmentServiceOptions"]["Notification"][i]["EMailMessage"]["Memo"])
+                Memo.appendChild(ptext)
+                EMailMessage.appendChild(Memo)
+
+                Subject = doc2.createElement("Subject")
+                ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["ShipmentServiceOptions"]["Notification"][i]["EMailMessage"]["Subject"])
+                Subject.appendChild(ptext)
+                EMailMessage.appendChild(Subject)
+
+                SubjectCode = doc2.createElement("SubjectCode")
+                ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["ShipmentServiceOptions"]["Notification"][i]["EMailMessage"]["SubjectCode"])
+                SubjectCode.appendChild(ptext)
+                EMailMessage.appendChild(SubjectCode)
+            ##//////////////////////end for loop in code
+            if package_obj.pick_id.with_ret_service:
+                LabelDelivery = doc2.createElement("LabelDelivery")
+                ShipmentServiceOptions.appendChild(LabelDelivery)
+                LabelLinkIndicator = doc2.createElement("LabelLinkIndicator")
+        #        ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["ShipmentServiceOptions"]["LabelDelivery"]["LabelLinkIndicator"])
+        #        LabelLinkIndicator.appendChild(ptext)
+                LabelDelivery.appendChild(LabelLinkIndicator)
+    #        EMailMessage = doc2.createElement("EMailMessage")
+    #        LabelDelivery.appendChild(EMailMessage)
+    #        UndeliverableEMailAddress = doc2.createElement("UndeliverableEMailAddress")
+    #        ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["ShipmentServiceOptions"]["LabelDelivery"]["EMailMessage"]["UndeliverableEMailAddress"])
+    #        UndeliverableEMailAddress.appendChild(ptext)
+    #        EMailMessage.appendChild(UndeliverableEMailAddress)
+    #
+    #
+    #        EMailAddress = doc2.createElement("EMailAddress")
+    #        ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["ShipmentServiceOptions"]["LabelDelivery"]["EMailMessage"]["EMailAddress"])
+    #        EMailAddress.appendChild(ptext)
+    #        EMailMessage.appendChild(EMailAddress)
+    #
+    #        FromEMailAddress = doc2.createElement("FromEMailAddress")
+    #        ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["ShipmentServiceOptions"]["LabelDelivery"]["EMailMessage"]["FromEMailAddress"])
+    #        FromEMailAddress.appendChild(ptext)
+    #        EMailMessage.appendChild(FromEMailAddress)
+    #
+    #        FromName = doc2.createElement("FromName")
+    #        ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["ShipmentServiceOptions"]["LabelDelivery"]["EMailMessage"]["FromName"])
+    #        FromName.appendChild(ptext)
+    #        EMailMessage.appendChild(FromName)
+    #
+    #        Memo = doc2.createElement("Memo")
+    #        ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["ShipmentServiceOptions"]["LabelDelivery"]["EMailMessage"]["Memo"])
+    #        Memo.appendChild(ptext)
+    #        EMailMessage.appendChild(Memo)
+    #
+    #        Subject = doc2.createElement("Subject")
+    #        ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["ShipmentServiceOptions"]["LabelDelivery"]["EMailMessage"]["Subject"])
+    #        Subject.appendChild(ptext)
+    #        EMailMessage.appendChild(Subject)
+    #
+    #        SubjectCode = doc2.createElement("SubjectCode")
+    #        ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["ShipmentServiceOptions"]["LabelDelivery"]["EMailMessage"]["SubjectCode"])
+    #        SubjectCode.appendChild(ptext)
+    #        EMailMessage.appendChild(SubjectCode)
+
+            
+            
+            if comm_inv or cer_orig or nafta_cer_orig or sed:
+                InternationalForms = doc2.createElement("InternationalForms")
+                ShipmentServiceOptions.appendChild(InternationalForms)
+                
+#            if cer_orig or nafta_cer_orig or sed:
+#                AdditionalDocumentIndicator = doc2.createElement("AdditionalDocumentIndicator")
+#                InternationalForms.appendChild(AdditionalDocumentIndicator)
+                
+            if comm_inv:
+                FormType = doc2.createElement("FormType")
+                ptext = doc1.createTextNode(comm_inv['FormType'])
+                FormType.appendChild(ptext)
+                InternationalForms.appendChild(FormType)
+            if cer_orig:
+                FormType = doc2.createElement("FormType")
+                ptext = doc1.createTextNode(cer_orig['FormType'])
+                FormType.appendChild(ptext)
+                InternationalForms.appendChild(FormType)
+            if nafta_cer_orig:
+                FormType = doc2.createElement("FormType")
+                ptext = doc1.createTextNode(nafta_cer_orig['FormType'])
+                FormType.appendChild(ptext)
+                InternationalForms.appendChild(FormType)
+#            if sed:
+#                FormType = doc2.createElement("FormType")
+#                ptext = doc1.createTextNode(sed['FormType'])
+#                FormType.appendChild(ptext)
+#                InternationalForms.appendChild(FormType)
+#                
+#                SEDFilingOption = doc2.createElement("SEDFilingOption")
+#                ptext = doc1.createTextNode(sed['SEDFilingOption'])
+#                SEDFilingOption.appendChild(ptext)
+#                InternationalForms.appendChild(SEDFilingOption)
+                
+            if sed or nafta_cer_orig:
+                Contacts = doc2.createElement("Contacts")
+                InternationalForms.appendChild(Contacts)
+#                if sed.get("ForwardAgent",False):
+#                    ForwardAgent = doc2.createElement("ForwardAgent")
+#                    Contacts.appendChild(ForwardAgent)
+#                    
+#                    CompanyName = doc2.createElement("CompanyName")
+#                    ptext = doc1.createTextNode(sed['Contacts']['ForwardAgent']['CompanyName'])
+#                    CompanyName.appendChild(ptext)
+#                    ForwardAgent.appendChild(CompanyName)
+#                    
+#                    TaxIdentificationNumber = doc2.createElement("TaxIdentificationNumber")
+#                    ptext = doc1.createTextNode(sed['Contacts']['ForwardAgent']["TaxIdentificationNumber"])
+#                    TaxIdentificationNumber.appendChild(ptext)
+#                    ForwardAgent.appendChild(TaxIdentificationNumber)
+#                    
+#                    Address = doc2.createElement("Address")
+#                    ForwardAgent.appendChild(Address)
+#                    
+#                    AddressLine1 = doc2.createElement("AddressLine1")
+#                    ptext = doc1.createTextNode(sed['Contacts']['ForwardAgent']['Address']['AddressLine1'])
+#                    AddressLine1.appendChild(ptext)
+#                    Address.appendChild(AddressLine1)
+#                    
+#                    AddressLine2 = doc2.createElement("AddressLine2")
+#                    ptext = doc1.createTextNode(sed['Contacts']['ForwardAgent']['Address']['AddressLine2'])
+#                    AddressLine2.appendChild(ptext)
+#                    Address.appendChild(AddressLine2)
+#                    
+#                    City = doc2.createElement("City")
+#                    ptext = doc1.createTextNode(sed['Contacts']['ForwardAgent']['Address']['City'])
+#                    City.appendChild(ptext)
+#                    Address.appendChild(City)
+#                    
+#                    StateProvinceCode = doc2.createElement("StateProvinceCode")
+#                    ptext = doc1.createTextNode(sed['Contacts']['ForwardAgent']['Address']['StateProvinceCode'])
+#                    StateProvinceCode.appendChild(ptext)
+#                    Address.appendChild(StateProvinceCode)
+#                    
+#                    PostalCode = doc2.createElement("PostalCode")
+#                    ptext = doc1.createTextNode(sed['Contacts']['ForwardAgent']['Address']['PostalCode'])
+#                    PostalCode.appendChild(ptext)
+#                    Address.appendChild(PostalCode)
+#                    
+#                    CountryCode = doc2.createElement("CountryCode")
+#                    ptext = doc1.createTextNode(sed['Contacts']['ForwardAgent']['Address']['CountryCode'])
+#                    CountryCode.appendChild(ptext)
+#                    Address.appendChild(CountryCode)
+#                if sed.get("UltimateConsignee",False):
+#                    
+#                    UltimateConsignee = doc2.createElement("UltimateConsignee")
+#                    Contacts.appendChild(UltimateConsignee)
+#            
+#                    CompanyName = doc2.createElement("CompanyName")
+#                    ptext = doc1.createTextNode(sed["Contacts"]['UltimateConsignee']['CompanyName'])
+#                    CompanyName.appendChild(ptext)
+#                    UltimateConsignee.appendChild(CompanyName)
+#    
+#                    Address = doc2.createElement("Address")
+#                    UltimateConsignee.appendChild(Address)
+#            
+#                    AddressLine1 = doc2.createElement("AddressLine1")
+#                    ptext = doc1.createTextNode(sed["Contacts"]['UltimateConsignee']['Address']['AddressLine1'])
+#                    AddressLine1.appendChild(ptext)
+#                    Address.appendChild(AddressLine1)
+#            
+#                    AddressLine2 = doc2.createElement("AddressLine2")
+#                    ptext = doc1.createTextNode(sed["Contacts"]['UltimateConsignee']['Address']['AddressLine2'])
+#                    AddressLine2.appendChild(ptext)
+#                    Address.appendChild(AddressLine2)
+#
+#                    City = doc2.createElement("City")
+#                    ptext = doc1.createTextNode(sed["Contacts"]['UltimateConsignee']['Address']['City'])
+#                    City.appendChild(ptext)
+#                    Address.appendChild(City)
+#            
+#                    StateProvinceCode = doc2.createElement("StateProvinceCode")
+#                    ptext = doc1.createTextNode(sed["Contacts"]['UltimateConsignee']['Address']['StateProvinceCode'])
+#                    StateProvinceCode.appendChild(ptext)
+#                    Address.appendChild(StateProvinceCode)
+#            
+#                    PostalCode = doc2.createElement("PostalCode")
+#                    ptext = doc1.createTextNode(sed["Contacts"]['UltimateConsignee']['Address']['PostalCode'])
+#                    PostalCode.appendChild(ptext)
+#                    Address.appendChild(PostalCode)
+#            
+#                    CountryCode = doc2.createElement("CountryCode")
+#                    ptext = doc1.createTextNode(sed["Contacts"]['UltimateConsignee']['Address']['CountryCode'])
+#                    CountryCode.appendChild(ptext)
+#                    Address.appendChild(CountryCode)
+#                    
+#                if sed.get("IntermediateConsignee",False):
+#                    IntermediateConsignee = doc2.createElement("IntermediateConsignee")
+#                    Contacts.appendChild(IntermediateConsignee)
+#            
+#            
+#            
+#                    CompanyName = doc2.createElement("CompanyName")
+#                    ptext = doc1.createTextNode(sed["Contacts"]['IntermediateConsignee']['CompanyName'])
+#                    CompanyName.appendChild(ptext)
+#                    IntermediateConsignee.appendChild(CompanyName)
+#            
+#            
+#            
+#                    Address = doc2.createElement("Address")
+#                    IntermediateConsignee.appendChild(Address)
+#            
+#                    AddressLine1 = doc2.createElement("AddressLine1")
+#                    ptext = doc1.createTextNode(sed["Contacts"]['IntermediateConsignee']['Address']['AddressLine1'])
+#                    AddressLine1.appendChild(ptext)
+#                    Address.appendChild(AddressLine1)
+#            
+#                    AddressLine2 = doc2.createElement("AddressLine2")
+#                    ptext = doc1.createTextNode(sed["Contacts"]['IntermediateConsignee']['Address']['AddressLine2'])
+#                    AddressLine2.appendChild(ptext)
+#                    Address.appendChild(AddressLine2)
+#
+#                    City = doc2.createElement("City")
+#                    ptext = doc1.createTextNode(sed["Contacts"]['IntermediateConsignee']['Address']['City'])
+#                    City.appendChild(ptext)
+#                    Address.appendChild(City)
+#            
+#                    StateProvinceCode = doc2.createElement("StateProvinceCode")
+#                    ptext = doc1.createTextNode(sed["Contacts"]['IntermediateConsignee']['Address']['StateProvinceCode'])
+#                    StateProvinceCode.appendChild(ptext)
+#                    Address.appendChild(StateProvinceCode)
+#            
+#                    PostalCode = doc2.createElement("PostalCode")
+#                    ptext = doc1.createTextNode(sed["Contacts"]['IntermediateConsignee']['Address']['PostalCode'])
+#                    PostalCode.appendChild(ptext)
+#                    Address.appendChild(PostalCode)
+#            
+#                    CountryCode = doc2.createElement("CountryCode")
+#                    ptext = doc1.createTextNode(sed["Contacts"]['IntermediateConsignee']['Address']['CountryCode'])
+#                    CountryCode.appendChild(ptext)
+#                    Address.appendChild(CountryCode)
+                if nafta_cer_orig and nafta_cer_orig["Contacts"].get("Producer"):
+                    Producer = doc2.createElement("Producer")
+                    Contacts.appendChild(Producer)
+                    if nafta_cer_orig["Contacts"]['Producer'].get('Option') != ' ':
+                        Option = doc2.createElement("Option")
+                        ptext = doc1.createTextNode(nafta_cer_orig["Contacts"]['Producer']['Option'])
+                        Option.appendChild(ptext)
+                        Producer.appendChild(Option)
+                    else:
+                        CompanyName = doc2.createElement("CompanyName")
+                        ptext = doc1.createTextNode(nafta_cer_orig["Contacts"]['Producer']['CompanyName'])
+                        CompanyName.appendChild(ptext)
+                        Producer.appendChild(CompanyName)
+                
+                        TaxIdentificationNumber = doc2.createElement("TaxIdentificationNumber")
+                        ptext = doc1.createTextNode(nafta_cer_orig["Contacts"]['Producer']['TaxIdentificationNumber'])
+                        TaxIdentificationNumber.appendChild(ptext)
+                        Producer.appendChild(TaxIdentificationNumber)
+                
+                        Address = doc2.createElement("Address")
+                        Producer.appendChild(Address)
+                
+                        AddressLine1 = doc2.createElement("AddressLine1")
+                        ptext = doc1.createTextNode(nafta_cer_orig["Contacts"]['Producer']['Address']['AddressLine1'])
+                        AddressLine1.appendChild(ptext)
+                        Address.appendChild(AddressLine1)
+                
+                        AddressLine2 = doc2.createElement("AddressLine2")
+                        ptext = doc1.createTextNode(nafta_cer_orig["Contacts"]['Producer']['Address']['AddressLine2'])
+                        AddressLine2.appendChild(ptext)
+                        Address.appendChild(AddressLine2)
+                
+                        City = doc2.createElement("City")
+                        ptext = doc1.createTextNode(nafta_cer_orig["Contacts"]['Producer']['Address']['City'])
+                        City.appendChild(ptext)
+                        Address.appendChild(City)
+                
+                        StateProvinceCode = doc2.createElement("StateProvinceCode")
+                        ptext = doc1.createTextNode(nafta_cer_orig["Contacts"]['Producer']['Address']['StateProvinceCode'])
+                        StateProvinceCode.appendChild(ptext)
+                        Address.appendChild(StateProvinceCode)
+                
+                        PostalCode = doc2.createElement("PostalCode")
+                        ptext = doc1.createTextNode(nafta_cer_orig["Contacts"]['Producer']['Address']['PostalCode'])
+                        PostalCode.appendChild(ptext)
+                        Address.appendChild(PostalCode)
+                
+                        CountryCode = doc2.createElement("CountryCode")
+                        ptext = doc1.createTextNode(nafta_cer_orig["Contacts"]['Producer']['Address']['CountryCode'])
+                        CountryCode.appendChild(ptext)
+                        Address.appendChild(CountryCode)
+            
+            Product_count = len(prod) > 50 and 50 or len(prod)
+            if comm_inv or cer_orig or nafta_cer_orig or sed:
+                for i in range (0,Product_count):
+                    #///////////
+                    #########code for product dictionary
+                    #///////////
+        
+                    Product = doc2.createElement("Product")
+                    InternationalForms.appendChild(Product)
+        
+                    Description = doc2.createElement("Description")
+                    ptext = doc1.createTextNode(prod[i]['Description'])
+                    Description.appendChild(ptext)
+                    Product.appendChild(Description)
+                    if comm_inv:
+                        Unit = doc2.createElement("Unit")
+                        Product.appendChild(Unit)
+                        Number = doc2.createElement("Number")
+                        ptext = doc1.createTextNode(prod[i]['Unit']['Number'])
+                        Number.appendChild(ptext)
+                        Unit.appendChild(Number)
+            
+                        Value = doc2.createElement("Value")
+                        ptext = doc1.createTextNode(prod[i]['Unit']['Value'])
+                        Value.appendChild(ptext)
+                        Unit.appendChild(Value)
+        
+                        UnitOfMeasurement = doc2.createElement("UnitOfMeasurement")
+                        Unit.appendChild(UnitOfMeasurement)
+                        Code = doc2.createElement("Code")
+                        ptext = doc1.createTextNode(prod[i]['Unit']['UnitOfMeasurement']['Code'])
+                        Code.appendChild(ptext)
+                        UnitOfMeasurement.appendChild(Code)
+        
+                        Description = doc2.createElement("Description")
+                        ptext = doc1.createTextNode(prod[i]['Unit']['UnitOfMeasurement']['Description'])
+                        Description.appendChild(ptext)
+                        UnitOfMeasurement.appendChild(Description)
+                    if nafta_cer_orig or comm_inv:
+                        CommodityCode = doc2.createElement("CommodityCode")
+                        ptext = doc1.createTextNode(prod[i]['CommodityCode'])
+                        CommodityCode.appendChild(ptext)
+                        Product.appendChild(CommodityCode)
+#                    if comm_inv:
+#                        PartNumber = doc2.createElement("PartNumber")
+#                        ptext = doc1.createTextNode(prod[i]['PartNumber'])
+#                        CommodityCode.appendChild(ptext)
+#                        Product.appendChild(PartNumber)
+                    if nafta_cer_orig or comm_inv or cer_orig:
+                        OriginCountryCode = doc2.createElement("OriginCountryCode")
+                        ptext = doc1.createTextNode(prod[i]['OriginCountryCode'])
+                        OriginCountryCode.appendChild(ptext)
+                        Product.appendChild(OriginCountryCode)
+                    if nafta_cer_orig:
+#                        JointProductionIndicator = doc2.createElement("JointProductionIndicator")
+#                        ptext = doc1.createTextNode(prod[i]['JointProductionIndicator'])
+#                        JointProductionIndicator.appendChild(ptext)
+#                        Product.appendChild(JointProductionIndicator)
+            
+                        NetCostCode = doc2.createElement("NetCostCode")
+                        ptext = doc1.createTextNode(prod[i]['NetCostCode'])
+                        NetCostCode.appendChild(ptext)
+                        Product.appendChild(NetCostCode)
+            
+#                        NetCostDateRange = doc2.createElement("NetCostDateRange")
+#                        Product.appendChild(NetCostDateRange)
+#                        BeginDate = doc2.createElement("BeginDate")
+#                        ptext = doc1.createTextNode(prod[i]['NetCostDateRange']['BeginDate'])
+#                        BeginDate.appendChild(ptext)
+#                        NetCostDateRange.appendChild(BeginDate)
+#            
+#                        EndDate = doc2.createElement("EndDate")
+#                        ptext = doc1.createTextNode(prod[i]['NetCostDateRange']['EndDate'])
+#                        EndDate.appendChild(ptext)
+#                        NetCostDateRange.appendChild(EndDate)
+            
+                        PreferenceCriteria = doc2.createElement("PreferenceCriteria")
+                        ptext = doc1.createTextNode(prod[i]['PreferenceCriteria'])
+                        PreferenceCriteria.appendChild(ptext)
+                        Product.appendChild(PreferenceCriteria)
+
+                        
+                        ProducerInfo = doc2.createElement("ProducerInfo")
+                        ptext = doc1.createTextNode(prod[i]['ProducerInfo'])
+                        ProducerInfo.appendChild(ptext)
+                        Product.appendChild(ProducerInfo)
+                    if cer_orig:
+#                        MarksAndNumbers = doc2.createElement("MarksAndNumbers")
+#                        ptext = doc1.createTextNode(prod[i]['MarksAndNumbers'])
+#                        MarksAndNumbers.appendChild(ptext)
+#                        Product.appendChild(MarksAndNumbers)
+        
+                        NumberOfPackagesPerCommodity = doc2.createElement("NumberOfPackagesPerCommodity")
+                        ptext = doc1.createTextNode(prod[i]['NumberOfPackagesPerCommodity'])
+                        NumberOfPackagesPerCommodity.appendChild(ptext)
+                        Product.appendChild(NumberOfPackagesPerCommodity)
+        
+        
+                        ProductWeight = doc2.createElement("ProductWeight")
+                        Product.appendChild(ProductWeight)
+                        UnitOfMeasurement = doc2.createElement("UnitOfMeasurement")
+                        ProductWeight.appendChild(UnitOfMeasurement)
+                        Code = doc2.createElement("Code")
+                        ptext = doc1.createTextNode(prod[i]['ProductWeight']['UnitOfMeasurement']['Code'])
+                        Code.appendChild(ptext)
+                        UnitOfMeasurement.appendChild(Code)
+            
+                        Description = doc2.createElement("Description")
+                        ptext = doc1.createTextNode(prod[i]['ProductWeight']['UnitOfMeasurement']['Description'])
+                        Description.appendChild(ptext)
+                        UnitOfMeasurement.appendChild(Description)
+            
+                        Weight = doc2.createElement("Weight")
+                        ptext = doc1.createTextNode(prod[i]['ProductWeight']['Weight'])
+                        Weight.appendChild(ptext)
+                        ProductWeight.appendChild(Weight)
+#                    if sed:
+#                        VehicleID = doc2.createElement("VehicleID")
+#                        ptext = doc1.createTextNode(prod[i]['VehicleID'])
+#                        VehicleID.appendChild(ptext)
+#                        Product.appendChild(VehicleID)
+#            
+#                        ScheduleB = doc2.createElement("ScheduleB")
+#                        Product.appendChild(ScheduleB)
+#                        Number = doc2.createElement("Number")
+#                        ptext = doc1.createTextNode(prod[i]['ScheduleB']['Number'])
+#                        Number.appendChild(ptext)
+#                        ScheduleB.appendChild(Number)
+#        
+#                        Quantity = doc2.createElement("Quantity")
+#                        ptext = doc1.createTextNode(prod[i]['ScheduleB']['Quantity'])
+#                        Quantity.appendChild(ptext)
+#                        ScheduleB.appendChild(Quantity)
+#            
+#                        UnitOfMeasurement = doc2.createElement("UnitOfMeasurement")
+#                        ScheduleB.appendChild(UnitOfMeasurement)
+#                        Code = doc2.createElement("Code")
+#                        ptext = doc1.createTextNode(prod[i]['ScheduleB']['UnitOfMeasurement']['Code'])
+#                        Code.appendChild(ptext)
+#                        UnitOfMeasurement.appendChild(Code)
+#            
+#                        Description = doc2.createElement("Description")
+#                        ptext = doc1.createTextNode(prod[i]['ScheduleB']['UnitOfMeasurement']['Description'])
+#                        Description.appendChild(ptext)
+#                        UnitOfMeasurement.appendChild(Description)
+#        
+#                        ExportType = doc2.createElement("ExportType")
+#                        ptext = doc1.createTextNode(prod[i]['ExportType'])
+#                        Description.appendChild(ptext)
+#                        Product.appendChild(ExportType)
+#            
+#                        SEDTotalValue = doc2.createElement("SEDTotalValue")
+#                        ptext = doc1.createTextNode(prod[i]['SEDTotalValue'])
+#                        SEDTotalValue.appendChild(ptext)
+#                        Product.appendChild(SEDTotalValue)
+#        
+        
+                #/////////end loop in code
+        
+        
+                if comm_inv:
+#                    InvoiceNumber = doc2.createElement("InvoiceNumber")
+#                    ptext = doc1.createTextNode(comm_inv["InvoiceNumber"])
+#                    InvoiceNumber.appendChild(ptext)
+#                    InternationalForms.appendChild(InvoiceNumber)
+                    if comm_inv.get("InvoiceDate"):
+                        InvoiceDate = doc2.createElement("InvoiceDate")
+                        ptext = doc1.createTextNode(comm_inv["InvoiceDate"])
+                        InvoiceDate.appendChild(ptext)
+                        InternationalForms.appendChild(InvoiceDate)
+        
+#                    PurchaseOrderNumber = doc2.createElement("PurchaseOrderNumber")
+#                    ptext = doc1.createTextNode(comm_inv["PurchaseOrderNumber"])
+#                    InvoiceNumber.appendChild(ptext)
+#                    InternationalForms.appendChild(PurchaseOrderNumber)
+#        
+#                    TermsOfShipment = doc2.createElement("TermsOfShipment")
+#                    ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["ShipmentServiceOptions"]["InternationalForms"]["TermsOfShipment"])
+#                    TermsOfShipment.appendChild(ptext)
+#                    InternationalForms.appendChild(TermsOfShipment)
+        
+                    ReasonForExport = doc2.createElement("ReasonForExport")
+                    ptext = doc1.createTextNode(comm_inv["ReasonForExport"])
+                    ReasonForExport.appendChild(ptext)
+                    InternationalForms.appendChild(ReasonForExport)
+            
+#                    Comments = doc2.createElement("Comments")
+#                    ptext = doc1.createTextNode(comm_inv["Comments"])
+#                    Comments.appendChild(ptext)
+#                    InternationalForms.appendChild(Comments)
+            
+                    DeclarationStatement = doc2.createElement("DeclarationStatement")
+                    ptext = doc1.createTextNode(comm_inv["DeclarationStatement"])
+                    DeclarationStatement.appendChild(ptext)
+                    InternationalForms.appendChild(DeclarationStatement)
+        
+#                    Discount = doc2.createElement("Discount")
+#                    InternationalForms.appendChild(Discount)
+#            
+#                    MonetaryValue = doc2.createElement("MonetaryValue")
+#                    ptext = doc1.createTextNode(comm_inv['Discount']["MonetaryValue"])
+#                    MonetaryValue.appendChild(ptext)
+#                    Discount.appendChild(MonetaryValue)
+#            
+#                    FreightCharges = doc2.createElement("FreightCharges")
+#                    InternationalForms.appendChild(FreightCharges)
+#                    MonetaryValue = doc2.createElement("MonetaryValue")
+#                    ptext = doc1.createTextNode(comm_inv['FreightCharges']["MonetaryValue"])
+#                    MonetaryValue.appendChild(ptext)
+#                    FreightCharges.appendChild(MonetaryValue)
+#            
+#                    InsuranceCharges = doc2.createElement("InsuranceCharges")
+#                    InternationalForms.appendChild(InsuranceCharges)
+#                    MonetaryValue = doc2.createElement("MonetaryValue")
+#                    ptext = doc1.createTextNode(comm_inv['InsuranceCharges']["MonetaryValue"])
+#                    MonetaryValue.appendChild(ptext)
+#                    InsuranceCharges.appendChild(MonetaryValue)
+#            
+#                    OtherCharges = doc2.createElement("OtherCharges")
+#                    InternationalForms.appendChild(OtherCharges)
+#                    MonetaryValue = doc2.createElement("MonetaryValue")
+#                    ptext = doc1.createTextNode(comm_inv['OtherCharges']["MonetaryValue"])
+#                    MonetaryValue.appendChild(ptext)
+#                    OtherCharges.appendChild(MonetaryValue)
+#            
+#                    Description = doc2.createElement("Description")
+#                    ptext = doc1.createTextNode(comm_inv['OtherCharges']["Description"])
+#                    Description.appendChild(ptext)
+#                    OtherCharges.appendChild(Description)
+            
+                    CurrencyCode = doc2.createElement("CurrencyCode")
+                    ptext = doc1.createTextNode(comm_inv["CurrencyCode"])
+                    CurrencyCode.appendChild(ptext)
+                    InternationalForms.appendChild(CurrencyCode)
+                if nafta_cer_orig and nafta_cer_orig.get('BlanketPeriod'):
+                    BlanketPeriod = doc2.createElement("BlanketPeriod")
+                    InternationalForms.appendChild(BlanketPeriod)
+                    
+                    BeginDate = doc2.createElement("BeginDate")
+                    ptext = doc1.createTextNode(nafta_cer_orig['BlanketPeriod']["BeginDate"])
+                    BeginDate.appendChild(ptext)
+                    BlanketPeriod.appendChild(BeginDate)
+            
+                    EndDate = doc2.createElement("EndDate")
+                    ptext = doc1.createTextNode(nafta_cer_orig['BlanketPeriod']["EndDate"])
+                    EndDate.appendChild(ptext)
+                    BlanketPeriod.appendChild(EndDate)
+                if cer_orig or sed:
+                    ExportDate = doc2.createElement("ExportDate")
+                    ptext = doc1.createTextNode(cer_orig['ExportDate'])
+                    ExportDate.appendChild(ptext)
+                    InternationalForms.appendChild(ExportDate)
+            
+                    ExportingCarrier = doc2.createElement("ExportingCarrier")
+                    ptext = doc1.createTextNode(cer_orig['ExportingCarrier'])
+                    ExportingCarrier.appendChild(ptext)
+                    InternationalForms.appendChild(ExportingCarrier)
+#                if sed:
+#                    if sed['CarrierID']:
+#                        CarrierID = doc2.createElement("CarrierID")
+#                        ptext = doc1.createTextNode(sed['CarrierID'])
+#                        CarrierID.appendChild(ptext)
+#                        InternationalForms.appendChild(CarrierID)
+#            
+#                    InBondCode = doc2.createElement("InBondCode")
+#                    ptext = doc1.createTextNode(sed['InBondCode'])
+#                    InBondCode.appendChild(ptext)
+#                    InternationalForms.appendChild(InBondCode)
+#                    if sed['InBondCode'] != '70':
+#                        EntryNumber = doc2.createElement("EntryNumber")
+#                        ptext = doc1.createTextNode(sed['EntryNumber'])
+#                        EntryNumber.appendChild(ptext)
+#                        InternationalForms.appendChild(EntryNumber)
+#            
+#                    PointOfOrigin = doc2.createElement("PointOfOrigin")
+#                    ptext = doc1.createTextNode(sed['PointOfOrigin'])
+#                    PointOfOrigin.appendChild(ptext)
+#                    InternationalForms.appendChild(PointOfOrigin)
+#                    
+#                    ModeOfTransport = doc2.createElement("ModeOfTransport")
+#                    ptext = doc1.createTextNode(sed['ModeOfTransport'])
+#                    ModeOfTransport.appendChild(ptext)
+#                    InternationalForms.appendChild(ModeOfTransport)
+#                    if sed['PortOfExport']:
+#                        PortOfExport = doc2.createElement("PortOfExport")
+#                        ptext = doc1.createTextNode(sed['PortOfExport'])
+#                        PortOfExport.appendChild(ptext)
+#                        InternationalForms.appendChild(PortOfExport)
+#                    if sed['PortOfUnloading']:
+#                        PortOfUnloading = doc2.createElement("PortOfUnloading")
+#                        ptext = doc1.createTextNode(sed['PortOfUnloading'])
+#                        PortOfUnloading.appendChild(ptext)
+#                        InternationalForms.appendChild(PortOfUnloading)
+#                    if sed['LoadingPier']:
+#                        LoadingPier = doc2.createElement("LoadingPier")
+#                        ptext = doc1.createTextNode(sed['LoadingPier'])
+#                        LoadingPier.appendChild(ptext)
+#                        InternationalForms.appendChild(LoadingPier)
+#                    if sed['PartiesToTransaction']:
+#                        PartiesToTransaction = doc2.createElement("PartiesToTransaction")
+#                        ptext = doc1.createTextNode(sed['PartiesToTransaction'])
+#                        PartiesToTransaction.appendChild(ptext)
+#                        InternationalForms.appendChild(PartiesToTransaction)
+#            
+#                    if sed['RoutedExportTransactionIndicator']:
+#                        RoutedExportTransactionIndicator = doc2.createElement("RoutedExportTransactionIndicator")
+#                        InternationalForms.appendChild(RoutedExportTransactionIndicator)
+#                    
+#                    if sed['ContainerizedIndicator']:
+#                        ContainerizedIndicator = doc2.createElement("ContainerizedIndicator")
+#                        InternationalForms.appendChild(ContainerizedIndicator)
+#            
+#                    License = doc2.createElement("License")
+#                    InternationalForms.appendChild(License)
+#                    if sed['License'].get('Number'):
+#                        Number = doc2.createElement("Number")
+#                        ptext = doc1.createTextNode(sed['License']['Number'])
+#                        Number.appendChild(ptext)
+#                        License.appendChild(Number)
+#                        
+#                        Date = doc2.createElement("Date")
+#                        ptext = doc1.createTextNode(sed['License']['Date'])
+#                        Date.appendChild(ptext)
+#                        InternationalForms.appendChild(Date)
+#                        
+#                    elif sed['License'].get('ExceptionCode'):
+#                        ExceptionCode = doc2.createElement("ExceptionCode")
+#                        ptext = doc1.createTextNode(sed['License']['ExceptionCode'])
+#                        ExceptionCode.appendChild(ptext)
+#                        License.appendChild(ExceptionCode)
+#                        if sed['License']['ExceptionCode'] in ('CIV','CTP','ENC','KMI','LVS'):
+#                            ECCNNumber = doc2.createElement("ECCNNumber")
+#                            ptext = doc1.createTextNode(sed['ECCNNumber'])
+#                            ECCNNumber.appendChild(ptext)
+#                            InternationalForms.appendChild(ECCNNumber)
+
+    #        ReturnOfDocumentIndicator = doc2.createElement("ReturnOfDocumentIndicator")
+    #        ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["ShipmentServiceOptions"]["ReturnOfDocumentIndicator"])
+    #        ReturnOfDocumentIndicator.appendChild(ptext)
+    #        ShipmentServiceOptions.appendChild(ReturnOfDocumentIndicator)
+    #
+    #        ImportControlIndicator = doc2.createElement("ImportControlIndicator")
+    #        ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["ShipmentServiceOptions"]["ImportControlIndicator"])
+    #        ImportControlIndicator.appendChild(ptext)
+    #        ShipmentServiceOptions.appendChild(ImportControlIndicator)
+    #
+    #        LabelMethod = doc2.createElement("LabelMethod")
+    #        ShipmentServiceOptions.appendChild(LabelMethod)
+    #        Code = doc2.createElement("Code")
+    #        ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["ShipmentServiceOptions"]["LabelMethod"]["Code"])
+    #        Code.appendChild(ptext)
+    #        LabelMethod.appendChild(Code)
+    #
+    #        Description = doc2.createElement("Description")
+    #        ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["ShipmentServiceOptions"]["LabelMethod"]["Description"])
+    #        Description.appendChild(ptext)
+    #        LabelMethod.appendChild(Description)
+
+    #        CommercialInvoiceRemovalIndicator = doc2.createElement("CommercialInvoiceRemovalIndicator")
+    #        ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["ShipmentServiceOptions"]["CommercialInvoiceRemovalIndicator"])
+    #        CommercialInvoiceRemovalIndicator.appendChild(ptext)
+    #        ShipmentServiceOptions.appendChild(CommercialInvoiceRemovalIndicator)
+
+    #        UPScarbonneutralIndicator = doc2.createElement("UPScarbonneutralIndicator")
+    #        ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["ShipmentServiceOptions"]["UPScarbonneutralIndicator"])
+    #        UPScarbonneutralIndicator.appendChild(ptext)
+    #        ShipmentServiceOptions.appendChild(UPScarbonneutralIndicator)
+
+    #        DeliveryConfirmation = doc2.createElement("DeliveryConfirmation")
+    #        ShipmentServiceOptions.appendChild(DeliveryConfirmation)
+    #        DCISType = doc2.createElement("DCISType")
+    #        ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["ShipmentServiceOptions"]["DeliveryConfirmation"]["DCISType"])
+    #        DCISType.appendChild(ptext)
+    #        DeliveryConfirmation.appendChild(DCISType)
+
+            Package_count = len(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["Package"])
+            for i in range(0,Package_count):
+                Package = doc2.createElement("Package")
+                Shipment.appendChild(Package)
+
+                Description = doc2.createElement("Description")
+                ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["Package"][i]["Description"])
+                Description.appendChild(ptext)
+                Package.appendChild(Description)
+                PackagingType = doc2.createElement("PackagingType")
+                Package.appendChild(PackagingType)
+
+                Code = doc2.createElement("Code")
+                ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["Package"][i]["PackagingType"]['Code'])
+                Code.appendChild(ptext)
+                PackagingType.appendChild(Code)
+                Description = doc2.createElement("Description")
+                ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["Package"][i]["PackagingType"]['Description'])
+                Description.appendChild(ptext)
+                PackagingType.appendChild(Description)
+
+                Dimensions = doc2.createElement("Dimensions")
+                Package.appendChild(Dimensions)
+
+                Length = doc2.createElement("Length")
+                ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["Package"][i]["Dimensions"]["Length"])
+                Length.appendChild(ptext)
+                Dimensions.appendChild(Length)
+                Width = doc2.createElement("Width")
+                ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["Package"][i]["Dimensions"]["Width"])
+                Width.appendChild(ptext)
+                Dimensions.appendChild(Width)
+                Height = doc2.createElement("Height")
+                ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["Package"][i]["Dimensions"]["Height"])
+                Height.appendChild(ptext)
+                Dimensions.appendChild(Height)
+                UnitOfMeasurement = doc2.createElement("UnitOfMeasurement")
+                Dimensions.appendChild(UnitOfMeasurement)
+
+                Code = doc2.createElement("Code")
+                ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["Package"][i]["Dimensions"]['UnitOfMeasurement']["Code"])
+                Code.appendChild(ptext)
+                UnitOfMeasurement.appendChild(Code)
+                Description = doc2.createElement("Description")
+                ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["Package"][i]["Dimensions"]['UnitOfMeasurement']["Description"])
+                Description.appendChild(ptext)
+                UnitOfMeasurement.appendChild(Description)
+
+
+                PackageWeight = doc2.createElement("PackageWeight")
+                Package.appendChild(PackageWeight)
+
+                UnitOfMeasurement = doc2.createElement("UnitOfMeasurement")
+                PackageWeight.appendChild(UnitOfMeasurement)
+                Code = doc2.createElement("Code")
+                ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["Package"][i]['PackageWeight']['UnitOfMeasurement']["Code"])
+                Code.appendChild(ptext)
+                UnitOfMeasurement.appendChild(Code)
+
+                Description = doc2.createElement("Description")
+                ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["Package"][i]['PackageWeight']['UnitOfMeasurement']["Description"])
+                Description.appendChild(ptext)
+                UnitOfMeasurement.appendChild(Description)
+
+                Weight = doc2.createElement("Weight")
+                ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["Package"][i]['PackageWeight']["Weight"])
+                Weight.appendChild(ptext)
+                PackageWeight.appendChild(Weight)
+    #            LargePackageIndicator = doc2.createElement("LargePackageIndicator")
+    ##            ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["Package"][i]["LargePackageIndicator"])
+    ##            LargePackageIndicator.appendChild(ptext)
+    #            Package.appendChild(LargePackageIndicator)
+
+#                ReferenceNumber = doc2.createElement("ReferenceNumber")
+#                Package.appendChild(ReferenceNumber)
+#
+#                BarCodeIndicator = doc2.createElement("BarCodeIndicator")
+#    #            ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["Package"][i]["ReferenceNumber"]["BarCodeIndicator"])
+#    #            BarCodeIndicator.appendChild(ptext)
+#                ReferenceNumber.appendChild(BarCodeIndicator)
+#
+#                Code = doc2.createElement("Code")
+#                ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["Package"][i]["ReferenceNumber"]["Code"])
+#                Code.appendChild(ptext)
+#                ReferenceNumber.appendChild(Code)
+#
+#                Value = doc2.createElement("Value")
+#                ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["Package"][i]["ReferenceNumber"]["Value"])
+#                Value.appendChild(ptext)
+#                ReferenceNumber.appendChild(Value)
+
+    #            AdditionalHandling = doc2.createElement("AdditionalHandling")
+    #            ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["Package"][i]["AdditionalHandling"])
+    #            AdditionalHandling.appendChild(ptext)
+    #            Package.appendChild(AdditionalHandling)
+
+    #            PackageServiceOptions = doc2.createElement("PackageServiceOptions")
+    #            Package.appendChild(PackageServiceOptions)
+    #
+    #            DeliveryConfirmation = doc2.createElement("DeliveryConfirmation")
+    #            PackageServiceOptions.appendChild(DeliveryConfirmation)
+    #
+    #            DCISType = doc2.createElement("DCISType")
+    #            ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["Package"][i]["PackageServiceOptions"]['DeliveryConfirmation']['DCISType'])
+    #            DCISType.appendChild(ptext)
+    #            DeliveryConfirmation.appendChild(DCISType)
+    #
+    #            DCISNumber = doc2.createElement("DCISNumber")
+    #            ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["Package"][i]["PackageServiceOptions"]['DeliveryConfirmation']['DCISNumber'])
+    #            DCISNumber.appendChild(ptext)
+    #            DeliveryConfirmation.appendChild(DCISNumber)
+    #
+    #            InsuredValue = doc2.createElement("InsuredValue")
+    #            PackageServiceOptions.appendChild(InsuredValue)
+    #
+    #
+    #            Type = doc2.createElement("Type")
+    #            ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["Package"][i]["PackageServiceOptions"]['InsuredValue']['Type'])
+    #            Type.appendChild(ptext)
+    #            InsuredValue.appendChild(Type)
+    #
+    #            Code = doc2.createElement("Code")
+    #            ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["Package"][i]["PackageServiceOptions"]['InsuredValue']['Code'])
+    #            Code.appendChild(ptext)
+    #            InsuredValue.appendChild(Code)
+    #
+    #
+    #            Description = doc2.createElement("Description")
+    #            ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["Package"][i]["PackageServiceOptions"]['InsuredValue']['Description'])
+    #            Description.appendChild(ptext)
+    #            InsuredValue.appendChild(Description)
+    #
+    #            Description = doc2.createElement("CurrencyCode")
+    #            ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["Package"][i]["PackageServiceOptions"]['InsuredValue']['CurrencyCode'])
+    #            CurrencyCode.appendChild(ptext)
+    #            InsuredValue.appendChild(CurrencyCode)
+    #
+    #            Description = doc2.createElement("MonetaryValue")
+    #            ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["Package"][i]["PackageServiceOptions"]['InsuredValue']['MonetaryValue'])
+    #            MonetaryValue.appendChild(ptext)
+    #            InsuredValue.appendChild(MonetaryValue)
+    #
+    #
+    #            COD = doc2.createElement("COD")
+    #            PackageServiceOptions.appendChild(COD)
+    #
+    #
+    #            CODCode = doc2.createElement("CODCode")
+    #            ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["Package"][i]["PackageServiceOptions"]['COD']['CODCode'])
+    #            CODCode.appendChild(ptext)
+    #            COD.appendChild(CODCode)
+    #
+    #            CODFundsCode = doc2.createElement("CODFundsCode")
+    #            ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["Package"][i]["PackageServiceOptions"]['COD']['CODFundsCode'])
+    #            CODFundsCode.appendChild(ptext)
+    #            COD.appendChild(CODFundsCode)
+    #
+    #            CODAmount = doc2.createElement("CODAmount")
+    #            ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["Package"][i]["PackageServiceOptions"]['COD']['CODAmount'])
+    #            CODAmount.appendChild(ptext)
+    #            COD.appendChild(CODAmount)
+    #
+    #            CurrencyCode = doc2.createElement("CurrencyCode")
+    #            ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["Package"][i]["PackageServiceOptions"]['InsuredValue']['COD']['CODAmount']['CurrencyCode'])
+    #            CurrencyCode.appendChild(ptext)
+    #            InsuredValue.appendChild(CurrencyCode)
+    #
+    #            MonetaryValue = doc2.createElement("MonetaryValue")
+    #            ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["Package"][i]["PackageServiceOptions"]['InsuredValue']['COD']['CODAmount']['MonetaryValue'])
+    #            MonetaryValue.appendChild(ptext)
+    #            InsuredValue.appendChild(MonetaryValue)
+    #
+    #            VerbalConfirmation = doc2.createElement("VerbalConfirmation")
+    #            PackageServiceOptions.appendChild(VerbalConfirmation)
+    #
+    #            ContactInfo = doc2.createElement("ContactInfo")
+    #            VerbalConfirmation.appendChild(ContactInfo)
+    #
+    #            Name = doc2.createElement("Name")
+    #            ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["Package"][i]["PackageServiceOptions"]['VerbalConfirmation']['VerbalConfirmation']['Name'])
+    #            Name.appendChild(ptext)
+    #            ContactInfo.appendChild(Name)
+    #
+    #            PhoneNumber = doc2.createElement("PhoneNumber")
+    #            ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["Package"][i]["PackageServiceOptions"]['VerbalConfirmation']['VerbalConfirmation']['PhoneNumber'])
+    #            PhoneNumber.appendChild(ptext)
+    #            ContactInfo.appendChild(PhoneNumber)
+    #
+    #            ShipperReleaseIndicator = doc2.createElement("ShipperReleaseIndicator")
+    #            ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["Package"][i]["PackageServiceOptions"]['ShipperReleaseIndicator'])
+    #            ShipperReleaseIndicator.appendChild(ptext)
+    #            PackageServiceOptions.appendChild(ShipperReleaseIndicator)
+    #
+    #
+    #            Notification = doc2.createElement("Notification")
+    #            PackageServiceOptions.appendChild(Notification)
+    #            NotificationCode = doc2.createElement("NotificationCode")
+    #            ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["Package"][i]["PackageServiceOptions"]['Notification'])
+    #            NotificationCode.appendChild(ptext)
+    #            Notification.appendChild(NotificationCode)
+    #
+    #            EMailMessage = doc2.createElement("EMailMessage")
+    #            Notification.appendChild(EMailMessage)
+    #            UndeliverableEMailAddress = doc2.createElement("UndeliverableEMailAddress")
+    #            ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["Package"][i]["PackageServiceOptions"]["Notification"]["EMailMessage"]["UndeliverableEMailAddress"])
+    #            UndeliverableEMailAddress.appendChild(ptext)
+    #            EMailMessage.appendChild(UndeliverableEMailAddress)
+    #
+    #            EMailAddress = doc2.createElement("EMailAddress")
+    #            ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["Package"][i]["PackageServiceOptions"]["Notification"]["EMailMessage"]["EMailAddress"])
+    #            EMailAddress.appendChild(ptext)
+    #            EMailMessage.appendChild(EMailAddress)
+    #
+    #            FromEMailAddress = doc2.createElement("FromEMailAddress")
+    #            ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["Package"][i]["PackageServiceOptions"]["Notification"]["EMailMessage"]["FromEMailAddress"])
+    #            FromEMailAddress.appendChild(ptext)
+    #            EMailMessage.appendChild(FromEMailAddress)
+    #
+    #            FromName = doc2.createElement("FromName")
+    #            ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["Package"][i]["PackageServiceOptions"]["Notification"]["EMailMessage"]["FromName"])
+    #            FromName.appendChild(ptext)
+    #            EMailMessage.appendChild(FromName)
+    #
+    #            Memo = doc2.createElement("Memo")
+    #            ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["Package"][i]["PackageServiceOptions"]["Notification"]["EMailMessage"]["Memo"])
+    #            Memo.appendChild(ptext)
+    #            EMailMessage.appendChild(Memo)
+    #
+    #            Subject = doc2.createElement("Subject")
+    #            ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["Package"][i]["PackageServiceOptions"]["Notification"]["EMailMessage"]["Subject"])
+    #            Subject.appendChild(ptext)
+    #            EMailMessage.appendChild(Subject)
+    #
+    #            SubjectCode = doc2.createElement("SubjectCode")
+    #            ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["Package"][i]["PackageServiceOptions"]["Notification"]["EMailMessage"]["SubjectCode"])
+    #            SubjectCode.appendChild(ptext)
+    #            EMailMessage.appendChild(SubjectCode)
+    #
+    #            ReturnsFlexibleAccessIndicator = doc2.createElement("ReturnsFlexibleAccessIndicator")
+    #            ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["Shipment"]["Package"][i]["PackageServiceOptions"]['ReturnsFlexibleAccessIndicator'])
+    #            ReturnsFlexibleAccessIndicator.appendChild(ptext)
+    #            PackageServiceOptions.appendChild(ReturnsFlexibleAccessIndicator)
+
+
+
+
+
+
+                #/////////end loop in code
+
+
+
+            LabelSpecification = doc2.createElement("LabelSpecification")
+            ShipmentConfirmRequest.appendChild(LabelSpecification)
+
+            LabelPrintMethod = doc2.createElement("LabelPrintMethod")
+            LabelSpecification.appendChild(LabelPrintMethod)
+            Code = doc2.createElement("Code")
+            ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["LabelSpecification"]["LabelPrintMethod"]["Code"])
+            Code.appendChild(ptext)
+            LabelPrintMethod.appendChild(Code)
+
+            Description = doc2.createElement("Description")
+            ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["LabelSpecification"]["LabelPrintMethod"]["Description"])
+            Description.appendChild(ptext)
+            LabelPrintMethod.appendChild(Description)
+
+    #        HTTPUserAgent = doc2.createElement("HTTPUserAgent")
+    #        ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["LabelSpecification"]["LabelPrintMethod"]["HTTPUserAgent"])
+    #        HTTPUserAgent.appendChild(ptext)
+    #        LabelSpecification.appendChild(HTTPUserAgent)
+
+            LabelStockSize = doc2.createElement("LabelStockSize")
+            LabelSpecification.appendChild(LabelStockSize)
+            Height = doc2.createElement("Height")
+            ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["LabelSpecification"]["LabelStockSize"]["Height"])
+            Height.appendChild(ptext)
+            LabelStockSize.appendChild(Height)
+            Width = doc2.createElement("Width")
+            ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["LabelSpecification"]["LabelStockSize"]["Width"])
+            Width.appendChild(ptext)
+            LabelStockSize.appendChild(Width)
+
+            LabelImageFormat = doc2.createElement("LabelImageFormat")
+            LabelSpecification.appendChild(LabelImageFormat)
+
+            Code = doc2.createElement("Code")
+            ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["LabelSpecification"]["LabelImageFormat"]["Code"])
+            Code.appendChild(ptext)
+            LabelImageFormat.appendChild(Code)
+
+            Description = doc2.createElement("Description")
+            ptext = doc1.createTextNode(data_for_confirm_request["ShipmentConfirmRequest"]["LabelSpecification"]["LabelImageFormat"]["Description"])
+            Description.appendChild(ptext)
+            LabelImageFormat.appendChild(Description)
+
+
+            request_string2=doc2.toprettyxml()
+
+            request_string=Request_string1+request_string2
+
+            return request_string
+
+    def _get_value(self,obj,template_obj,var):
+        try :
+            ret=''
+            temp1='template_obj.'+var
+            temp1=temp1.strip(' ')
+            temp1=eval(temp1)
+            if temp1 and  '${' in temp1:
+                temp=temp1
+                temp=''.join(temp.split('\n'))
+                temp_list=re.findall('\$\{.*?\}',temp)
+                for item in temp_list:
+                    ret+=temp[0:temp.index(item)]
+                    item=item.strip('')
+                    list_item=item.strip('${')
+                    list_item=list_item.strip('}')
+                    list_item=list_item.split('object.')
+                    ret+=eval('obj.'+list_item[-1]) or ''
+                    temp=temp[temp.index(item)+len(item):]
+                ret+=temp
+                return ret
+            else:
+                return temp1
+        except:
+            try:
+                return eval('template_obj.'+var)
+            except:
+                return ''
+    def send_conf_mail(self,cr,uid,ids,context=None):
+        val={}
+        for id in ids:
+            obj=self.browse(cr, uid, id)
+            if obj and obj.address_id and obj.address_id.email:
+                template_id=self.pool.get('email.template').search(cr,uid,[('object_name.model','=','stock.picking'),('ship_mail','=',True)] )
+                if template_id:
+                   template_obj_list=self.pool.get('email.template').browse(cr,uid,template_id)
+                   for template_obj in template_obj_list:
+                             vals={'email_to':self._get_value(obj,template_obj,'def_to') or '',
+                              'body_text':self._get_value(obj,template_obj,'def_body_text') or '',
+                              'body_html':self._get_value(obj,template_obj,'def_body_html') or '',
+                              'account_id':template_obj.from_account.id,
+                              'folder':'outbox',
+                              'state':'draft',
+                              'subject':self._get_value(obj,template_obj,'def_subject') or '',
+                              'email_cc':self._get_value(obj,template_obj,'def_cc') or '',
+                              'email_bcc':self._get_value(obj,template_obj,'def_bcc') or '',
+                              'email_from':template_obj.from_account.email_id or '',
+                              'reply_to':self._get_value(obj,template_obj,'reply_to') or '' ,
+                              'date_mail':time.strftime('%Y-%m-%d %H:%M:%S'),
+                                      }
+                             account = self.pool.get('email_template.mailbox').create(cr, uid,vals)
+        return True
+
+    def process_ship(self,cr, uid, ids, context=None):
+        deliv_order = self.browse(cr, uid, type(ids)==type([]) and ids[0] or ids, context=context)
+        error_flag=False
+        ship_move_ids={}
+        do_transaction = True
+        response_dic = {}
+        if not (deliv_order.logis_company or deliv_order.shipper or deliv_order.ups_service):
+            raise osv.except_osv("Warning", "Please select Logistics Company, Shipper and Shipping Service")
+        if not deliv_order.packages_ids:
+            raise osv.except_osv("Warning", "Please add shipping packages before doing Process Shipping.")
+        if not deliv_order.invoiced and deliv_order.sale_id and deliv_order.sale_id.order_policy == 'credit_card' :
+            if not deliv_order.sale_id.cc_pre_auth:
+                raise osv.except_osv("Warning", "The sales order is not paid")
+            else:
+                do_transaction = False
+                rel_voucher_id = deliv_order.sale_id.rel_account_voucher_id
+                if rel_voucher_id and rel_voucher_id.state != 'posted' and deliv_order.sale_id.cc_pre_auth:
+                    self.pool.get('account.voucher').write(cr,uid,[rel_voucher_id.id],{'cc_p_authorize':False,'cc_charge':True}, context=context)
+                    do_transaction = self.pool.get('account.voucher').authorize(cr, uid, [rel_voucher_id.id], context=context)
+            if  not do_transaction:
+                self.write(cr,uid,ids,{'ship_state':'hold','ship_message':'Unable to process creditcard payment.'})
+                cr.commit()
+                raise osv.except_osv(_('Final credit card charge cannot be completed!'),_("Please hold shipment and contact customer service..") )
+        warning_error = False
+        for pack_obj in deliv_order.packages_ids:
+            ship_confirm_request_xml=self.create_ship_confirm_request(cr, uid,pack_obj.id)
+            ship_confirm_web=''
+            ship_confirm_port=''
+
+            if deliv_order.logis_company:
+                if deliv_order.logis_company.test_mode:
+                    ship_confirm_web=deliv_order.logis_company.ship_req_test_web
+                    ship_confirm_port=deliv_order.logis_company.ship_req_test_port
+
+                else:
+                    ship_confirm_web=deliv_order.logis_company.ship_req_web
+                    ship_confirm_port=deliv_order.logis_company.ship_req_port
+
+                if ship_confirm_web:
+                    parse_url = urlparse(ship_confirm_web)
+                    serv = parse_url.netloc
+                    serv_path = parse_url.path
+                else:
+                    raise osv.except_osv(_('Unable to find Shipping URL!'),_("Please configure the shipping company with websites."))
+
+                conn=httplib.HTTPSConnection(serv,ship_confirm_port)
+                res=conn.request("POST",serv_path,ship_confirm_request_xml)
+                """1.make and call function to send request/ 2.make function to process the response and write it """
+
+
+                res=conn.getresponse()
+                result = res.read()
+                
+                response_dic=xml2dic.main(result)
+
+
+                response = ''
+                
+            if not response_dic:
+                continue
+            for res_elm in  response_dic['ShipmentConfirmResponse'][0]['Response']:
+                if res_elm.get('ResponseStatusCode'):
+                    response = '\nResponse Status Code: '+str(res_elm['ResponseStatusCode'])
+                if res_elm.get('ResponseStatusDescription'):
+                    response += '\nResponse Description: '+str(res_elm['ResponseStatusDescription'])
+                if res_elm.get('Error'):
+                    
+                    error_flag =True
+                    for err_elm in res_elm.get('Error'):
+                        if err_elm.get('ErrorSeverity',False):
+                            response += '\nErrorSeverity: '+str(err_elm['ErrorSeverity'])
+                            if str(err_elm['ErrorSeverity']) == 'Warning':
+                                warning_error = True
+                                error_flag = False
+                        if err_elm.get('ErrorCode',False):
+                            response += '\nErrorCode: '+str(err_elm['ErrorCode'])
+                        if err_elm.get('ErrorDescription',False):
+                            response += '\nErrorDescription: '+str(err_elm['ErrorDescription'])
+                        if err_elm.get('ErrorLocation',False):
+                            response += '\nErrorLocation: '+str(err_elm['ErrorLocation'])
+                    self.write(cr,uid,ids,{'ship_message':'Ship Processing:'+str(response)})
+                    if not warning_error:
+                        break
+            temp=""
+            if len(response_dic['ShipmentConfirmResponse'])>5 and response_dic['ShipmentConfirmResponse'][5].has_key('ShipmentDigest') :
+                temp +=str(response_dic['ShipmentConfirmResponse'][5]['ShipmentDigest'])
+            self.pool.get('stock.packages').write(cr,uid,[pack_obj.id],{'ship_message':str(response),'shipment_digest':str(temp)})
+
+
+            if int(time.strftime("%w")) in range(1,6) or (time.strftime("%w") == '6' and deliv_order.sat_delivery):
+                next_pic_date = time.strftime("%Y-%m-%d")
+            else:
+                timedelta = datetime.timedelta(7-int(time.strftime("%w")))
+                next_pic_date = (datetime.datetime.today()+timedelta).strftime("%Y-%m-%d")
+
+            value_dic={'pick_id':deliv_order.id ,
+                       'package_weight':pack_obj.weight,
+                       'state':deliv_order.ship_state,
+                       'partner_id':deliv_order.address_id.id and deliv_order.address_id.partner_id.id,
+                       'service':deliv_order.ups_service.id,
+                       'ship_to':deliv_order.address_id.id,
+                       'ship_from':deliv_order.ship_from and deliv_order.ship_from_address.id  or deliv_order.shipper.id and deliv_order.shipper.address.id,
+                       'package':pack_obj.description and str(pack_obj.description)[:126],
+                       'pic_date':next_pic_date,
+                       'sale_id':deliv_order.sale_id.id and deliv_order.sale_id.id or False,
+                       }
+            if not error_flag:
+                ship_move_ids[pack_obj.id] = self.pool.get('shipping.move').create(cr, uid, value_dic)
+                self.process_ship_accept(cr, uid, ids,ship_move_ids,pack_obj,context=context)
+#            else:
+#                error_flag =True
+#                try:
+        if not error_flag:
+            if warning_error:
+                ship_msg = 'Shipping success with warning. Please see the individual package details.'
+            else:
+                ship_msg = 'Success'
+            self.write(cr,uid,ids,{'ship_state':'ready_pick','ship_message':ship_msg})
+            try:
+                self.send_conf_mail(cr,uid,ids,context=context)
+            except Exception,e:
+                pass
+            if ship_move_ids:
+                self.pool.get('shipping.move').write(cr, uid, ship_move_ids.values(),{'state':'ready_pick'})
+            return {
+                    'type': 'ir.actions.report.xml',
+                    'report_name':'multiple.label.print',
+                    'datas': {
+                            'model':'stock.picking',
+                            'id': ids and ids[0] or False,
+                            'ids': ids and ids or [],
+                            'report_type': 'pdf'
+                        },
+                    'nodestroy': True
+                    }
+
+
+#                except Exception,e:
+#                    pass
+        return True
+
+    def _get_journal_id(self, cr, uid, ids, context={}):
+        journal_obj = self.pool.get('account.journal')
+        vals = []
+        browse_picking = self.browse(cr, uid, ids, context=context)
+
+        for pick in browse_picking:
+            src_usage = pick.move_lines[0].location_id.usage
+            dest_usage = pick.move_lines[0].location_dest_id.usage
+            type = pick.type
+            if type == 'out' and dest_usage == 'supplier':
+                journal_type = 'purchase_refund'
+            elif type == 'out' and dest_usage == 'customer':
+                journal_type = 'sale'
+            elif type == 'in' and src_usage == 'supplier':
+                journal_type = 'purchase'
+            elif type == 'in' and src_usage == 'customer':
+                journal_type = 'sale_refund'
+            else:
+                journal_type = 'sale'
+
+            value = journal_obj.search(cr, uid, [('type', '=',journal_type )])
+            for jr_type in journal_obj.browse(cr, uid, value, context=context):
+                t1 = jr_type.id,jr_type.name
+                if t1 not in vals:
+                    vals.append(t1)
+        return vals
+
+
+    def do_partial(self, cr, uid, ids, partial_datas, context=None):
+        res = self._get_journal_id(cr, uid, ids, context=context)
+        result_partial = super(stock_picking, self).do_partial(cr, uid, ids, partial_datas, context=context)
+        if res and res[0]:
+            journal_id = res[0][0]
+            result = result_partial
+            stock_picking_objs = self.browse(cr, uid, ids, context=context)
+            for stock_picking_obj in stock_picking_objs:
+                if stock_picking_obj.sale_id and stock_picking_obj.sale_id.order_policy == 'picking':
+                    pick_id = result_partial[stock_picking_obj.id]['delivered_picking']
+                    result = self.action_invoice_create(cr, uid, [pick_id], journal_id, type=None, context=context)       
+                    if len(stock_picking_obj.sale_id.invoice_ids)<=1 and result:
+                        self.pool.get('account.invoice').write(cr, uid, result.values(),{'ship_method':stock_picking_obj.sale_id.ship_method,
+                                                                                         'shipcharge':stock_picking_obj.sale_id.shipcharge,
+                                                                                         'ship_method_id':stock_picking_obj.sale_id.ship_method_id and stock_picking_obj.sale_id.ship_method_id.id,})
+                            
+        
+        return result_partial
+stock_picking()
+
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'shipping_api_ups/stock_package.py'
--- shipping_api_ups/stock_package.py	1970-01-01 00:00:00 +0000
+++ shipping_api_ups/stock_package.py	2011-10-06 16:08:52 +0000
@@ -0,0 +1,92 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 NovaPoint Group LLC (<http://www.novapointgroup.com>)
+#    Copyright (C) 2004-2010 OpenERP SA (<http://www.openerp.com>)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>
+#
+##############################################################################
+
+
+from osv import fields,osv
+from xml.dom.minidom import Document
+import httplib
+import xml2dic
+import base64
+
+
+class stock_packages(osv.osv):
+
+    def process_package(self,cr, uid, ids, context=None):
+        return True
+
+    _inherit = "stock.packages"
+    _columns = {
+            'shipment_digest': fields.text('ShipmentDigest'),
+            'negotiated_rates': fields.float('NegotiatedRates'),
+            'shipment_identific_no': fields.char('ShipmentIdentificationNumber', size=64, ),
+            'tracking_no': fields.char('TrackingNumber', size=64, ),
+            'logo':fields.binary('Label'),
+            'ship_message':fields.text('Status Message'),
+            'tracking_url':fields.char('Tracking URL', size=512, ),
+            }
+    _defaults = {'packge_no': False
+                 }
+    
+    def onchange_weight(self, cr, uid, ids, line_ids, tot_order_weight, weight,context={}):
+        '''
+        Function to automatically fill package weight
+        '''
+        ret = {}
+        if weight:
+            ret['weight'] = weight
+        else:
+            used_weight = 0
+            for line in line_ids:
+                 if line and line[2] and line[2]['weight']:
+                     used_weight += line[2]['weight']
+            if used_weight < tot_order_weight:
+                ret['weight'] = tot_order_weight - used_weight
+        return {'value':ret}
+    def onchange_packge_no(self, cr, uid, ids, line_ids,packge_no,context={}):
+        '''
+        Function to generate sequence on packages
+        '''
+        ret = {}
+        if packge_no:
+            ret['packge_no'] = packge_no
+        else:
+            for line in line_ids:
+                 if line and line[2] and line[2]['packge_no'] and packge_no < line[2]['packge_no']:
+                     packge_no=line[2]['packge_no']
+            packge_no+=1
+            ret['packge_no'] = packge_no
+        return {'value':ret}
+    def print_label(self, cr, uid, ids, context=None):
+        if not ids: return []
+        return {
+            'type': 'ir.actions.report.xml',
+            'report_name':'ship.label.print',
+            'datas': {
+                    'model':'stock.packages',
+                    'id': ids and ids[0] or False,
+                    'ids': ids and ids or [],
+                    'report_type': 'pdf'
+                },
+            'nodestroy': True
+            }
+
+stock_packages()
\ No newline at end of file

=== added file 'shipping_api_ups/stock_package_view.xml'
--- shipping_api_ups/stock_package_view.xml	1970-01-01 00:00:00 +0000
+++ shipping_api_ups/stock_package_view.xml	2011-10-06 16:08:52 +0000
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+
+    	<record id="stock_packages_tree" model="ir.ui.view">
+            <field name="name">stock.packages.tree</field>
+            <field name="model">stock.packages</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree  editable="bottom" string='Shipping Packages'>
+					<field name='packge_no'  on_change="onchange_packge_no(parent.packages_ids,packge_no)"/>
+					<field name='weight' on_change="onchange_weight(parent.packages_ids, parent.tot_del_order_weight, weight)"/>
+					<field name='package_type'/>
+					<field name='length'/>
+					<field name='width'/>
+					<field name='height'/>
+					<field name='decl_val'/>
+					<field name='ref1'/>
+					<field name='ref2'/>
+	                <field name='negotiated_rates' readonly="1"/>
+	                <field name='shipment_identific_no' readonly="1"/>
+	                <field name='tracking_no' readonly="1"/>
+					<button string="Print Label" name="print_label" type="object" help='This prints a specific label for the package. This button also allows for reprinting a button. The label is stored in the document management system as a pdf.'/>
+					
+                </tree>
+            </field>
+        </record>
+
+		<!--Form view for Ups Stock Package-->
+
+		<record id="stock_packages_form" model="ir.ui.view">
+            <field name="name">stock.packages.form</field>
+            <field name="model">stock.packages</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string='Shipping Packages'>
+                <group colspan="4" col="4" string="">
+					<field name='packge_no'  on_change="onchange_packge_no(parent.packages_ids,packge_no)"/>
+					<field name='description'/>
+					<field name='weight' on_change="onchange_weight(parent.packages_ids,parent.tot_del_order_weight, weight)"/>
+					<field name='package_type'/>
+					<field name='length'/>
+					<field name='width'/>
+					<field name='height'/>
+					<field name='decl_val'/>
+					<field name='ref1'/>
+					<field name='ref2'/><newline/>
+					<button string="Weigh" help='Click this button to weigh the package from the scale.'/>
+					<label colspan="2"/><button string="Print Label" name="print_label" type="object" help='This prints a specific label for the package. This button also allows for reprinting a button. The label is stored in the document management system as a pdf.'/>
+				</group>
+				<newline/>
+				<group string="Shipment Status"> 
+					<field name='ship_message'/>  
+				</group>
+				<newline/>
+				<group string="Shipping Results Details">
+	                <field name='negotiated_rates' readonly="1"/>
+	                <field name='shipment_identific_no' readonly="1"/>
+	                <field name='tracking_no' readonly="1"/>
+	                <field name='tracking_url' readonly="1" widget="url"/>
+	                <field name='logo' widget="image" readonly="1"/>
+                </group>
+
+				</form>
+            </field>
+        </record>
+
+
+
+
+
+
+
+         <record id="view_picking_ups_shipping_move_inherit" model="ir.ui.view">
+            <field name="name">view_picking_ups_shipping_move_inherit</field>
+            <field name="model">shipping.move</field>
+            <field name="inherit_id" ref="shipping_api.shipping_move_form"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+            	<xpath expr="//field[@name='ship_date']" position="after">
+					<field name='shipment_identific_no' readonly="1"/>
+       				<field name='logo' widget="image"  readonly="1"/>
+       				<field name='tracking_url' widget="url" readonly="1"/>
+					<button string="Print Label" name="print_label" type="object" help='This prints a specific label for the package. This button also allows for reprinting a button. The label is stored in the document management system as a pdf.'/>
+					<newline/>
+		     	</xpath>
+            </field>
+        </record>
+
+<!-- Email Template -->
+       <record model="ir.ui.view" id="email_template_form_inherit">
+            <field name="name">email.template.form.inherit</field>
+            <field name="model">email.template</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="email_template.email_template_form" />
+            <field name="arch" type="xml">
+                <field name="track_campaign_item" colspan="4" position="after">
+	                <field name="ship_mail" colspan="4" />
+                </field>
+            </field>
+        </record>
+
+
+
+        </data>
+</openerp>
+

=== added file 'shipping_api_ups/ups.py'
--- shipping_api_ups/ups.py	1970-01-01 00:00:00 +0000
+++ shipping_api_ups/ups.py	2011-10-06 16:08:52 +0000
@@ -0,0 +1,110 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 NovaPoint Group LLC (<http://www.novapointgroup.com>)
+#    Copyright (C) 2004-2010 OpenERP SA (<http://www.openerp.com>)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>
+#
+##############################################################################
+
+from osv import fields,osv
+import re
+
+
+
+class ups_account_shipping(osv.osv):
+    _name = "ups.account.shipping"
+    _columns = {
+                'name':fields.char('Name', size=64, required=True, select=1),
+                'atten_name':fields.char('AttentionName', size=64, required=True, select=1),
+                'accesslicensenumber': fields.char('AccessLicenseNumber', size= 64, required=True, select=1),
+                'userid': fields.char('UserId',size=64 , required=True, select=1),
+                'password': fields.char('Password', size=64, required=True, select=1),
+                'active':fields.boolean('Active', size=64,),
+                'acc_no':fields.char('Account Number',size=64 , required=True, select=1, help="Shipper's six digit account number."),
+                'tax_id_no':fields.char('Tax Identification Number',size=64 ,  select=1, help="Shipper's Tax Identification Number."),
+                'logistic_company_id':fields.many2one('logistic.company','Parent Logistic Company'),
+                'ups_shipping_service_ids':fields.one2many('ups.shipping.service.type','ups_account_id','Shipping Service'),
+                'address':fields.many2one('res.partner.address','Shipper Address'),
+                'trademark':fields.char('Trademark', size=1024, select=1),
+                }
+    _defaults={
+               'active':True
+               }
+ups_account_shipping()
+
+
+class ups_account_shipping_service(osv.osv):
+    _name = "ups.shipping.service.type"
+    _rec_name = "description"
+    _columns = {
+                    'description': fields.char('Description', size=32, required=True, select=1),
+                    'category': fields.char('Category', size=32, select=1),
+                    'shipping_service_code': fields.char('Shipping Service Code', size=8, select=1),
+                    'rating_service_code': fields.char('Rating Service Code', size=8, select=1),
+                    'ups_account_id':fields.many2one('ups.account.shipping','Parent Shipping Account'),
+                }
+ups_account_shipping_service()
+
+
+
+
+class logistic_company(osv.osv):
+    _name = "logistic.company"
+    _inherit="logistic.company"
+    _columns = {
+                    'company_id':fields.many2one('res.company','Company'),
+                    'ups_shipping_account_ids': fields.one2many('ups.account.shipping','logistic_company_id','Shipping Account'),
+                }
+
+
+    def onchange_shipping_number(self, cr, uid, ids, shipping_no,url,context=None):
+        ret={}
+        if url:
+            b=url[url.rindex('/'):len(url)]
+            b=b.strip('/')
+            if re.match("^[0-9]*$",b):
+                url=url[0:url.rindex('/')]
+            url+=('/'+shipping_no)
+            ret['url']=url
+        return{'value':ret}
+
+logistic_company()
+
+
+class res_company(osv.osv):
+        _inherit = "res.company"
+        _columns = {
+                    'logistic_company_ids': fields.one2many('logistic.company','company_id','Shipping Account'),
+                   }
+
+res_company()
+
+
+class shipping_move(osv.osv):
+    _inherit = "shipping.move"
+    _columns = {
+                    'shipper': fields.many2one('ups.account.shipping','Shipper',help='The specific user ID and shipper. Setup in the company configuration.'),
+                }
+shipping_move()
+
+
+
+
+
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

=== added file 'shipping_api_ups/ups_view.xml'