From 6fe87d7ea4f860425b7134018d1eba52ba789fe7 Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Thu, 25 Nov 2010 15:33:55 +0530
Subject: [PATCH 1/3] [FIX] sale:'Recreate procurement' on shipping exception
 now works for multiple sale order line

bzr revid: mtr@mtr-20101125100355-0a1b7m792t63mssv
---
 addons/sale/sale.py | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 29826e1c293..c4e0e9200a3 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -671,6 +671,8 @@ class sale_order(osv.osv):
     def action_ship_create(self, cr, uid, ids, *args):
         wf_service = netsvc.LocalService("workflow")
         picking_id = False
+        move_obj = self.pool.get('stock.move')
+        proc_obj = self.pool.get('procurement.order')
         company = self.pool.get('res.users').browse(cr, uid, uid).company_id
         for order in self.browse(cr, uid, ids, context={}):
             proc_ids = []
@@ -722,6 +724,7 @@ class sale_order(osv.osv):
                         'note': line.notes,
                         'company_id': order.company_id.id,
                     })
+                    
                 if line.product_id:
                     proc_id = self.pool.get('procurement.order').create(cr, uid, {
                         'name': line.name,
@@ -742,6 +745,16 @@ class sale_order(osv.osv):
                     })
                     proc_ids.append(proc_id)
                     self.pool.get('sale.order.line').write(cr, uid, [line.id], {'procurement_id': proc_id})
+                    
+                    if order.state == 'shipping_except':
+                        for pick in order.picking_ids:
+                            for move in pick.move_lines:
+                                if move.state == 'cancel':
+                                    mov_ids = move_obj.search(cr, uid, [('state', '=', 'cancel'),('sale_line_id', '=', line.id),('picking_id', '=', pick.id)])
+                                    if mov_ids:
+                                        for mov in move_obj.browse(cr, uid, mov_ids):
+                                            move_obj.write(cr, uid, [move_id], {'product_qty': mov.product_qty, 'product_uos_qty': mov.product_uos_qty})
+                                            proc_obj.write(cr, uid, [proc_id], {'product_qty': mov.product_qty, 'product_uos_qty': mov.product_uos_qty})
 
             val = {}
             for proc_id in proc_ids:
@@ -749,9 +762,10 @@ class sale_order(osv.osv):
 
             if picking_id:
                 wf_service.trg_validate(uid, 'stock.picking', picking_id, 'button_confirm', cr)
-
+            
             if order.state == 'shipping_except':
                 val['state'] = 'progress'
+                val['shipped'] = False
 
                 if (order.order_policy == 'manual'):
                     for line in order.order_line:

From 4d2cc79c90332ad003640c9fcb3eaba269fa4bc6 Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Mon, 6 Dec 2010 11:35:41 +0530
Subject: [PATCH 2/3] [IMP] account_analytic_plans: the group
 Usability/Analytic Accounting is attributed by default to the administrator.

bzr revid: mtr@mtr-20101206060541-uo87gtf6yrl61r4r
---
 addons/account_analytic_plans/__openerp__.py           |  1 +
 .../security/account_analytic_plan_security.xml        | 10 ++++++++++
 2 files changed, 11 insertions(+)
 create mode 100644 addons/account_analytic_plans/security/account_analytic_plan_security.xml

diff --git a/addons/account_analytic_plans/__openerp__.py b/addons/account_analytic_plans/__openerp__.py
index 6e00c6b587d..5a021d4d104 100644
--- a/addons/account_analytic_plans/__openerp__.py
+++ b/addons/account_analytic_plans/__openerp__.py
@@ -59,6 +59,7 @@ of distribution models.
     'depends'   : ['account', 'account_analytic_default'],
     'init_xml'  : [],
     'update_xml': [
+        'security/account_analytic_plan_security.xml',
         'security/ir.model.access.csv',
         'account_analytic_plans_view.xml',
         'account_analytic_plans_report.xml',
diff --git a/addons/account_analytic_plans/security/account_analytic_plan_security.xml b/addons/account_analytic_plans/security/account_analytic_plan_security.xml
new file mode 100644
index 00000000000..1c379bb0f30
--- /dev/null
+++ b/addons/account_analytic_plans/security/account_analytic_plan_security.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="base.user_root" model="res.users">
+            <field name="groups_id" eval="[(4, ref('analytic.group_analytic_accounting'))]"/>
+        </record>
+
+    </data>
+</openerp>

From 04421e6902f78b88dff307c14d6f0abec725ada5 Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Tue, 7 Dec 2010 14:01:55 +0530
Subject: [PATCH 3/3] [IMP] product: 'Costing Method' now appears above 'Cost
 Price'

bzr revid: mtr@mtr-20101207083155-fuo22hflpnzut76r
---
 addons/product/product_view.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index a78de705e57..d0e2a780451 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -92,13 +92,12 @@
                             </group>
                             <group colspan="2" col="2">
                                 <separator string="Base Prices" colspan="2"/>
+                                <field groups="base.group_extended" name="cost_method"/>
                                 <field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}"/>
                                 <field name="list_price"/>
                                 <newline/>
                                 <field name="price_margin" groups="product.group_product_variant"/>
                                 <field name="price_extra" groups="product.group_product_variant"/>
-                                <newline/>
-                                <field groups="base.group_extended" name="cost_method"/>
                             </group>
 
                             <group colspan="2" col="2" groups="base.group_extended">