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

[Novapoint Group]

NovaPoint Group has developed this module to add the capability for companies to setup a negotiated shipping option. This is where a company upcharges shipping, and bases shipping on a variety of shipping zones, shippers, and rates.

[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: first explaining our policy for merge proposals, then giving some hints about this specific merge proposal.

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: http://bit.ly/openerp-contrib-mp

Here is the important part:
"""
OpenERP's R&D expects to receive merge proposals from the Community in these areas:
  - patches to correct a bug in an official addons
  - patches to improve an existing official addon, such as extending a feature or adding one

OpenERP's R&D does *not* expect to receive merge proposals from the Community in these areas:
  - addition of an extra feature to an official addons, when the feature
    should really provided by a separate (new) module
  - addition of a new module to the official addons

For these last cases, it is better to put the feature into new modules entirely maintained by their authors in their own Launchpad repository, and published on OpenERP Apps, to be visible by the whole Community. This is totally unrelated to the quality of the proposition: there are tons of great community modules on OpenERP Apps, some of them already downloaded thousands of times!

However, including a module in the official release is a big commitment in terms of review maintenance, support, etc. In addition, it would quickly bloat the OpenERP core if done too often, compromising its agility and maintainability, and thus the future of the product.
On the other hand, by progressively integrating OpenERP Apps better in the product, we should reach the same visibility for Community modules, without incurring these risks.

Therefore the process of including a community module into the official addons is entirely driven by OpenERP R&D based on the product strategy. In addition to features selected by OpenERP Product Managers, features that are considered REQUIRED to use OpenERP in a certain market/domain will also be considered for inclusion.
Deciding whether a feature is REQUIRED is quite subjective, but the following hints are useful:
 - if most established competitors on the given market/domain implement this feature, and
   this domain is normally addressed by official OpenERP addons, then it's likely REQUIRED.
 - on the other hand, if *no* established software competitors on the given market/domain
   implement this feature, then it's probably NOT REQUIRED
This certainly doesn't mean we don't want to innovate (that's the part where Product Managers choose new features!), this is only for deciding that a module is REQUIRED and thus it is *necessary* to include it in the default installations.

Of course, on top of the above, a merge proposal needs to pass the functional and technical review by OpenERP’s R&D, and even though we do our best to process them in a timely fas...

review: Disapprove

Unmerged revisions

5306. By Novapoint Group on 2011-10-06

[Add]: sale_negotiated_shipping module to provide capability for companies to setup a negotiated shipping option

=== added directory 'sale_negotiated_shipping'
=== added file 'sale_negotiated_shipping/Change Log.txt'
--- sale_negotiated_shipping/Change Log.txt	1970-01-01 00:00:00 +0000
+++ sale_negotiated_shipping/Change Log.txt	2011-10-06 16:09:21 +0000
@@ -0,0 +1,18 @@
+===============================================================================
+ Version Change Log (sale_negotiated_shipping)
+===============================================================================
+ 1.4 -> 1.5 (by Vinod on 19 Sept. 2011)
+ 	* Calculation of tax for shipment in invoice and sale order.
+ 	
+ 1.3 -> 1.4 (by Jabir on 28 June 2011)
+ 	* Consider shipping charge on invoice refund
+ 1.2 -> 1.3 (by Jabir on 6 June 2011)
+ 	* Created account moves for shipping charge
+ 1.1 -> 1.2
+ 	*  Wizard to calculate shipping rate
+ 	*  Added total weight, shipping charge, shipping method and ship calculation button on invoice view
+ 	*  Renaming Untaxed to Net Total on invoice view
+ 	*  Adds button in Sale order form to invoke wizard to calculate the shipping rate
+ 	*  Added shipping method on delivery order and delivery products
+ 	*  Adds fields Zone, State and Rate configuration to Ups Zone Map tree view form view and menu
+ 	*  Added menu view and menu for Shipping Rate Configuration,Shipping Rate Card and Ups Shipping Rate
 \ No newline at end of file
 
=== added file 'sale_negotiated_shipping/__init__.py'
--- sale_negotiated_shipping/__init__.py	1970-01-01 00:00:00 +0000
+++ sale_negotiated_shipping/__init__.py	2011-10-06 16:09:21 +0000
@@ -0,0 +1,27 @@
+# -*- 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 sale_negotiate
+import shipping_rate_table
+import invoice_weight
+import wizard
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 \ No newline at end of file
 
=== added file 'sale_negotiated_shipping/__openerp__.py'
--- sale_negotiated_shipping/__openerp__.py	1970-01-01 00:00:00 +0000
+++ sale_negotiated_shipping/__openerp__.py	2011-10-06 16:09:21 +0000
@@ -0,0 +1,44 @@
+# -*- 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': 'Zip',
+    'version': '1.5',
+    'category': 'Generic Modules/Others',
+    'description': """
+    """,
+    'author': 'NovaPoint Group LLC',
+    'website': ' http://www.novapointgroup.com',
+    'depends': ['base','sale','sale_weight'],
+    'init_xml': [],
+    'update_xml': [
+                   'shipping_rate_table_view.xml' ,
+                   'wizard/wizard_shipping_rate_view.xml',
+                   'sale_negotiate_view.xml',
+                   'security/ir.model.access.csv',
+                   'invoice_view.xml',],
+    'demo_xml': [
+    ],
+    'installable': True,
+    'active': False,
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== added file 'sale_negotiated_shipping/invoice_view.xml'
--- sale_negotiated_shipping/invoice_view.xml	1970-01-01 00:00:00 +0000
+++ sale_negotiated_shipping/invoice_view.xml	2011-10-06 16:09:21 +0000
@@ -0,0 +1,73 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+
+		<!--Invoice Form -->
+   		<record id="invoice_form_inherit_1" model="ir.ui.view">
+            <field name="name">account.invoice.form.inherit</field>
+            <field name="model">account.invoice</field>
+            <field name="inherit_id" ref="account.invoice_form"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+               			<xpath expr="//label[@string='']" position="replace">
+               				<field name="total_weight_net"/>
+               				<field name="shipcharge"/>
+               				<field name="ship_method"/>
+					    </xpath>
+					    <xpath expr="//button[@name='button_reset_taxes']" position="replace">
+                            <button colspan="1" name="button_reset_taxes" states="draft" string="Compute Taxes" type="object" groups="base.group_user" icon="terp-stock_format-scientific"/>
+                            <button colspan="1" name="%(action_view_for_shipping_rate_wizard)d" string="Calculate Shipping" type="action" help="Displays the shipping wizard." states="draft" groups="base.group_user" />
+					     </xpath>
+					    
+            </field>
+        </record>
+   		<record id="invoice_supplier_form_inherit_1" model="ir.ui.view">
+            <field name="name">account.invoice.supplier.form.inherit</field>
+            <field name="model">account.invoice</field>
+            <field name="inherit_id" ref="account.invoice_supplier_form"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+               			<xpath expr="//label[@string='']" position="replace">
+               				<field name="total_weight_net"/>
+               				<field name="shipcharge"/>
+               				<field name="ship_method"/>
+					    </xpath>
+					    <xpath expr="//button[@name='button_reset_taxes']" position="replace">
+                            <button colspan="1" name="button_reset_taxes" states="draft" string="Compute Taxes" type="object" groups="base.group_user" icon="terp-stock_format-scientific"/>
+                            <button colspan="1" name="%(action_view_for_shipping_rate_wizard)d" string="Calculate Shipping" type="action" help="Displays the shipping wizard." states="draft" groups="base.group_user" />
+					     </xpath>
+					    
+            </field>
+        </record>
+        
+        
+        <!-- Renaming Untaxed to Net Total on invoice view-->
+        
+		 <record id="account_invoice_view_changes_form_inherit01" model="ir.ui.view">
+	       <field name="name">account_invoice_view_changes_form_inherit01</field>
+	       <field name="model">account.invoice</field>
+	       <field name="type">form</field>
+	       <field name="inherit_id" ref="account.invoice_form"/>
+	       <field name="arch" type="xml">
+	           <xpath expr="//field[@name='amount_untaxed']" position="replace">
+					<field name="amount_untaxed" string="Net Total"/>
+				</xpath>
+	
+			 </field>
+		 </record>
+		 <record id="invoice_supplier_form_inherit01" model="ir.ui.view">
+	       <field name="name">invoice_supplier_form_inherit01</field>
+	       <field name="model">account.invoice</field>
+	       <field name="type">form</field>
+	       <field name="inherit_id" ref="account.invoice_supplier_form"/>
+	       <field name="arch" type="xml">
+	           <xpath expr="//field[@name='amount_untaxed']" position="replace">
+					<field name="amount_untaxed" string="Net Total"/>
+				</xpath>
+	
+			 </field>
+		 </record>
+
+        
+    </data>
+</openerp>
 \ No newline at end of file
 
=== added file 'sale_negotiated_shipping/invoice_weight.py'
--- sale_negotiated_shipping/invoice_weight.py	1970-01-01 00:00:00 +0000
+++ sale_negotiated_shipping/invoice_weight.py	2011-10-06 16:09:21 +0000
@@ -0,0 +1,201 @@
+# -*- 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/>
+#
+##############################################################################
+
+"""Compute the net weight of sale orders."""
+
+from osv import osv, fields
+import decimal_precision as dp
+import time
+
+class account_invoice(osv.osv):
+    """Add the total net weight to the object "Sale Order"."""
+
+    _inherit = "account.invoice"
+
+    def _total_weight_net(self, cr, uid, ids, field_name, arg, context):
+        """Compute the total net weight of the given Invoice."""
+        result = {}
+        for invoice in self.browse(cr, uid, ids, context=context):
+            result[invoice.id] = 0.0
+            for line in invoice.invoice_line:
+                if line.product_id:
+                    result[invoice.id] += line.weight_net or 0.0
+        return result
+
+    def _get_invoice(self, cr, uid, ids, context={}):
+        """Get the invoice ids of the given Invoice Lines."""
+        result = {}
+        for line in self.pool.get('account.invoice.line').browse(cr, uid, ids,
+            context=context):
+            result[line.invoice_id.id] = True
+        return result.keys()
+    
+    def _amount_shipment_tax(self, cr, uid, shipment_taxes, shipment_charge):
+        val = 0.0
+        for c in self.pool.get('account.tax').compute_all(cr, uid, shipment_taxes, shipment_charge, 1)['taxes']:
+            val += c.get('amount', 0.0)
+        return val
+    
+    def _amount_all(self, cr, uid, ids, name, args, context=None):
+        res = super(account_invoice, self)._amount_all(cr, uid, ids, name, args, context=context)
+        for invoice in self.browse(cr, uid, ids, context=context):
+            if invoice.ship_method_id:
+                res[invoice.id]['amount_total'] = res[invoice.id]['amount_untaxed'] + res[invoice.id]['amount_tax'] + invoice.shipcharge
+        return res
+    
+    def _get_invoice_tax(self, cr, uid, ids, context=None):
+        invoice = self.pool.get('account.invoice')
+        return super(account_invoice, invoice)._get_invoice_tax(cr, uid, ids, context=context)
+    
+    def _get_invoice_line(self, cr, uid, ids, context=None):
+        invoice = self.pool.get('account.invoice')
+        return super(account_invoice, invoice)._get_invoice_line(cr, uid, ids, context=context)
+    
+    def _get_invoice_from_line(self, cr, uid, ids, context=None):
+        invoice = self.pool.get('account.invoice')
+        return super(account_invoice, invoice)._get_invoice_from_line(cr, uid, ids, context=context)
+    
+    def finalize_invoice_move_lines(self, cr, uid, invoice_browse, move_lines):
+        """finalize_invoice_move_lines(cr, uid, invoice, move_lines) -> move_lines
+        Hook method to be overridden in additional modules to verify and possibly alter the
+        move lines to be created by an invoice, for special cases.
+        :param invoice_browse: browsable record of the invoice that is generating the move lines
+        :param move_lines: list of dictionaries with the account.move.lines (as for create())
+        :return: the (possibly updated) final move_lines to create for this invoice
+        """
+        move_lines = super(account_invoice, self).finalize_invoice_move_lines(cr, uid, invoice_browse, move_lines)
+        if invoice_browse.type == "out_refund":
+            account = invoice_browse.account_id.id
+        else:
+            account = invoice_browse.sale_account_id.id
+        if invoice_browse.sale_account_id and invoice_browse.shipcharge:
+            lines1={
+                    'analytic_account_id' :  False,
+                    'tax_code_id' :  False,
+                    'analytic_lines' :  [],
+                    'tax_amount' :  False,
+                    'name' :  'Shipping Charge',
+                    'ref' : '',
+                    'currency_id' :  False,
+                    'credit' :  invoice_browse.shipcharge,
+                    'product_id' :  False,
+                    'date_maturity' : False,
+                    'debit' : False,
+                    'date' : time.strftime("%Y-%m-%d"),
+                    'amount_currency' : 0,
+                    'product_uom_id' :  False,
+                    'quantity' : 1,
+                    'partner_id' : invoice_browse.partner_id.id,
+                    'account_id' : account,}
+            
+            move_lines.append((0,0,lines1))
+            # Retrieve the existing debit line if one exists
+            has_entry = False
+            for move_line in move_lines:
+                journal_entry = move_line[2]
+                if journal_entry['account_id'] == invoice_browse.journal_id.default_debit_account_id.id:
+                    journal_entry['debit'] += invoice_browse.shipcharge
+                    has_entry = True
+                    break
+            # If debit line does not exist create one. Generally this condition will not happen. Just a fail-safe option    
+            if not has_entry:
+                lines2={
+                        'analytic_account_id' :  False,
+                        'tax_code_id' :  False,
+                        'analytic_lines' :  [],
+                        'tax_amount' :  False,
+                        'name' :  '/',
+                        'ref' : '',
+                        'currency_id' :  False,
+                        'credit' :  False,
+                        'product_id' :  False,
+                        'date_maturity' : False,
+                        'debit' : invoice_browse.shipcharge,
+                        'date' : time.strftime("%Y-%m-%d"),
+                        'amount_currency' : 0,
+                        'product_uom_id' :  False,
+                        'quantity' : 1,
+                        'partner_id' : invoice_browse.partner_id.id,
+                        'account_id' : invoice_browse.journal_id.default_debit_account_id.id,}
+            
+                move_lines.append((0,0,lines2))
+        return move_lines
+    
+    
+    
+    
+    _columns = {
+                
+        'amount_total': fields.function(_amount_all, method=True, digits_compute=dp.get_precision('Account'), string='Total',
+            store={
+                'account.invoice': (lambda self, cr, uid, ids, c={}: ids, ['invoice_line','shipcharge'], -10),
+                'account.invoice.tax': (_get_invoice_tax, None, -10),
+                'account.invoice.line': (_get_invoice_line, ['price_unit','invoice_line_tax_id','quantity','discount','invoice_id'], -10),
+            }, multi='all'),
+
+        'total_weight_net': fields.function(_total_weight_net, method=True,
+            readonly=True, string='Total Net Weight',
+            help="The cumulated net weight of all the invoice lines.",
+            store={
+                # Low priority to compute this before fields in other modules
+                'account.invoice': (lambda self, cr, uid, ids, c={}: ids,
+                     ['invoice_line'], 10),
+                'account.invoice.line': (_get_invoice,
+                     ['quantity', 'product_id'], 10),
+            },
+        ),
+        'shipcharge':  fields.float('Shipping Cost', readonly=True),
+        'ship_method': fields.char('Shipping Method',size=128, readonly=True),
+        'ship_method_id': fields.many2one('shipping.rate.config','Shipping Method', readonly=True),
+        'sale_account_id':fields.many2one('account.account','Shipping Account',help='This account represents the g/l account for booking shipping income.', readonly=True)
+
+    }
+account_invoice()
+
+# Record the net weight of the order line
+class invoice_line(osv.osv):
+    """Add the net weight to the object "Invoice Line"."""
+    _inherit = 'account.invoice.line'
+
+    def _weight_net(self, cr, uid, ids, field_name, arg, context):
+        """Compute the net weight of the given Invoice Lines."""
+        result = {}
+        for line in self.browse(cr, uid, ids, context=context):
+            result[line.id] = 0.0
+
+            if line.product_id:
+                result[line.id] += (line.product_id.weight_net
+                     * line.quantity)# / line.product_uom.factor)
+        return result
+    _columns = {
+        'weight_net': fields.function(_weight_net, method=True,
+            readonly=True, string='Net Weight', help="The net weight in Kg.",
+            store={
+                # Low priority to compute this before fields in other modules
+               'account.invoice.line': (lambda self, cr, uid, ids, c={}: ids,
+                   ['quantity', 'product_id'], -11),
+            },
+        ),
+
+    }
+invoice_line()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== added file 'sale_negotiated_shipping/sale_negotiate.py'
--- sale_negotiated_shipping/sale_negotiate.py	1970-01-01 00:00:00 +0000
+++ sale_negotiated_shipping/sale_negotiate.py	2011-10-06 16:09:21 +0000
@@ -0,0 +1,106 @@
+# -*- 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 decimal_precision as dp
+import time
+
+#Shipping rate configuration model
+class shipping_rate_config(osv.osv):
+    _name = 'shipping.rate.config'
+    _description = "Configuration for shipping rate"
+    _rec_name = 'shipmethodname'
+    _columns = {
+                'real_id':fields.integer('ID',readonly=True, ),
+                'shipmethodname':fields.char('Shipping Method Name',size=128,help='Shipping method name. Displayed in the wizard.'),
+                'active':fields.boolean('Active',help='Indicates whether a shipping method is active'),
+                'use':fields.boolean('Select',),
+                'calc_method':fields.selection([('country_weight','Country & Weight'),('state_zone_weight','State-Zone-Weight'),('manual','Manually Calculate')],'Shipping Calculation Method',help='Shipping method name. Displayed in the wizard.'),
+                'ups_shipping_wizard': fields.integer('Shipping Wizard'),
+                'rate_card_id':fields.many2one('ups.shipping.rate.card','Shipping Rate Card'),
+                'zone_map_ids':fields.one2many('ups.zone.map','rate_config_id','Zone Map'),
+                'account_id':fields.many2one('account.account','Account',help='This account represents the g/l account for booking shipping income.'),
+                # Added to include tax configuration for shipment
+                'shipment_tax_ids': fields.many2many('account.tax', 'shipment_tax_rel', 'shipment_id', 'tax_id', 'Taxes', domain=[('parent_id','=',False)]),
+    }
+    _defaults = {
+                 'calc_method':'country_weight'
+                }
+
+shipping_rate_config()
+
+#    State - Zone table
+class zone_map(osv.osv):
+    _name = 'ups.zone.map'
+    _description = "Zone Mapping Table"
+    _rec_name = 'zone'
+    _columns = {
+                'zone':fields.integer('Zone'),
+                'state_id':fields.many2one('res.country.state','State / Zone'),
+                'rate_config_id':fields.many2one('shipping.rate.config','Shipping Rate Configuration')
+    }
+    
+zone_map()
+'''
+Adding shipping method field on delivery order and delivery products
+'''
+class stock_picking(osv.osv):
+    
+    _inherit = "stock.picking"
+    def _get_sale_order(self, cr, uid, ids, context={}):
+        result = []
+        for id in ids:
+            stock_pick_ids = self.pool.get('stock.picking').search(cr,uid,[('sale_id','=',id)])
+            result += stock_pick_ids
+        result = list(set(result))
+        return result
+    _columns = {
+        'ship_method':  fields.related('sale_id', 'ship_method', string='Shipping Method', type='char', size=128, #store=True
+                store={
+                'sale.order': (_get_sale_order, ['ship_method'], -10),}
+        ),
+        }
+
+stock_picking()
+class stock_move(osv.osv):
+    
+    _inherit = "stock.move"
+    
+    def _get_sale_order(self, cr, uid, ids, context={}):
+        result = []
+        move_ids = []
+        for id in ids:
+            stock_pick_ids = self.pool.get('stock.picking').search(cr,uid,[('sale_id','=',id)])
+            if stock_pick_ids:
+                move_ids += self.pool.get('stock.move').search(cr,uid,[('picking_id','in',stock_pick_ids)])
+        move_ids = list(set(move_ids))
+        return move_ids
+    _columns = {
+        'ship_method':  fields.related('picking_id','sale_id', 'ship_method', string='Shipping Method', type='char', size=128,# store=True
+                store={
+                'sale.order': (_get_sale_order, ['ship_method'], -10),}
+        ),
+        }
+
+stock_move()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
 
=== added file 'sale_negotiated_shipping/sale_negotiate_view.xml'
--- sale_negotiated_shipping/sale_negotiate_view.xml	1970-01-01 00:00:00 +0000
+++ sale_negotiated_shipping/sale_negotiate_view.xml	2011-10-06 16:09:21 +0000
@@ -0,0 +1,184 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+    	<!--Sale order form-->
+
+		<!--Adds button in Sale order form to invoke wizard to calculate the shipping rate-->
+		<record model="ir.ui.view" id="sale_weight_form_inherit">
+			<field name="name">sale_weight.view_form.inherit</field>
+			<field name="model">sale.order</field>
+			<field name="inherit_id" ref="sale_weight.sale_weight_form" />
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+				<field name="total_weight_net" position="replace"/>
+			</field>
+		</record>
+
+
+   		<record id="view_sale_order_inherit_1" model="ir.ui.view">
+            <field name="name">view_sale_order_inherit_1</field>
+            <field name="model">sale.order</field>
+            <field name="inherit_id" ref="sale.view_order_form"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+
+               			<xpath expr="//group[@colspan='10']" position="replace">
+                             <button name="button_dummy" states="draft" string="Compute" type="object" icon="gtk-execute" colspan="2"/>
+	  						<button name="%(action_view_for_shipping_rate_wizard)d" string="Calculate Shipping" icon="terp-sale" type="action" help="Displays the shipping wizard." states="draft" colspan="2" />
+               			   <group col="1" colspan="2">
+               			   		<field name="ship_method"/>
+								<field name="total_weight_net" />
+                            </group>
+               			   <group col="2" colspan="2">
+                                <field name="amount_untaxed" sum="Net Total" string="Net Total"/>
+			  					<field name="shipcharge" help="The shipping charge on this order."/>
+                                <field name="amount_tax"/>
+                                <field name="amount_total"/>
+                                <label colspan="1"/><button name="%(sale.action_view_sale_advance_payment_inv)d" string="Advance Invoice"
+                                    type="action" icon="gtk-execute" states="draft,manual" groups="base.group_extended"/>
+                            </group>
+
+
+					     </xpath>
+            </field>
+        </record>
+        <!-- Delivery Orders -->
+        <!-- Form -->
+   		<record id="view_picking_out_form_inherit" model="ir.ui.view">
+            <field name="name">stock.picking.out.form.inherit</field>
+            <field name="model">stock.picking</field>
+            <field name="inherit_id" ref="stock.view_picking_out_form"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+               			<xpath expr="//field[@name='company_id']" position="after">
+			  				<field name="ship_method"/>
+					     </xpath>
+            </field>
+        </record>
+        <!-- Tree -->
+        <record id="view_picking_out_tree_inherit" model="ir.ui.view">
+            <field name="name">stock.picking.out.tree.inherit</field>
+            <field name="model">stock.picking</field>
+            <field name="inherit_id" ref="stock.view_picking_out_tree"/>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+             	<xpath expr="//field[@name='backorder_id']" position="before">
+	  				<field name="ship_method"/>
+			     </xpath>
+            </field>
+        </record>
+        <!-- Search -->
+        <record id="view_picking_internal_search_inherit" model="ir.ui.view">
+            <field name="name">stock.picking.internal.search.inherit</field>
+            <field name="model">stock.picking</field>
+            <field name="type">search</field>
+            <field name="inherit_id" ref="stock.view_picking_out_search"/>
+            <field name="arch" type="xml">
+             	<xpath expr="//filter[@string='Journal']" position="after">
+                     <separator orientation="vertical" />
+                     <filter string="Shipping Method" icon="terp-product" domain="[]" context="{'group_by':'ship_method'}"  groups="base.group_extended"/>
+			     </xpath>
+            </field>
+        </record>
+
+
+        <!-- Deliver Products -->
+        <!-- Tree -->
+       <record id="view_move_tree_reception_picking_inherit" model="ir.ui.view">
+            <field name="name">stock.move.tree2.inherit</field>
+            <field name="model">stock.move</field>
+            <field name="type">tree</field>
+            <field name="inherit_id" ref="stock.view_move_tree_reception_picking"/>
+            <field name="priority" eval="6" />
+            <field name="arch" type="xml">
+             	<xpath expr="//field[@name='date']" position="after">
+	  				<field name="ship_method"/>
+			     </xpath>
+            </field>
+        </record>
+
+        <!-- Form -->
+        <record id="view_move_form_inherit" model="ir.ui.view">
+            <field name="name">stock.move.form.inherit</field>
+            <field name="model">stock.move</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="stock.view_move_form"/>
+            <field name="arch" type="xml">
+             	<xpath expr="//group[@col='4']" position="after">
+                    <group colspan="2" col="2" groups="base.group_extended">
+                        <separator string="Shipping" colspan="4" groups="base.group_extended"/>
+	  					<field name="ship_method" readonly="1"/>
+                    </group>
+			     </xpath>
+            </field>
+        </record>
+		<!-- Search -->
+        <record id="view_move_search_reception_outcoming_picking_inherit" model="ir.ui.view">
+            <field name="name">stock.move.outgoing.search2.inherit</field>
+            <field name="model">stock.move</field>
+            <field name="type">search</field>
+            <field name="inherit_id" ref="stock.view_move_search_reception_outcoming_picking"/>
+            <field eval="8" name="priority"/>
+            <field name="arch" type="xml">
+             	<xpath expr="//filter[@string='Order Date']" position="after">
+                     <separator orientation="vertical" />
+                     <filter string="Shipping Method" icon="terp-product" domain="[]" context="{'group_by':'ship_method'}"  groups="base.group_extended"/>
+			     </xpath>
+            </field>
+        </record>
+
+		<!--Zone Map Tree View-->
+
+        <!-- Adds fields Zone, State and Rate configuration to Ups Zone Map Tree View -->
+
+        <record id="zone_map_tree" model="ir.ui.view">
+            <field name="name">ups.zone.map.tree</field>
+            <field name="model">ups.zone.map</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string='Zone Map'>
+					<field name="zone" select="1"/>
+					<field name="state_id" select="1"/>
+					<field name="rate_config_id" select="1"/>
+                </tree>
+            </field>
+        </record>
+
+		<!--Zone Map Form-->
+
+		<!--Adds fields Zone, State and Rate configuration to Ups Zone Map Form View-->
+
+	<record id="zone_map_form" model="ir.ui.view">
+            <field name="name">ups.zone.map.form</field>
+            <field name="model">ups.zone.map</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string='Zone Map'>
+					<field name="zone" select="1"/>
+					<field name="state_id" select="1"/>
+					<field name="rate_config_id" select="1"/>
+                </form>
+            </field>
+        </record>
+
+		<!--Zone Map Action Record -->
+
+    <record id="zone_map_action" model="ir.actions.act_window">
+            <field name="name">Zone Map</field>
+            <field name="res_model">ups.zone.map</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="zone_map_tree"/>
+         </record>
+
+		<!-- Menu item for for Zone Map under the Menu Localisation-->
+
+        <menuitem
+            id="zone_map_menu"
+            name="Zone Map"
+            parent="negotiated_shipping_config"
+        	action="zone_map_action" />
+
+
+       </data>
+</openerp>
 \ No newline at end of file
 
=== added directory 'sale_negotiated_shipping/security'
=== added file 'sale_negotiated_shipping/security/ir.model.access.csv'
--- sale_negotiated_shipping/security/ir.model.access.csv	1970-01-01 00:00:00 +0000
+++ sale_negotiated_shipping/security/ir.model.access.csv	2011-10-06 16:09:21 +0000
@@ -0,0 +1,17 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"security_ups_shipping_rate_card_salesman","security.ups.shipping.rate.card.salesman","model_ups_shipping_rate_card","base.group_sale_salesman",1,1,0,0
+"security_ups_shipping_rate_card_erp_manager","security.ups.shipping.rate.card.erp.manager","model_ups_shipping_rate_card","base.group_erp_manager",1,1,1,1
+"security_ups_shipping_rate_card_manager","security.ups.shipping.rate.card.manager","model_ups_shipping_rate_card","base.group_sale_manager",1,1,1,1
+,,,,,,,
+"security_ups_shipping_rate_salesman","security.ups.shipping.rate.salesman","model_ups_shipping_rate","base.group_sale_salesman",1,1,0,0
+"security_ups_shipping_rate_erp_manager","security.ups.shipping.rate.erp.manager","model_ups_shipping_rate","base.group_erp_manager",1,1,1,1
+"security_ups_shipping_rate_manager","security.ups.shipping.rate.manager","model_ups_shipping_rate","base.group_sale_manager",1,1,1,1
+,,,,,,,
+"security_ups_shipping_rate_config_salesman","security.ups.shipping.rate.config.salesman","model_shipping_rate_config","base.group_sale_salesman",1,1,0,0
+"security_ups_shipping_rate_config_erp_manager","security.ups.shipping.rate.config.erp.manager","model_shipping_rate_config","base.group_erp_manager",1,1,1,1
+"security_ups_shipping_rate_config_manager","security.ups.shipping.rate.config.manager","model_shipping_rate_config","base.group_sale_manager",1,1,1,1
+,,,,,,,
+"security_ups_zone_map_salesman","security.ups.zone.map.salesman","model_ups_zone_map","base.group_sale_salesman",1,1,0,0
+"security_ups_zone_map_erp_manager","security.ups.zone.map.erp.manager","model_ups_zone_map","base.group_erp_manager",1,1,1,1
+"security_ups_zone_map_manager","security.ups.zone.map.manager","model_ups_zone_map","base.group_sale_manager",1,1,1,1
+
 
=== added file 'sale_negotiated_shipping/security/sale_security.xml'
--- sale_negotiated_shipping/security/sale_security.xml	1970-01-01 00:00:00 +0000
+++ sale_negotiated_shipping/security/sale_security.xml	2011-10-06 16:09:21 +0000
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+	<data noupdate="0">
+
+	    <record id="group_shipping_manager" model="res.groups">
+	        <field name="name">Shipping / Manager</field>
+	    </record>
+	    <record id="group_shipping_user" model="res.groups">
+	        <field name="name">Shipping / User</field>
+	    </record>
+
+	</data>
+</openerp>
 
=== added file 'sale_negotiated_shipping/shipping_rate_table.py'
--- sale_negotiated_shipping/shipping_rate_table.py	1970-01-01 00:00:00 +0000
+++ sale_negotiated_shipping/shipping_rate_table.py	2011-10-06 16:09:21 +0000
@@ -0,0 +1,175 @@
+# -*- 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 decimal_precision as dp
+import time
+
+
+class shipping_rate_card(osv.osv):
+    _name = 'ups.shipping.rate.card'
+    _description = "Ground Shipping Calculation Table"
+    _columns = {
+                'name':fields.char('Shipping Method',size=128,required=True),
+                'from_date':fields.datetime('From Date', ),
+                'to_date':fields.datetime('To Date', ),
+                'rate_ids': fields.one2many('ups.shipping.rate','card_id','Shipping Rates', required=True),
+    }
+    
+shipping_rate_card()
+
+class shipping_rate(osv.osv):
+    _name = 'ups.shipping.rate'
+    _description = "Shipping Calculation Table"
+    _columns = {
+                'name':fields.char('Shipping Method',size=128),
+                'from_weight': fields.integer('From Weight', required=True),
+                'to_weight': fields.integer('To Weight'),
+                'charge': fields.float('Shipping Charge'),
+                'over_cost': fields.float('Shipping Charge per pound over'),
+                'country_id':fields.many2one('res.country','Country'),
+                'zone':fields.integer('Zone', required=True),
+                'card_id':fields.many2one('ups.shipping.rate.card','Shipping Table')
+    }
+    
+shipping_rate()
+
+class sale_order(osv.osv):
+    _name = "sale.order"
+    _inherit="sale.order"
+    _description = "Sale Order"
+    
+    def _make_invoice(self, cr, uid, order, lines, context=None):
+        inv_id = super(sale_order, self)._make_invoice(cr, uid, order, lines, context=None)
+        if inv_id and order._table_name == 'sale.order':
+            if order.sale_account_id:
+                self.pool.get('account.invoice').write(cr,uid,inv_id,{
+                                                        'shipcharge':order.shipcharge,
+                                                        'ship_method':order.ship_method,
+                                                        'ship_method_id':order.ship_method_id.id,
+                                                        'sale_account_id':order.sale_account_id.id,
+                                                        })
+                self.pool.get('account.invoice').button_reset_taxes(cr, uid, [inv_id], context=context)
+                    
+        return inv_id
+    
+    def _get_order(self, cr, uid, ids, context=None):
+        return super(sale_order, self)._get_order(cr, uid, ids, context=context)
+    
+    def _amount_shipment_tax(self, cr, uid, shipment_taxes, shipment_charge):
+        val = 0.0
+        for c in self.pool.get('account.tax').compute_all(cr, uid, shipment_taxes, shipment_charge, 1)['taxes']:
+            val += c.get('amount', 0.0)
+        return val
+    
+    def _amount_all(self, cr, uid, ids, field_name, arg, context=None):
+        cur_obj = self.pool.get('res.currency')
+        res = super(sale_order, self)._amount_all(cr, uid, ids, field_name, arg, context=context)
+        for order in self.browse(cr, uid, ids, context=context):
+            cur = order.pricelist_id.currency_id
+            if order.ship_method_id:
+                if order.ship_method_id.shipment_tax_ids and len(order.ship_method_id.shipment_tax_ids) > 0:
+                    val = self._amount_shipment_tax(cr, uid, order.ship_method_id.shipment_tax_ids, order.shipcharge)
+                    res[order.id]['amount_tax'] += cur_obj.round(cr, uid, cur, val)
+                res[order.id]['amount_total'] = res[order.id]['amount_untaxed'] + res[order.id]['amount_tax'] + order.shipcharge
+        return res
+    
+    _columns = {
+                'shipcharge':  fields.float('Shipping Cost', readonly=True),
+                'ship_method': fields.char('Shipping Method',size=128, readonly=True),
+                'ship_method_id': fields.many2one('shipping.rate.config','Shipping Method', readonly=True),
+                'sale_account_id':fields.many2one('account.account','Shipping Account',help='This account represents the g/l account for booking shipping income.', readonly=True),
+                'amount_untaxed': fields.function(_amount_all, method=True, digits_compute= dp.get_precision('Sale Price'), string='Untaxed Amount',
+                store = {
+                    'sale.order': (lambda self, cr, uid, ids, c={}: ids, ['order_line', 'ship_method_id'], 10),
+                    'sale.order.line': (_get_order, ['price_unit', 'tax_id', 'discount', 'product_uom_qty'], 10),
+                },
+                multi='sums', help="The amount without tax."),
+                'amount_tax': fields.function(_amount_all, method=True, digits_compute= dp.get_precision('Sale Price'), string='Taxes',
+                store = {
+                    'sale.order': (lambda self, cr, uid, ids, c={}: ids, ['order_line', 'ship_method_id'], 10),
+                    'sale.order.line': (_get_order, ['price_unit', 'tax_id', 'discount', 'product_uom_qty'], 10),
+                },
+                multi='sums', help="The tax amount."),
+                'amount_total': fields.function(_amount_all, method=True, digits_compute= dp.get_precision('Sale Price'), string='Total',
+                store = {
+                    'sale.order': (lambda self, cr, uid, ids, c={}: ids, ['order_line', 'ship_method_id'], 10),
+                    'sale.order.line': (_get_order, ['price_unit', 'tax_id', 'discount', 'product_uom_qty'], 10),
+                },
+                multi='sums', help="The total amount."),
+            }
+    
+sale_order()
+
+# Added to calculate tax for shipment in invoice
+class account_invoice_tax_inherit(osv.osv):
+    _name = "account.invoice.tax"
+    _inherit = "account.invoice.tax"
+    
+    def compute(self, cr, uid, invoice_id, context=None):
+        tax_grouped = super(account_invoice_tax_inherit, self).compute(cr, uid, invoice_id, context=context)
+        tax_obj = self.pool.get('account.tax')
+        cur_obj = self.pool.get('res.currency')
+        inv = self.pool.get('account.invoice').browse(cr, uid, invoice_id, context=context)
+        cur = inv.currency_id
+        company_currency = inv.company_id.currency_id.id
+
+        if inv.ship_method_id and inv.ship_method_id.shipment_tax_ids and len(inv.ship_method_id.shipment_tax_ids) > 0:
+            for tax in tax_obj.compute_all(cr, uid, inv.ship_method_id.shipment_tax_ids, inv.shipcharge, 1)['taxes']:
+                val={}
+                val['invoice_id'] = inv.id
+                val['name'] = tax['name']
+                val['amount'] = tax['amount']
+                val['manual'] = False
+                val['sequence'] = tax['sequence']
+                val['base'] = tax['price_unit'] * 1
+    
+                if inv.type in ('out_invoice','in_invoice'):
+                    val['base_code_id'] = tax['base_code_id']
+                    val['tax_code_id'] = tax['tax_code_id']
+                    val['base_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, val['base'] * tax['base_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')}, round=False)
+                    val['tax_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, val['amount'] * tax['tax_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')}, round=False)
+                    val['account_id'] = tax['account_collected_id'] or line.account_id.id
+                else:
+                    val['base_code_id'] = tax['ref_base_code_id']
+                    val['tax_code_id'] = tax['ref_tax_code_id']
+                    val['base_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, val['base'] * tax['ref_base_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')}, round=False)
+                    val['tax_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, val['amount'] * tax['ref_tax_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')}, round=False)
+                    val['account_id'] = tax['account_paid_id'] or line.account_id.id
+    
+                key = (val['tax_code_id'], val['base_code_id'], val['account_id'])
+                if not key in tax_grouped:
+                    tax_grouped[key] = val
+                else:
+                    tax_grouped[key]['amount'] += val['amount']
+                    tax_grouped[key]['base'] += val['base']
+                    tax_grouped[key]['base_amount'] += val['base_amount']
+                    tax_grouped[key]['tax_amount'] += val['tax_amount']
+
+            for t in tax_grouped.values():
+                t['base'] = cur_obj.round(cr, uid, cur, t['base'])
+                t['amount'] = cur_obj.round(cr, uid, cur, t['amount'])
+                t['base_amount'] = cur_obj.round(cr, uid, cur, t['base_amount'])
+                t['tax_amount'] = cur_obj.round(cr, uid, cur, t['tax_amount'])
+        return tax_grouped
+    
+account_invoice_tax_inherit()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== added file 'sale_negotiated_shipping/shipping_rate_table_view.xml'
--- sale_negotiated_shipping/shipping_rate_table_view.xml	1970-01-01 00:00:00 +0000
+++ sale_negotiated_shipping/shipping_rate_table_view.xml	2011-10-06 16:09:21 +0000
@@ -0,0 +1,167 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+	<!--Adds Menu for the Shipping Configuration-->
+    <menuitem id="negotiated_shipping_config" parent="base.menu_base_config" name="Negotiated Shipping" sequence="55" groups="base.group_erp_manager,base.group_sale_manager,base.group_system"/>
+
+	<!--SHIPPING RATE-->
+	<!--Tree view for Ups Shipping Rate-->
+
+    <record id="tree_view_for_shipping_rate" model="ir.ui.view">
+            <field name="name">tree.view.for.shipping.rate</field>
+            <field name="model">ups.shipping.rate</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string='Shipping Rate'>
+                	<field name="name"/>
+					<field name="from_weight"/>
+					<field name="to_weight"/>
+					<field name="charge"/>
+					<field name="over_cost"/>
+					<field name="country_id"/>
+					<field name="zone"/>
+                </tree>
+            </field>
+        </record>
+
+	<!--Form view for Ups Shipping Rate-->
+
+	<record id="form_view_for_shipping_rate" model="ir.ui.view">
+            <field name="name">form.view.for.shipping.rate</field>
+            <field name="model">ups.shipping.rate</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string='Shipping Rate'>
+                <group colspan="4" col="4" string="">
+                	<field name="name" select="1" colspan="1"/><newline/>
+					<field name="from_weight" select="1" colspan="1"/>
+					<field name="to_weight" select="1" colspan="1"/><newline/>
+					<field name="charge" select="1" colspan="1"/>
+					<field name="over_cost" select="1" colspan="1"/><label colspan="3"/><newline/>
+					<field name="country_id" select="1" colspan="1"/>
+					<field name="zone" attrs="{'invisible':[('name', '=', 'ups_ground')]}" />
+					<field name="card_id"/>
+				</group>
+                </form>
+            </field>
+        </record>
+
+
+	<!--Action Record for Shipping Rate-->
+
+	<record id="action_for_shipping_rate" model="ir.actions.act_window">
+            <field name="name">Shipping Rates</field>
+            <field name="res_model">ups.shipping.rate</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="tree_view_for_shipping_rate"/>
+         </record>
+         
+	<!-- Shipping Rate menu-->
+    <menuitem id="shipping_rate" parent="negotiated_shipping_config" sequence="55" action="action_for_shipping_rate"  groups="base.group_erp_manager,base.group_sale_manager,base.group_system"/>
+
+	<!--SHIPPING RATE CARD-->
+    <!-- Shipping Rate Card List View-->
+    
+    <record id="tree_view_shipping_rate_table" model="ir.ui.view">
+            <field name="name">tree.ups.shipping.rate.card</field>
+            <field name="model">ups.shipping.rate.card</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree>
+                    <field name="name"  select="1"/>
+					<field name="from_date"  select="1" colspan="1"/>
+					<field name="to_date"  select="1" colspan="1"/>
+                </tree>
+            </field>
+        </record>
+
+    	<!-- Shipping Rate  Card Form View-->
+
+	<record id="form_view_shipping_rate_table" model="ir.ui.view">
+            <field name="name">form.ups.shipping.rate.card</field>
+            <field name="model">ups.shipping.rate.card</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form>
+                    <field name="name"  select="1" colspan="2"/><newline/>
+					<field name="from_date"  select="1" colspan="1"/>
+					<field name="to_date"  select="1" colspan="1"/><newline/>
+                    <separator string="Shipping Rates" colspan="4"/>
+					<field name="rate_ids" select="1" colspan="4" nolabel="1"/>
+                </form>
+            </field>
+        </record>
+
+
+		<!--Action Record for Shipping Rate Card-->
+
+	<record id="action_shipping_rate_table" model="ir.actions.act_window">
+            <field name="name">Shipping Methods</field>
+            <field name="res_model">ups.shipping.rate.card</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="tree_view_shipping_rate_table"/>
+         </record>
+    <menuitem id="shipping_rate_table" name="Shipping Methods"  parent="negotiated_shipping_config" sequence="65" action="action_shipping_rate_table" groups="base.group_erp_manager,base.group_sale_manager,base.group_system" />
+
+	<!--SHIPPING RATE CONFIGURATION-->
+    <!-- Shipping Rate Configuration List View-->
+    <record id="tree_view_shipping_rate_config" model="ir.ui.view">
+            <field name="name">tree.shipping.rate.config</field>
+            <field name="model">shipping.rate.config</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree editable="top">
+					<field name="shipmethodname"/>
+                    <field name="active"  select="1"/>
+					<field name="calc_method"/>
+					<field name="rate_card_id"/>
+					<field name="account_id"  required="1"/>
+
+                </tree>
+            </field>
+        </record>
+
+    	<!-- Shipping Rate Configuration Form View-->
+
+	<record id="form_view_shipping_rate_config" model="ir.ui.view">
+            <field name="name">form.shipping.rate.config</field>
+            <field name="model">shipping.rate.config</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form>
+						<field name="shipmethodname"  select="1"  colspan="2"/>
+	                    <field name="active"  select="1" colspan="2"/>
+						<field name="calc_method"  select="1" colspan="2"/>
+						<field name="rate_card_id"  select="1" colspan="2"/>
+						<field name="account_id"  select="1" colspan="2" required="1"/>
+						<field name="shipment_tax_ids" colspan="2"/>
+						<newline/>
+                	<group height="425" colspan="6" col="6">
+					<field name="zone_map_ids" attrs="{'invisible':[('calc_method','!=','state_zone_weight')]}" nolabel="1">
+						<tree string="Zone Map">
+							<field name="zone"/>
+							<field name="state_id"/>
+						</tree>
+					</field>
+					</group>
+                </form>
+            </field>
+        </record>
+
+
+		<!--Action Record for Shipping Rate Configuration and Menu-->
+
+	<record id="action_shipping_rate_config" model="ir.actions.act_window">
+            <field name="name">Shipping Rate Configuration</field>
+            <field name="res_model">shipping.rate.config</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="tree_view_shipping_rate_config"/>
+         </record>
+         
+    <menuitem id="shipping_rate_config" name="Shipping Rate Configuration"  parent="negotiated_shipping_config" sequence="75" action="action_shipping_rate_config"  groups="base.group_erp_manager,base.group_sale_manager,base.group_system"/>
+
+    </data>
+</openerp>
 \ No newline at end of file
 
=== added directory 'sale_negotiated_shipping/wizard'
=== added file 'sale_negotiated_shipping/wizard/__init__.py'
--- sale_negotiated_shipping/wizard/__init__.py	1970-01-01 00:00:00 +0000
+++ sale_negotiated_shipping/wizard/__init__.py	2011-10-06 16:09:21 +0000
@@ -0,0 +1,26 @@
+# -*- 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 wizard_shipping_rate_calculation
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 \ No newline at end of file
 
=== added file 'sale_negotiated_shipping/wizard/assigned_picker.py'
--- sale_negotiated_shipping/wizard/assigned_picker.py	1970-01-01 00:00:00 +0000
+++ sale_negotiated_shipping/wizard/assigned_picker.py	2011-10-06 16:09:21 +0000
@@ -0,0 +1,66 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    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 pooler
+import wizard
+from tools.translate import _
+
+pick_form = """<?xml version="1.0"?>
+<form string="Change Assigned Picker">
+    <field name="picker" colspan="4"/>
+</form>
+"""
+
+pick_fields = {
+    'picker': {'string': 'Assigned Picker', 'type': 'many2one', 'relation': 'res.users'}
+}
+
+
+
+class wizard_assigned_picker(wizard.interface):
+    
+
+    def do_action(self, cr, uid, data, context={}):
+        print data
+        pooler.get_pool(cr.dbname).get(data['model']).write(cr,uid,data['ids'],{'assigned_picker':data['form']['picker']})
+        return {}
+
+
+    states = {
+        'init': {
+            'actions': [],
+            'result': {'type': 'form', 'arch': pick_form, 'fields' : pick_fields, 'state' : [('end', 'Cancel'), ('update_delivery', 'Update Delivery Order') ]}
+        },
+        'update_delivery': {
+            'actions': [],
+            'result': {'type': 'action', 'action': do_action, 'state': 'end'}
+        },
+              
+              
+#        'init': {
+#            'actions': [],
+#            'result': {'type': 'action', 'action': do_action, 'state':'end'}
+#        }
+    }
+wizard_assigned_picker('assigned_picker_order')
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== added file 'sale_negotiated_shipping/wizard/wizard_shipping_rate_calculation.py'
--- sale_negotiated_shipping/wizard/wizard_shipping_rate_calculation.py	1970-01-01 00:00:00 +0000
+++ sale_negotiated_shipping/wizard/wizard_shipping_rate_calculation.py	2011-10-06 16:09:21 +0000
@@ -0,0 +1,256 @@
+# -*- 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 netsvc
+from tools.translate import _
+
+class shipping_rate_wizard(osv.osv_memory):
+    _name = "shipping.rate.wizard"
+    _description = "Calculates shipping charges"
+    _columns = {
+                'name': fields.one2many('shipping.rate.config','ups_shipping_wizard','Shipping Method'),
+                'shipping_cost':fields.float('Shipping Cost'),
+                'last_used':fields.char('Last Used',size="128"),
+                'account_id':fields.many2one('account.account', 'Account'),
+                'rate_select': fields.many2one('shipping.rate.config','Select'),
+    }
+    def _get_default_val(self,cr, uid, ids,context={}):
+        '''
+        Function to initialize shipping methods in shipping charge calculating wizard
+        '''
+        ret=[]
+        ship_conf_obj = self.pool.get('shipping.rate.config')
+        ship_conf_ids = ship_conf_obj.search(cr,uid,[])
+        account_id = False
+        for ship_conf in ship_conf_obj.browse(cr,uid,ship_conf_ids):
+            if ship_conf.account_id:
+                account_id = ship_conf.account_id.id
+            ret.append({'shipmethodname':ship_conf.shipmethodname,'use': 0,'real_id':ship_conf.id,'account_id':account_id})
+        return ret
+    _defaults = {'name':_get_default_val,
+                'last_used':'',
+                
+                    }
+    def update_sale_order(self, cr, uid, ids,context={}):
+        '''
+        Function to update sale order and invoice with new shipping cost and method
+        '''
+        datas = self.browse(cr, uid, ids[0], context=context)
+        if context.get('active_model',False) == 'sale.order':
+            sale_id = context.get('active_id',False)
+            sale_id and self.pool.get('sale.order').write(cr,uid,[sale_id],{'shipcharge':datas.shipping_cost,
+                                                                            'ship_method':datas.last_used,
+                                                                            'sale_account_id':datas.account_id.id,
+                                                                            'ship_method_id':datas.rate_select.id,})
+            self.pool.get('sale.order').button_dummy(cr, uid, [sale_id], context=context)
+        elif context.get('active_model',False) == 'account.invoice':
+            invoice_id = context.get('active_id',False)
+            if invoice_id:
+                if datas.account_id:
+                    account_id = datas.account_id.id
+                else:
+                    account_id = False
+                self.pool.get('account.invoice').write(cr,uid,[invoice_id],{
+                                                            'shipcharge':datas.shipping_cost,
+                                                            'ship_method':datas.last_used,
+                                                            'ship_method_id':datas.rate_select.id,
+                                                            'sale_account_id':datas.account_id.id,
+                                                            })
+                self.pool.get('account.invoice').button_reset_taxes(cr, uid, [invoice_id], context=context)
+#                For future development to add invoice line for shipping method
+#                inv_line_ids = self.pool.get('account.invoice.line').search(cr,uid,[('invoice_id','=',invoice_id),('name','=','Shipping Charge')])
+#                if inv_line_ids:
+#                    self.pool.get('account.invoice').write(cr,uid,invoice_id,{
+#                                                                'shipcharge':datas.shipping_cost,
+#                                                                'ship_method':datas.last_used,
+#                                                                })
+#                    self.pool.get('account.invoice.line').write(cr,uid,inv_line_ids,{'price_unit':datas.shipping_cost})
+#                else:
+#                    if datas.account_id:
+#                        self.pool.get('account.invoice').write(cr,uid,invoice_id,{
+#                                                                'shipcharge':datas.shipping_cost,
+#                                                                'ship_method':datas.last_used,
+#                                                                'invoice_line':[(0,0,{'name':'Shipping Charge',
+#                                                                                 'quantity':1,
+#                                                                                 'state':'article',
+#                                                                                 'account_id':datas.account_id.id,
+#                                                                                 'price_unit':datas.shipping_cost})]
+#                                                                })
+#                    else:
+#                        raise osv.except_osv(_('Warning !'), _('No account defined for this shipping rate configuration.')) 
+                            
+                                   
+            
+        return {}
+    def find_cost(self, cr, uid, config_id, address, model_obj, type='sale_order', context={}):
+        '''
+        Function to calculate shipping cost
+        '''
+        cost=0
+        table_pool = self.pool.get('ups.shipping.rate')
+        config_pool = self.pool.get('shipping.rate.config')
+        logger = netsvc.Logger()
+        config_obj = config_pool.browse(cr,uid,config_id, context=context)        
+        if config_obj.calc_method == 'country_weight':
+            table_id = table_pool.search(cr,uid,[('card_id','=',config_obj.rate_card_id.id),('country_id','=',address.country_id.id),('from_weight','<=',model_obj.total_weight_net),('to_weight','>',model_obj.total_weight_net),])
+            if table_id:
+                table_obj = table_pool.browse(cr,uid,table_id[0],)
+                if table_obj.charge == 0.0 and table_obj.over_cost:
+                    cost = model_obj.total_weight_net*table_obj.over_cost
+                else:
+                    cost = table_obj.charge
+                    
+            else:
+                table_ids = table_pool.search(cr,uid,[('card_id','=',config_obj.rate_card_id.id),('country_id','=',address.country_id.id),('over_cost','>',0)])
+                if table_ids:
+                    table_objs = table_pool.browse(cr,uid,table_ids)
+                    table_obj = table_objs[0]
+                    for table in table_objs:
+                        if table_obj.from_weight < table.from_weight:
+                            table_obj = table
+                    weight = model_obj.total_weight_net
+                    if table_obj.charge > 0:
+                        cost = table_obj.charge
+                        weight -= table_obj.from_weight
+                        if weight>0:
+                            cost += weight*table_obj.over_cost
+                    else:
+                        cost = weight*table_obj.over_cost
+                else:
+                    logger.notifyChannel(_("Calculate Shipping"), netsvc.LOG_WARNING, _("Unable to find rate table with Shipping Table = %s and Country = %s and Over Cost > 0."%(config_obj.rate_card_id.name,address.country_id.name)))
+                
+        elif config_obj.calc_method == 'state_zone_weight':
+            zone_pool = self.pool.get('ups.zone.map')
+            zone_id = zone_pool.search(cr,uid,[('rate_config_id','=',config_obj.id),('state_id','=',address.state_id.id),])
+            if zone_id:
+                zone = zone_pool.read(cr,uid,zone_id,['zone'])[0]['zone']
+                table_id = table_pool.search(cr,uid,[('card_id','=',config_obj.rate_card_id.id),('zone','=',zone),])
+                if table_id:
+                    table_obj = table_pool.browse(cr,uid,table_id)[0]
+                    weight = model_obj.total_weight_net
+                    if table_obj.charge > 0:
+                        cost = table_obj.charge
+                        weight -= table_obj.to_weight
+                        if weight>0:
+                            cost += weight*table_obj.over_cost
+                    else:
+                        cost = weight*table_obj.over_cost
+                else:
+                    logger.notifyChannel(_("Calculate Shipping"), netsvc.LOG_WARNING, _("Unable to find rate table with Shipping Table = %s and Zone = %s."%(config_obj.shipmethodname,zone)))
+            else:
+                logger.notifyChannel(_("Calculate Shipping"), netsvc.LOG_WARNING, _("Unable to find Zone Mapping Table with Shipping Rate Configuration = %s and State = %s."%(config_obj.shipmethodname,address.state_id.name)))
+        elif config_obj.calc_method == 'manual':
+            cost = 0.0
+        return cost
+    
+    def onchange_select_ups(self, cr, uid, ids, name, last_used, context={}):
+        '''
+        Function to update shipping charge when clicking on different types of shipping method
+        '''
+        new_list = []
+        new_last_used = last_used
+        cost = 0
+        account_id = False
+        ret = {}
+        ship_conf_obj = self.pool.get('shipping.rate.config')
+        ship_conf_ids = ship_conf_obj.search(cr,uid,[])
+        if context.get('active_model',False) == 'sale.order' and context.get('active_id',False):
+            if name and len(name) == len(ship_conf_ids):
+                new_last_used = ''
+                value = 0
+                for line in name:
+                    if line[2]['shipmethodname'] == last_used:
+                        line[2]['use'] = 0
+                    line[2]['shipmethodname'] and new_list.append(line[2])
+                    if line[2]['use']:
+                        new_last_used = line[2]['shipmethodname']
+                        account_id = line[2]['account_id']
+                        sale_id = context.get('active_id',False)
+                        sale_order = self.pool.get('sale.order').browse(cr,uid,sale_id,context=context)
+                        cr.execute('select type,id from res_partner_address where partner_id IN %s',(tuple([sale_order.partner_id.id]),))
+                        res = cr.fetchall()
+                        adr = dict(res)
+                        if adr:
+                            if adr.get('delivery',False):
+                                adr_id = adr['delivery']
+                            elif adr.get('default',False):
+                                adr_id = adr['default']
+                            else:
+                                adr_id = adr.values()[0]
+                            address = self.pool.get('res.partner.address').browse(cr, uid,adr_id,context=context)
+                            config_id = line[2]['real_id']
+                            cost=self.find_cost(cr, uid, config_id, address,sale_order, type='sale_order', context=context)
+                ret = {'value':{'shipping_cost':cost,'last_used':new_last_used,'name':new_list,'account_id':account_id}}
+            elif len(name) > len(ship_conf_ids):
+                for ship_conf in ship_conf_obj.browse(cr,uid,ship_conf_ids):
+                    new_list.append({'shipmethodname':ship_conf.shipmethodname,'use': 0})
+                ret = {'value':{'last_used':new_last_used,'name':new_list}}
+        elif context.get('active_model',False) == 'account.invoice' and context.get('active_id',False):
+            if name and len(name) == len(ship_conf_ids):
+                new_last_used = ''
+                value = 0
+                for line in name:
+                    if line[2]['shipmethodname'] == last_used:
+                        line[2]['use'] = 0
+                    line[2]['shipmethodname'] and new_list.append(line[2])
+                    if line[2]['use']:
+                        new_last_used = line[2]['shipmethodname']
+                        account_id = line[2]['account_id']
+                        invoice_id = context.get('active_id',False)
+                        invoice = self.pool.get('account.invoice').browse(cr,uid,invoice_id,context=context)
+                        cr.execute('select type,id from res_partner_address where partner_id IN %s',(tuple([invoice.partner_id.id]),))
+                        res = cr.fetchall()
+                        adr = dict(res)
+                        if adr:
+                            if adr.get('delivery',False):
+                                adr_id = adr['delivery']
+                            elif adr.get('default',False):
+                                adr_id = adr['default']
+                            else:
+                                adr_id = adr.values()[0]
+                            address = self.pool.get('res.partner.address').browse(cr, uid,adr_id,context=context)
+                            config_id = line[2]['real_id']
+                            cost=self.find_cost(cr, uid, config_id, address,invoice, type='invoice', context=context)
+                ret = {'value':{'shipping_cost':cost,'last_used':new_last_used,'name':new_list,'account_id':account_id,}}
+            elif len(name) > len(ship_conf_ids):
+                for ship_conf in ship_conf_obj.browse(cr,uid,ship_conf_ids):
+                    new_list.append({'shipmethodname':ship_conf.shipmethodname,'use': 0})
+                ret = {'value':{'last_used':new_last_used,'name':new_list}}
+        return ret
+    
+    def onchange_select(self, cr, uid, ids, name, last_used, rate_select, context={}):
+        new_list = []
+        ship_conf_obj = self.pool.get('shipping.rate.config')
+        ship_conf_ids = ship_conf_obj.search(cr,uid,[])
+        account_id = False
+        for line in ship_conf_obj.browse(cr,uid,ship_conf_ids):
+            use = 0
+            if line.id == rate_select:
+                use=1
+            new_list.append((0,0,{'use':use,'real_id':line.id,'account_id':line.account_id.id,'shipmethodname':line.shipmethodname}))
+        ret = self.onchange_select_ups(cr, uid, ids, new_list, last_used, context=context)
+        return ret
+    
+shipping_rate_wizard()
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== added file 'sale_negotiated_shipping/wizard/wizard_shipping_rate_view.xml'
--- sale_negotiated_shipping/wizard/wizard_shipping_rate_view.xml	1970-01-01 00:00:00 +0000
+++ sale_negotiated_shipping/wizard/wizard_shipping_rate_view.xml	2011-10-06 16:09:21 +0000
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    	<!-- Shipping rate wizard -->
+        <record id="view_for_shipping_rate_wizard" model="ir.ui.view">
+            <field name="name">action_for_shipping_rate_wizard</field>
+            <field name="model">shipping.rate.wizard</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Shipping Method" >
+                    <group  colspan="1" col="2">
+						<newline/>
+						<field name="last_used" invisible="1"/>
+						<field name="account_id" invisible="1"/>
+						<newline/>
+                        <field name="rate_select" string="Shipping Method" on_change="onchange_select(name,last_used,rate_select,context)" widget="selection" colspan="1"/>
+						<field name="shipping_cost" colspan="1"/>
+				        <newline/>
+				        <button special="cancel" string="Cancel" icon="gtk-close"/>
+						<button name="update_sale_order" string="OK" type="object" icon="gtk-ok" />
+                    </group>
+                 </form>
+            </field>
+        </record>
+
+
+        <record id="action_view_for_shipping_rate_wizard" model="ir.actions.act_window">
+            <field name="name">action_for_shipping_rate_wizard</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">shipping.rate.wizard</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+    </data>
+</openerp>
 \ No newline at end of file
 
=== added file 'sale_negotiated_shipping/wizard_view.xml'
--- sale_negotiated_shipping/wizard_view.xml	1970-01-01 00:00:00 +0000
+++ sale_negotiated_shipping/wizard_view.xml	2011-10-06 16:09:21 +0000
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+          <wizard id="assigned_picker_order_id" model="stock.picking"
+          multi="True" name="assigned_picker_order" string="Assigned Picker"/>
+
+           <wizard id="assigned_picker_move_id" model="stock.move"
+          multi="True" name="assigned_picker_order" string="Assigned Picker"/>
+    </data>
+</openerp>