From 0f3b579a54684ac68f156d36ac8a311ff74bb684 Mon Sep 17 00:00:00 2001
From: Dhara <dhara@dhara-laptop>
Date: Tue, 15 Jun 2010 11:34:21 +0530
Subject: [PATCH 01/39] [FIX][IMP] email_template view and preview button for
 wi

bzr revid: dhara@dhara-laptop-20100615060421-3346bwibul6kf2ig
---
 addons/email_template/email_template_view.xml | 20 ++---
 .../marketing_campaign/marketing_campaign.py  | 87 +++++++++++--------
 .../marketing_campaign_view.xml               |  2 +-
 3 files changed, 62 insertions(+), 47 deletions(-)

diff --git a/addons/email_template/email_template_view.xml b/addons/email_template/email_template_view.xml
index 0faa28e042f..934a7324b07 100644
--- a/addons/email_template/email_template_view.xml
+++ b/addons/email_template/email_template_view.xml
@@ -20,19 +20,17 @@
                     <newline />
                     <field name="subject" />
                     <newline />
-                    <field name="body_text" />
-                    <newline />
-                    <!-- <field name="body_html" widget="text_html" />-->
-                    <!-- 
-                    Removed text_html because it doesnt work in GTK
-                    And TinyMCE messes up the HTML in Web Client
-                     -->
-                    <field name="body_html"/>
+                    <separator string= "Body(Text)" colspan="2"/>
+                    <newline/>
+                    <field name="body_text" nolabel="1" colspan="2"/>
+                    <newline/>
+                    <separator string= "Body(Html)" colspan="2"/>
+                    <newline/>
+                    <field name="body_html" nolabel="1" colspan="2"/>
                     <newline />
                     <field name="report" />
-                    <group>
-                        <button icon="gtk-ok" special="cancel" string="OK" />
-                    </group>
+                    <newline/>
+                    <button icon="gtk-ok" special="cancel" string="OK" colspan="2"/>
                 </form>
             </field>
         </record>
diff --git a/addons/marketing_campaign/marketing_campaign.py b/addons/marketing_campaign/marketing_campaign.py
index 36754bea803..da3b9c41a7c 100644
--- a/addons/marketing_campaign/marketing_campaign.py
+++ b/addons/marketing_campaign/marketing_campaign.py
@@ -27,6 +27,7 @@ from dateutil.relativedelta import relativedelta
 from osv import fields, osv
 import netsvc
 import tools
+from tools.translate import _
 
 _intervalTypes = {
     'hours': lambda interval: relativedelta(hours=interval),
@@ -278,41 +279,6 @@ class marketing_campaign_activity(osv.osv):
         print 'Sending Email Init', activity.name
         return self.pool.get('email.template').generate_mail(cr, uid, activity.email_template_id.id, [workitem.res_id], context=context)
 
-        #if not template.enforce_from_account:
-        #    self.pool.get('marketing.campaign.workitem').write(cr, uid, [workitem.id], {
-        #        'error_msg': 'There is no account defined for the email',
-        #        'state': 'exception'
-        #    })
-        #    return False
-        #if not workitem.partner_id.email:
-        #    self.pool.get('marketing.campaign.workitem').write(cr, uid, [workitem.id], {
-        #        'error_msg': "There is no email defined for the partner",
-        #        'state': 'exception'
-        #    })
-        #    return False
-        #vals = {
-        #    'email_from': tools.ustr(accounts.name) + "<" + tools.ustr(accounts.email_id) + ">",
-        #    'email_to': template.email_to,
-        #    'email_cc': template.email_cc,
-        #    'email_bcc': template.email_bcc,
-        #    'subject': template.def_subject,
-        #    'body_text': template.def_body_text,
-        #    'body_html': template.def_body_html,
-        #    'account_id': accounts.id,
-        #    'state':'na',
-        #    'mail_type':'multipart/alternative' #Options:'multipart/mixed','multipart/alternative','text/plain','text/html'
-        #}
-#       #     if accounts.use_sign:
-#       #         signature = self.pool.get('res.users').read(cr, uid, uid, ['signature'], context)['signature']
-#       #         if signature:
-#       #             vals['pem_body_text'] = tools.ustr(vals['pem_body_text'] or '') + signature
-#       #             vals['pem_body_html'] = tools.ustr(vals['pem_body_html'] or '') + signature
-
-        ##Create partly the mail and later update attachments
-        #print 'Sending Email', vals
-        #mail_id = self.pool.get('email_template.mailbox').create(cr, uid, vals, context)
-        return True
-
     def process_wi_action(self, cr, uid, activity, workitem, context={}):
         context = {}
         server_obj = self.pool.get('ir.actions.server')
@@ -470,6 +436,42 @@ class marketing_campaign_workitem(osv.osv):
             if workitem_ids:
                 self.process(cr, uid, workitem_ids, context)
 
+    def preview(self, cr, uid, ids, context):
+        res = {}
+        wi_obj = self.browse(cr, uid, ids)[0]
+        if wi_obj.activity_id.type == 'email':
+            data_obj = self.pool.get('ir.model.data')
+            data_id = data_obj._get_id(cr, uid, 'email_template', 'email_template_preview_form')
+            if data_id:
+                view_id = data_obj.browse(cr, uid, data_id, context=context).res_id
+            res = {
+                'name': _('Email Preview'),
+                'view_type': 'form',
+                'view_mode': 'form,tree',
+                'res_model': 'email_template.preview',
+                'view_id': False,
+                'context': context,
+                'views': [(view_id, 'form')],
+                'type': 'ir.actions.act_window',
+                'target': 'new',
+                'nodestroy':True,
+                'context': "{'template_id':%d,'rel_model_ref':%d}"%
+                                (wi_obj.activity_id.email_template_id.id,
+                                 wi_obj.res_id)
+                                 
+            }
+
+        elif wi_obj.activity_id.type == 'paper':
+            datas = {'ids': [wi_obj.res_id],
+                     'model': wi_obj.object_id.model}
+            res = { 
+                'type' : 'ir.actions.report.xml',
+                'report_name': wi_obj.activity_id.report_id.report_name,
+                'datas' : datas,
+                'nodestroy': True, 
+                }
+        return res
+
 marketing_campaign_workitem()
 
 class email_template(osv.osv):
@@ -478,6 +480,21 @@ class email_template(osv.osv):
         'object_name': lambda obj, cr, uid, context: context.get('object_id',False),
     }
 email_template()
+    
+class email_template_preview(osv.osv_memory):
+    _inherit = "email_template.preview"
+    
+    def _default_rel_model(self, cr, uid, context=None):
+        if 'rel_model_ref' in context :
+            return context['rel_model_ref']
+        else :
+            return False
+            
+    _defaults = {
+        'rel_model_ref' : _default_rel_model
+    }
+
+email_template_preview()
 
 class report_xml(osv.osv):
     _inherit = 'ir.actions.report.xml'
diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index 0ab2add38ba..f8dfc003369 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -289,7 +289,7 @@
                         <field name="email_template_id" attrs="{'required':[('type','=','email')]}" />
                     </group>
                     <group colspan="4" attrs="{'invisible':[('type','!=','paper')]}" >
-                        <field name="report_id" attrs="{'required':[('type','=','paper')]}"/>
+                        <field name="report_id" attrs="{'required':[('type','=','paper')]}" context="{'object_id':object_id}"/>
                         <field name="report_directory_id" attrs="{'required':[('type','=','paper')]}" />
                     </group>
                     <group colspan="4" attrs="{'invisible':[('type','!=','action')]}" >

From 10079e63a2e7698e8f74883ef46c45cf14d12fd2 Mon Sep 17 00:00:00 2001
From: Aline Preillon <aline@aline-laptop>
Date: Tue, 15 Jun 2010 09:45:32 +0200
Subject: [PATCH 02/39] [FIX] project_planning: correct view

bzr revid: aline@aline-laptop-20100615074532-3wgsrsjdubvl2xmi
---
 addons/project_planning/project_planning_view.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/project_planning/project_planning_view.xml b/addons/project_planning/project_planning_view.xml
index d7d2880714c..1d55d9db6c4 100644
--- a/addons/project_planning/project_planning_view.xml
+++ b/addons/project_planning/project_planning_view.xml
@@ -164,10 +164,10 @@
                     <group col="8" colspan="4">
                         <filter icon="terp-check" string="Current Plannings" domain="[('date_from','&lt;=',time.strftime('%%Y-%%m-%%d')),('date_to','&gt;=',time.strftime('%%Y-%%m-%%d'))]" help="Current Plannings"/>
                         <separator orientation="vertical"/>
-                        <field name="name">
-                        <field name="code">
-                        <field name="user_id">
-                        <field name="state">
+                        <field name="name"/>
+                        <field name="code"/>
+                        <field name="user_id"/>
+                        <field name="state"/>
                     </group>
                 </search>
             </field>

From 536a51efbb093283c05a2b9b3b4487d53d2aaea0 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 15 Jun 2010 10:14:32 +0200
Subject: [PATCH 03/39] modifs

bzr revid: fp@tinyerp.com-20100615081432-9qbkcx3vpb6ll84w
---
 addons/product/product_view.xml           |  2 +-
 addons/stock/security/ir.model.access.csv |  2 +
 addons/stock/stock.py                     | 21 ++++++--
 addons/stock/stock_view.xml               | 64 ++++++++++++++++++++---
 addons/stock_location/mrp_pull.py         |  4 +-
 addons/stock_location/stock.py            |  8 +--
 6 files changed, 84 insertions(+), 17 deletions(-)

diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index edd5e9e3499..09a287f0a38 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -45,7 +45,7 @@
                     <field name="name"/>
                     <field name="categ_id" invisible="1"/>
                     <field name="variants" groups="product.group_product_variant"/>
-                    <field name="uom_id"/>
+                    <field name="uom_id" string="UoM"/>
                     <field name="type"/>
                     <field name="qty_available"/>
                     <field name="virtual_available"/>
diff --git a/addons/stock/security/ir.model.access.csv b/addons/stock/security/ir.model.access.csv
index 9265ac0b2c9..803431d8bd0 100644
--- a/addons/stock/security/ir.model.access.csv
+++ b/addons/stock/security/ir.model.access.csv
@@ -5,6 +5,8 @@
 "access_stock_warehouse_user","stock.warehouse.user","model_stock_warehouse","base.group_user",1,0,0,0
 "access_stock_location_manager","stock.location.manager","model_stock_location","stock.group_stock_manager",1,1,1,1
 "access_stock_location_user","stock.location.user","model_stock_location","base.group_user",1,0,0,0
+"access_stock_journal_user","stock.journal.user","model_stock_journal","base.group_user",1,0,0,0
+"access_stock_journal_manager","stock.journal.manager","model_stock_journal","stock.group_stock_manager",1,1,1,1
 "access_stock_picking_move_wizard","stock.picking.move.wizard","model_stock_picking_move_wizard","stock.group_stock_user",1,1,1,1
 "access_stock_tracking","stock.tracking","model_stock_tracking","stock.group_stock_user",1,1,1,0
 "access_stock_picking","stock.picking","model_stock_picking","stock.group_stock_user",1,1,1,1
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index ddfe4808dba..b47b3189723 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -49,6 +49,17 @@ class stock_incoterms(osv.osv):
 
 stock_incoterms()
 
+class stock_journal(osv.osv):
+    _name = "stock.journal"
+    _description = "Stock Journal"
+    _columns = {
+        'name': fields.char('Stock Journal', size=32, required=True),
+        'user_id': fields.many2one('res.users','Responsible'),
+    }
+    _defaults = {
+        'user_id': lambda s,c,u,ctx: u
+    }
+stock_journal()
 
 #----------------------------------------------------------
 # Stock Location
@@ -169,6 +180,7 @@ class stock_location(osv.osv):
         'location_id': fields.many2one('stock.location', 'Parent Location', select=True, ondelete='cascade'),
         'child_ids': fields.one2many('stock.location', 'location_id', 'Contains'),
 
+        'chained_journal_id': fields.many2one('stock.journal', 'Chained Journal'),
         'chained_location_id': fields.many2one('stock.location', 'Chained Location If Fixed'),
         'chained_location_type': fields.selection([('none', 'None'), ('customer', 'Customer'), ('fixed', 'Fixed Location')],
             'Chained Location Type', required=True),
@@ -225,7 +237,7 @@ class stock_location(osv.osv):
         elif location.chained_location_type == 'fixed':
             result = location.chained_location_id
         if result:
-            return result, location.chained_auto_packing, location.chained_delay
+            return result, location.chained_auto_packing, location.chained_delay, location.chained_journal_id and location.chained_journal_id.id or False
         return result
 
     def picking_type_get(self, cr, uid, from_location, to_location, context={}):
@@ -557,7 +569,7 @@ class stock_picking(osv.osv):
         'type': fields.selection([('out', 'Sending Goods'), ('in', 'Getting Goods'), ('internal', 'Internal'), ('delivery', 'Delivery')], 'Shipping Type', required=True, select=True, help="Shipping type specify, goods coming in or going out."),
         'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the picking without removing it."),
         'note': fields.text('Notes'),
-
+        'stock_journal_id': fields.many2one('stock.journal','Stock Journal'),
         'location_id': fields.many2one('stock.location', 'Location', help="Keep empty if you produce at the location where the finished products are needed." \
                 "Set a location if you produce at a fixed location. This can be a partner location " \
                 "if you subcontract the manufacturing operations."),
@@ -1563,6 +1575,7 @@ class stock_move(osv.osv):
                 pick_name = ''
                 if ptype == 'delivery':
                     pick_name = self.pool.get('ir.sequence').get(cr, uid, 'stock.picking.delivery')
+                print todo
                 pickid = self.pool.get('stock.picking').create(cr, uid, {
                     'name': pick_name or picking.name,
                     'origin': str(picking.origin or ''),
@@ -1570,11 +1583,11 @@ class stock_move(osv.osv):
                     'note': picking.note,
                     'move_type': picking.move_type,
                     'auto_picking': todo[0][1][1] == 'auto',
+                    'stock_journal_id': todo[0][1][3],
                     'address_id': picking.address_id.id,
                     'invoice_state': 'none'
                 })
-                for move, (loc, auto, delay) in todo:
-                    # Is it smart to copy ? May be it's better to recreate ?
+                for move, (loc, auto, delay, journal) in todo:
                     new_id = self.pool.get('stock.move').copy(cr, uid, move.id, {
                         'location_id': move.location_dest_id.id,
                         'location_dest_id': loc.id,
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 0e26df8bdf9..92065350c38 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -420,6 +420,7 @@
                         <field name="chained_location_id"/>
                         <field name="chained_auto_packing"/>
                         <field name="chained_delay"/>
+                        <field name="chained_journal_id" groups="base.group_extended"/>
                     </group>
                     <group col="2" colspan="2">
                         <separator string="Localization" colspan="2"/>
@@ -603,15 +604,13 @@
             <field name="arch" type="xml">
                 <form string="Picking list">
                     <group colspan="4" col="6">
-
                         <field name="name" readonly="1"/>
-<!--                    <field name="address_id" context="{'contact_display' : 'partner'}" groups="base.group_extended"/>-->
                         <field name="origin"/>
-
                         <field name="backorder_id" groups="base.group_extended" readonly="1"/>
                         <field name="date"/>
                         <field name="min_date"/>
                         <field name="type"/>
+                        <field name="stock_journal_id" groups="base.group_extended" widget="selection"/>
                         <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     </group>
                     <notebook colspan="4">
@@ -715,10 +714,9 @@
                         <separator orientation="vertical"/>
                         <filter icon="terp-accessories-archiver-minus" string="Back Order" domain="[('backorder_id', '&lt;&gt;', False)]" help="Has Back Order"  />
                         <separator orientation="vertical"/>
-                        <field name="location_id"/>
-                        <field name="location_dest_id"/>
                         <field name="name"/>
                         <field name="address_id"/>
+                        <field name="stock_journal_id" groups="base.group_extended" widget="selection"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="8">
@@ -761,8 +759,9 @@
                         <field name="backorder_id" groups="base.group_extended" readonly="1"/>
                         <field name="date" />
                         <field name="min_date"/>
-                        <field name="type" invisible="1"/>
+                        <field name="stock_journal_id" groups="base.group_extended" widget="selection"/>
                         <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                        <field name="type" invisible="1"/>
                     </group>
                         <notebook colspan="4">
                         <page string="General Information">
@@ -863,6 +862,7 @@
                         <field name="name"/>
                         <field name="address_id"/>
                         <field name="origin"/>
+                        <field name="stock_journal_id" groups="base.group_extended" widget="selection"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="10">
@@ -939,6 +939,7 @@
                         <field name="backorder_id" readonly="1"/>
                         <field name="origin" readonly="1"/>
                         <field name="type" invisible="1"/>
+                        <field name="stock_journal_id" groups="base.group_extended" widget="selection"/>
                         <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     </group>
                     <notebook colspan="4">
@@ -1048,6 +1049,7 @@
                         <field name="name"/>
                         <field name="address_id" />
                         <field name="origin"/>
+                        <field name="stock_journal_id" groups="base.group_extended" widget="selection"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                    </group>
                     <newline/>
@@ -1125,6 +1127,7 @@
                         <field name="type"/>
                         <field name="min_date" readonly="1"/>
                         <field name="invoice_state" string="Invoice Control"/>
+                        <field name="stock_journal_id" groups="base.group_extended" widget="selection"/>
                         <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     </group>
                     <notebook colspan="4">
@@ -1220,6 +1223,7 @@
                         <field name="name"/>
                         <field name="address_id"/>
                         <field name="origin"/>
+                        <field name="stock_journal_id" groups="base.group_extended" widget="selection"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company" />
                     </group>
                     <newline/>
@@ -1277,6 +1281,7 @@
                         <separator orientation="vertical"/>
                         <field name="name"/>
                         <field name="origin"/>
+                        <field name="stock_journal_id" groups="base.group_extended" widget="selection"/>
                         <field name="company_id" widget="selection"/>
                     </group>
                     <newline/>
@@ -1799,5 +1804,52 @@
 
       <menuitem action="action_reception_picking_move" id="menu_action_pdct_in" parent="menu_stock_products_moves" sequence="1"/>
       <menuitem action="action_out_picking_move" id="menu_action_pdct_out" parent="menu_stock_products_moves" sequence="2"/>
+
+
+         <record id="view_stock_journal_filter" model="ir.ui.view">
+            <field name="name">stock.journal.filter</field>
+            <field name="model">stock.journal</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Stock Journal">
+                    <field name="name"/>
+                    <field name="user_id"/>
+                </search>
+            </field>
+        </record>
+        <record model="ir.ui.view" id="view_stock_journal_tree">
+            <field name="name">Stock Journals</field>
+            <field name="model">stock.journal</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Stock Journal">
+                    <field name="name"/>
+                    <field name="user_id"/>
+                </tree>
+            </field>
+        </record>
+        <record model="ir.ui.view" id="view_stock_journal_form">
+            <field name="name">Stock Journals</field>
+            <field name="model">stock.journal</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Stock Journal">
+                    <field name="name"/>
+                    <field name="user_id"/>
+                </form>
+            </field>
+        </record>
+        <record id="action_stock_journal_form" model="ir.actions.act_window">
+            <field name="name">Stock Journals</field>
+            <field name="res_model">stock.journal</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_type">form</field>
+        </record>
+        <menuitem
+            action="action_stock_journal_form"
+            id="menu_action_stock_journal_form"
+            groups="base.group_extended"
+            parent="menu_stock_configuration" />
+
     </data>
 </openerp>
diff --git a/addons/stock_location/mrp_pull.py b/addons/stock_location/mrp_pull.py
index e20f75f07f5..a8a5026bf4c 100644
--- a/addons/stock_location/mrp_pull.py
+++ b/addons/stock_location/mrp_pull.py
@@ -70,6 +70,7 @@ class procurement_order(osv.osv):
                 'origin': origin,
                 'company_id': line.company_id and line.company_id.id or False,
                 'type': line.picking_type,
+                'stock_journal_id': line.journal_id and line.journal_id.id or False,
                 'move_type': 'one',
                 'address_id': line.partner_address_id.id,
                 'note': line.name, # TODO: note on procurement ?
@@ -124,8 +125,5 @@ class procurement_order(osv.osv):
                     {'location_id':proc.location_id.id})
 
             self.write(cr, uid, [proc.id], {'state':'running','message':_('Moved from other location')})
-
         return False
-
-
 procurement_order()
diff --git a/addons/stock_location/stock.py b/addons/stock_location/stock.py
index 4aa4a1999ed..f3460fa7e30 100644
--- a/addons/stock_location/stock.py
+++ b/addons/stock_location/stock.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    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/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -30,6 +30,7 @@ class stock_location_path(osv.osv):
         'name': fields.char('Operation', size=64),
         'company_id': fields.many2one('res.company', 'Company'),
         'product_id' : fields.many2one('product.product', 'Products', ondelete='cascade', select=1),
+        'journal_id': fields.many2one('stock.journal','Journal'),
         'location_from_id' : fields.many2one('stock.location', 'Source Location', ondelete='cascade', select=1),
         'location_dest_id' : fields.many2one('stock.location', 'Destination Location', ondelete='cascade', select=1),
         'delay': fields.integer('Delay (days)', help="Number of days to do this transition"),
@@ -64,6 +65,7 @@ class product_pulled_flow(osv.osv):
         'cancel_cascade': fields.boolean('Cancel Cascade', help="Allow you to cancel moves related to the product pull flow"),
         'location_id': fields.many2one('stock.location','Location', required=True, help="Is the destination location that needs supplying"),
         'location_src_id': fields.many2one('stock.location','Location Source', help="Location used by Destination Location to supply"),
+        'journal_id': fields.many2one('stock.journal','Journal'),
         'procure_method': fields.selection([('make_to_stock','Make to Stock'),('make_to_order','Make to Order')], 'Procure Method', required=True, help="'Make to Stock': When needed, take from the stock or wait until re-supplying. 'Make to Order': When needed, purchase or produce for the procurement request."),
         'type_proc': fields.selection([('produce','Produce'),('buy','Buy'),('move','Move')], 'Type of Procurement', required=True),
         'company_id': fields.many2one('res.company', 'Company', help="Is used to know to which company belong packings and moves"),
@@ -115,7 +117,7 @@ class stock_location(osv.osv):
         if product:
             for path in product.path_ids:
                 if path.location_from_id.id == location.id:
-                    return path.location_dest_id, path.auto, path.delay
+                    return path.location_dest_id, path.auto, path.delay, path.journal_id.id
         return super(stock_location, self).chained_location_get(cr, uid, location, partner, product, context)
 stock_location()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From dd20f9ff47ad8e373ffadf608f15a323bcbe6e55 Mon Sep 17 00:00:00 2001
From: "nel@tinyerp.com" <>
Date: Tue, 15 Jun 2010 10:46:44 +0200
Subject: [PATCH 04/39] [ADD] stock: packing report

bzr revid: nel@tinyerp.com-20100615084644-5qdod7k6vg7c79ty
---
 addons/product_expiry/__terp__.py             |   2 +-
 addons/product_expiry/wizard/stock_partial.py |   8 +
 .../wizard/stock_partial_view.xml             |  19 ++
 addons/stock/__openerp__.py                   |   1 +
 addons/stock/report/packing.rml               | 317 ++++++++++++++++++
 addons/stock/report/picking.py                |   1 +
 addons/stock/stock.py                         |   3 +-
 addons/stock/stock_report.xml                 |   1 +
 addons/stock/stock_view.xml                   |  91 +++--
 addons/stock/wizard/__init__.py               |   1 +
 10 files changed, 409 insertions(+), 35 deletions(-)
 create mode 100644 addons/product_expiry/wizard/stock_partial_view.xml
 create mode 100644 addons/stock/report/packing.rml

diff --git a/addons/product_expiry/__terp__.py b/addons/product_expiry/__terp__.py
index 1983088a484..2e44f2c6462 100644
--- a/addons/product_expiry/__terp__.py
+++ b/addons/product_expiry/__terp__.py
@@ -31,7 +31,7 @@
  - removal date
  - alert date
 Used, for example, in food industries.''',
-    "update_xml" : ["product_expiry_view.xml", "report/report_stock_view.xml"],
+    "update_xml" : ["product_expiry_view.xml", "report/report_stock_view.xml", "wizard/stock_partial_view.xml"],
     "active": False,
     "installable": True
 }
diff --git a/addons/product_expiry/wizard/stock_partial.py b/addons/product_expiry/wizard/stock_partial.py
index 4edb01073e7..bc44628078c 100644
--- a/addons/product_expiry/wizard/stock_partial.py
+++ b/addons/product_expiry/wizard/stock_partial.py
@@ -62,3 +62,11 @@ class stock_partial_lot_picking(osv.osv_memory):
         return res
 stock_partial_lot_picking()
 
+class stock_move_split_lines_exist(osv.osv_memory):
+    _name = "stock.move.split.lines.exist"
+    _inherit = "stock.move.split.lines.exist"
+    _columns = {
+        'date': fields.date('Date'),
+    }
+
+stock_move_split_lines_exist()
diff --git a/addons/product_expiry/wizard/stock_partial_view.xml b/addons/product_expiry/wizard/stock_partial_view.xml
new file mode 100644
index 00000000000..fabc531cf14
--- /dev/null
+++ b/addons/product_expiry/wizard/stock_partial_view.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<openerp>	
+	<data>
+
+        <record id="view_split_in_lots" model="ir.ui.view">
+	            <field name="name">Split in lots</field>
+	            <field name="model">stock.move.split</field>
+	            <field name="type">form</field>
+             <field name="inherit_id" ref="stock.view_split_in_lots"/>
+              <field name="arch" type="xml">
+              <data>
+                <xpath expr="//form/group/field[@name='line_exist_ids']/tree/field[@name='quantity']"  position="after">
+                  <field name="date"/>
+                </xpath>
+              </data>
+            </field>
+        </record>
+	</data>
+</openerp>	
diff --git a/addons/stock/__openerp__.py b/addons/stock/__openerp__.py
index 32adb5e84d2..f0a03f9f2a5 100644
--- a/addons/stock/__openerp__.py
+++ b/addons/stock/__openerp__.py
@@ -50,6 +50,7 @@ Thanks to the double entry management, the inventory controlling is powerful and
         "wizard/stock_invoice_onshipping_view.xml",
         "wizard/stock_inventory_merge_view.xml",
         "wizard/stock_location_product_view.xml",
+        "wizard/stock_splitinto_view.xml",
         "wizard/stock_inventory_line_split_view.xml",
         "wizard/stock_change_standard_price_view.xml",
         "wizard/stock_traceability_view.xml",
diff --git a/addons/stock/report/packing.rml b/addons/stock/report/packing.rml
new file mode 100644
index 00000000000..c2cceb26238
--- /dev/null
+++ b/addons/stock/report/packing.rml
@@ -0,0 +1,317 @@
+<?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="0.0" y1="57.0" width="538" height="728"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_Address_detail">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_Title_String">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Header_Order_Reference_Tbl">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Content_Order_Reference_Table">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Move_Line_Header">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Move_Line_Contect_Assign_State">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="6,-1" stop="6,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Move_Line_Content_Other_State">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="Standard" fontName="Times-Roman"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" 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-Italic" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Times-Roman"/>
+    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" 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_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.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_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" 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_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Table Contents" fontName="Times-Roman"/>
+    <paraStyle name="Footer" fontName="Times-Roman"/>
+    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/>
+    <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+    <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" 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_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.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" 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_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"/>
+    <paraStyle name="terp_default_5cm_Above_Space" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_1cm_above_space" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="3.0" spaceAfter="0.0"/>
+  </stylesheet>
+  <images/>
+  <story>
+    <para style="terp_default_8">[[ repeatIn(objects,'picking') ]] </para>
+    <para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="269.0,269.0" style="Table_Address_detail">
+      <tr>
+        <td>
+          <para style="terp_default_9">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_default_9">[[ (picking.address_id and picking.address_id.partner_id and picking.address_id.partner_id.title) or '' ]] [[ picking.address_id and picking.address_id.partner_id and picking.address_id.partner_id.name ]]</para>
+          <para style="terp_default_9">[[ picking.address_id and picking.address_id.street or '' ]]</para>
+          <para style="terp_default_9">[[ picking.address_id and picking.address_id.zip or '' ]] [[ picking.address_id and picking.address_id.city or '']]</para>
+          
+          <para style="terp_default_2">
+            <font color="white"> </font>
+          </para>
+          <para style="terp_default_2">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="terp_default_9">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">[[ picking.sale_id and picking.sale_id.partner_shipping_id and 'Shipping Address :' or removeParentNode('para') ]] </para>
+          <para style="terp_default_9">[[ (picking.sale_id and picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.title) or '' ]] [[ (picking.sale_id and picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.name) or '' ]] </para>
+          <para style="terp_default_9">[[ (picking.sale_id and picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.street) or '' ]] </para>
+          <para style="terp_default_9">[[ (picking.sale_id and picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.zip) or '' ]] [[ (picking.sale_id and picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.city) or '' ]] [[ (picking.address_id and picking.address_id.state_id and picking.address_id.state_id.name) or '' ]] </para>
+          <para style="terp_default_9">[[ (picking.address_id and picking.address_id.country_id and picking.address_id.country_id.name) or '' ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_5cm_Above_Space">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_default_5cm_Above_Space">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_default_5cm_Above_Space">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="538.0" style="Table_Title_String">
+      <tr>
+        <td>
+          <para style="terp_header">Packing List: [[ picking.name ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_5cm_Above_Space">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_default_5cm_Above_Space">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="123.0,134.0,133.0,134.0" style="Header_Order_Reference_Tbl">
+      <tr>
+        <td>
+          <para style="terp_tblheader_General_Centre">Order(Origin)</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Recipient</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Expected Shipping Date </para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre"> Weight</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="123.0,134.0,133.0,134.0" style="Content_Order_Reference_Table">
+      <tr>
+        <td>
+          <para style="terp_default_Centre_8">[[ picking.origin ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ (picking.sale_id and picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.title) or '' ]] [[ (picking.sale_id and picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.name) or '' ]] </para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ formatLang(picking.min_date,date_time = True) ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ 'weight' in picking._columns.keys() and picking.weight or '']] </para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_5cm_Above_Space">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="196.0,68.0,56.0,61.0,73.0,70.0" repeatRows="1" style="Move_Line_Header">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Description</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">Tracking Lot</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">Lot</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">State</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">Quantity</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">Location</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_2">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_default_2">
+      <font color="white"> </font>
+    </para>
+    <section>
+      <para style="terp_default_8">[[ repeatIn([line for line in picking.move_lines if (line.state == 'assigned' )],'move_lines') ]]</para>
+      <blockTable colWidths="197.0,68.0,61.0,57,46.0,26.0,74.0" style="Move_Line_Contect_Assign_State">
+        <tr>
+          <td>
+            <para style="terp_default_9">[ [[ move_lines.product_id.default_code ]] ] [[ move_lines.product_id.name ]] [[ move_lines.product_id.variants or '']] </para>
+          </td>
+          <td>
+            <para style="terp_default_9">[[ move_lines.tracking_id and  move_lines.tracking_id.name or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_9">[[ (move_lines.prodlot_id and move_lines.prodlot_id.name) or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_9">[[ move_lines.state ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ move_lines.product_qty ]] </para>
+          </td>
+          <td>
+            <para style="terp_default_9">[[ move_lines.product_uom.name ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_9">[[ (move_lines.location_id and move_lines.location_id.name) or '' ]]</para>
+          </td>
+        </tr>
+      </blockTable>
+      <para style="terp_default_2">
+        <font color="white"> </font>
+      </para>
+    </section>
+    <para style="terp_default_5cm_Above_Space">[[ (line.state == 'done' or line.state == 'confirmed') and removeParentNode('para') ]]</para>
+    <para style="terp_default_Bold_9">Non Assigned Products: [[ ( line.state == 'assigned' or line.state == 'done' or line.state == 'confirmed' ) and removeParentNode('para') ]]</para>
+    <para style="terp_default_1cm_above_space">[[ (line.state == 'done' or line.state == 'confirmed') and removeParentNode('para') ]]</para>
+    <section>
+      <para style="terp_default_8">[[ repeatIn([line for line in picking.move_lines if (line.state != 'assigned' )],'move_lines') ]]</para>
+      <blockTable colWidths="257.0,57.0,62.0,46.0,26.0,74.0" style="Move_Line_Content_Other_State">
+        <tr>
+          <td>
+            <para style="terp_default_9">[ [[ move_lines.product_id.default_code ]] ] [[ move_lines.product_id.name ]] [[ move_lines.product_id.variants or '']]</para>
+          </td>
+          <td>
+            <para style="terp_default_9">[[ (move_lines.prodlot_id and move_lines.prodlot_id.name) or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_9">[[ move_lines.state ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ move_lines.product_qty ]] </para>
+          </td>
+          <td>
+            <para style="terp_default_9">[[ move_lines.product_uom.name ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_9">[[ (move_lines.location_id and move_lines.location_id.name) or '' ]]</para>
+          </td>
+        </tr>
+      </blockTable>
+      <para style="terp_default_2">
+        <font color="white"> </font>
+      </para>
+    </section>
+    <para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
+  </story>
+</document>
diff --git a/addons/stock/report/picking.py b/addons/stock/report/picking.py
index 8ab08a5016c..4dcbac4b9a0 100644
--- a/addons/stock/report/picking.py
+++ b/addons/stock/report/picking.py
@@ -32,4 +32,5 @@ class picking(report_sxw.rml_parse):
         })
 
 report_sxw.report_sxw('report.stock.picking.list','stock.picking','addons/stock/report/picking.rml',parser=picking)
+report_sxw.report_sxw('report.stock.packing.list','stock.picking','addons/stock/report/packing.rml',parser=picking)
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index d6d3a23efa7..eefd359ab39 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1392,7 +1392,8 @@ class stock_move(osv.osv):
                     move_list = self.pool.get('stock.move').read(cr, uid, context['move_line'][0], ['location_dest_id'])
                     return move_list and move_list['location_dest_id'][0] or False
         if context.get('address_out_id', False):
-            return self.pool.get('res.partner.address').browse(cr, uid, context['address_out_id'], context).partner_id.property_stock_customer.id
+            property_out = self.pool.get('res.partner.address').browse(cr, uid, context['address_out_id'], context).partner_id.property_stock_customer
+            return property_out and property_out.id or False
         return False
 
     def _default_location_source(self, cr, uid, context={}):
diff --git a/addons/stock/stock_report.xml b/addons/stock/stock_report.xml
index 3084e8527a7..547ed785cd1 100644
--- a/addons/stock/stock_report.xml
+++ b/addons/stock/stock_report.xml
@@ -3,6 +3,7 @@
     <data>
         <report auto="False" id="report_product_history" model="product.product" name="stock.product.history" string="Future Stock Forecast"/>
         <report id="report_picking_list" model="stock.picking" name="stock.picking.list" string="Picking list" rml="stock/report/picking.rml"/>
+        <report id="report_packing_list" model="stock.picking" name="stock.packing.list" string="Packing list" rml="stock/report/packing.rml"/>
         <report id="report_move_labels" model="stock.move" name="stock.move.label" string="Item Labels" xml="stock/report/lot_move_label.xml" xsl="stock/report/lot_move_label.xsl"/>
         <report auto="False"  id="report_location_overview" model="stock.location" name="lot.stock.overview" string="Location Overview" rml="stock/report/lot_overview.rml" groups="base.group_extended"/>
         <report auto="False" id="report_lot_location" model="stock.location" name="lot.location" rml="stock/report/lot_location.rml" string="Lots by location"/>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 0e26df8bdf9..f9ac9622d56 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -313,6 +313,7 @@
                     <field name="product_qty" />
                     <field name="product_uom"  string="UOM"/>
                     <field name="prodlot_id"  groups="base.group_extended"/>
+                    <field groups="base.group_extended" name="tracking_id"/>
                     <field name="product_packaging" domain="[('product_id','=',product_id)]" groups="base.group_extended"/>
                     <field name="picking_id"/>
                     <field name="location_id" />
@@ -336,6 +337,7 @@
                     <field name="product_qty" />
                     <field name="product_uom"  string="UOM"/>
                     <field name="prodlot_id"  groups="base.group_extended"/>
+                    <field groups="base.group_extended" name="tracking_id"/>
                     <field name="product_packaging" domain="[('product_id','=',product_id)]" groups="base.group_extended"/>
                     <field name="picking_id"/>
                     <field name="location_id" />
@@ -616,7 +618,7 @@
                     </group>
                     <notebook colspan="4">
                         <page string="General Information">
-                            <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines, 'address_out_id': address_id}">
+                            <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines, 'address_out_id': address_id}" editable="top">
                                 <tree colors="grey:state in ('cancel')" string="Stock Moves">
                                     <field name="name" string="Move Name"/>
                                     <field name="product_id"/>
@@ -624,6 +626,7 @@
                                     <field name="product_uom" string="UOM"/>
                                     <field name="picking_id"/>
                                     <field name="prodlot_id" groups="base.group_extended"/>
+                                    <field groups="base.group_extended" name="tracking_id"/>
                                     <field name="location_id"/>
                                     <field name="location_dest_id"/>
                                     <field name="date_planned"/>
@@ -662,9 +665,12 @@
                                                 domain="[('product_id','=?',product_id)]"
                                                 on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"/>
                                             <field groups="base.group_extended" name="tracking_id"/>
+                                            
                                             <newline/>
                                             <label/>
                                             <button name="%(track_line)d" string="Split in production lots" type="action" icon="terp-stock_effects-object-colorize"/>
+                                            <button name="%(split_into)d" string="Split into" type="action"
+                                                icon="terp-stock_effects-object-colorize" />
                                             <button name="%(move_scrap)d" string="Scrap Move Line" type="action" icon="gtk-justify-fill"/>
                                             <separator colspan="4" string="Move State"/>
                                             <field name="state"/>
@@ -774,6 +780,10 @@
                                     <field name="product_uom" string="UOM"/>
                                     <field name="picking_id" />
                                     <field name="prodlot_id" groups="base.group_extended"/>
+                                    <field groups="base.group_extended" name="tracking_id"/>
+                                    <button name="%(split_into)d" string="Split into" type="action"
+                                        icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
+                                        states="draft,assigned,confirmed,done"/>
                                     <field name="location_id"/>
                                     <field name="location_dest_id"/>
                                     <field name="date_planned"/>
@@ -811,6 +821,9 @@
                                                 domain="[('product_id','=?',product_id)]"
                                                 on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"/>
                                             <field groups="base.group_extended" name="tracking_id"/>
+                                            <button name="%(split_into)d" string="Split into" type="action"
+                                                icon="terp-stock_effects-object-colorize" 
+                                                states="draft,assigned,confirmed,done"/>
                                             <separator colspan="4" string="Move State"/>
                                             <field name="state"/>
                                             <group colspan="2">
@@ -944,7 +957,7 @@
                     <notebook colspan="4">
                         <page string="General Information">
                             <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines, 'address_out_id': address_id}">
-                                <tree colors="grey:state in ('cancel')" string="Stock Moves">
+                                <tree colors="grey:state in ('cancel')" string="Stock Moves" editable="top">
                                     <field name="product_id"/>
                                     <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
                                     <field name="product_uom" string="UOM"/>
@@ -953,23 +966,17 @@
                                         icon="gtk-convert" context="{'scrap': True}"
                                         states="draft,waiting,confirmed,assigned" />
                                     <field name="prodlot_id" groups="base.group_extended"/>
-                                    <button name="%(track_line)d" string="Split" type="action" 
+                                    <button name="%(track_line)d" string="Split in production lots" type="action" 
                                         icon="gtk-justify-fill" attrs="{'invisible': [('prodlot_id','&lt;&gt;',False)]}"
                                         states="assigned,confirmed,done"
                                         groups="base.group_extended"/>
+                                    <field name="tracking_id" groups="base.group_extended"/>
+                                  <button name="%(split_into)d" string="Split into" type="action"
+                                      icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
+                                      states="draft,assigned,confirmed,done"/>
                                     <field name="location_id"/>
                                     <field name="date_planned"/>
                                     <field name="state"/>
-                                    <button
-                                           name="%(stock.track_line)d"
-                                           string="Split in production lots"
-                                           type="action" icon="terp-stock_effects-object-colorize"
-                                           states="draft,waiting,confirmed,assigned" />
-                                       <button
-                                           name="%(stock.move_scrap)d"
-                                           string="Scrap Products" type="action"
-                                           icon="gtk-convert"
-                                           states="draft,waiting,confirmed,assigned" />
                                     <button name="%(action_partial_move)d" string="Partial" type="action" states="confirmed,assigned" icon="gtk-justify-fill"/>
                                     <button name="action_done" states="confirmed,assigned" string="Done" type="object" icon="gtk-jump-to"/>
                                 </tree>
@@ -994,6 +1001,9 @@
                                                 domain="[('product_id','=?',product_id)]"
                                                 on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"/>
                                             <field groups="base.group_extended" name="tracking_id"/>
+                                            <button name="%(split_into)d" string="Split into" type="action"
+                                                icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
+                                                states="draft,assigned,confirmed,done"/>
                                             <label/>
                                             <button name="%(track_line)d" string="Split in production lots" type="action" icon="terp-stock_effects-object-colorize"/>
                                             <separator colspan="4" string="Move State"/>
@@ -1130,19 +1140,24 @@
                     <notebook colspan="4">
                         <page string="General Information">
                             <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines, 'address_in_id': address_id}">
-                                <tree colors="grey:state in ('cancel')" string="Stock Moves">
+                                <tree colors="grey:state in ('cancel')" string="Stock Moves" editable="top">
                                     <field name="product_id"/>
                                     <field name="product_qty"/>
                                     <field name="product_uom" string="Product Unit of Measure"/>
                                     <field name="location_dest_id"/>
                                     <field name="prodlot_id" groups="base.group_extended"/>
-                                    <field name="state"/>
-                                    <button
+                                      <button
                                            name="%(stock.track_line)d"
                                            string="Split in production lots"
                                            type="action" icon="terp-stock_effects-object-colorize"
                                            states="draft,waiting,confirmed,assigned" />
-                                       <button name="%(stock.move_scrap)d"
+
+                                    <field name="tracking_id" groups="base.group_extended"/>
+                                    <button name="%(split_into)d" string="Split into" type="action"
+                                        icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
+                                        states="draft,assigned,confirmed,done"/>
+                                    <field name="state"/>
+                                                                         <button name="%(stock.move_scrap)d"
                                         string="Scrap Products" type="action"
                                         icon="gtk-convert" context="{'scrap': True}"
                                         states="draft,waiting,confirmed,assigned" />
@@ -1156,23 +1171,21 @@
                                             <field colspan="4" context="location=location_id" name="product_id" on_change="onchange_product_id(product_id, location_id, location_dest_id, parent.address_id)"/>
                                             <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
                                             <field name="product_uom"/>
-                                            <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
                                             <field groups="product.group_uos" name="product_uos_qty"/>
                                             <field colspan="4" invisible="1" name="name" />
                                             <field groups="base.group_extended" name="date_planned"/>
-                                             <field name="date_expected" groups="base.group_extended" string="Date Expected"/>
+                                           <field name="date_expected" groups="base.group_extended" string="Date Expected"/>
+                                            <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
                                             <newline/>
                                             <newline/>
-                                            <field groups="base.group_extended" name="product_packaging" domain="[('product_id','=',product_id)]"/>
-                                            <newline/>
-                                            <field name="prodlot_id" groups="base.group_extended"
-                                                context="{'location_id':location_id, 'product_id':product_id}"
-                                                domain="[('product_id','=?',product_id)]"
-                                                on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"/>
+                                            <field name="prodlot_id" groups="base.group_extended" context="{'location_id':location_id, 'product_id':product_id}" domain="[('product_id','=?',product_id)]" on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"/>
                                             <field groups="base.group_extended" name="tracking_id"/>
+                                            <newline/>
+                                          
                                             <newline/>
                                             <label/>
-                                            <button groups="base.group_extended" name="%(track_line)d" string="Split in production lots" type="action" icon="terp-stock_effects-object-colorize"/>
+                                          <button groups="base.group_extended" name="267" string="Split in production lots" type="action" icon="terp-stock_effects-object-colorize"/>
+  <button name="275" string="Split Stock Moves" type="action" icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}" states="draft,assigned,confirmed,done"/>
                                             <separator colspan="4" string="Move State"/>
                                             <field name="state"/>
                                             <group colspan="2">
@@ -1309,7 +1322,7 @@
             <field name="type">tree</field>
             <field eval="6" name="priority"/>
             <field name="arch" type="xml">
-                <tree colors="grey:state in ('cancel');red:(state not in ('cancel','done')) and date_planned > current_date" string="Moves">
+                <tree colors="grey:state in ('cancel');red:(state not in ('cancel','done')) and date_planned > current_date" string="Moves" editable="top">
                     <field name="picking_id" select="1"/>
                     <field name="product_id"/>
                     <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
@@ -1323,6 +1336,10 @@
                         icon="gtk-justify-fill" attrs="{'invisible': [('prodlot_id','&lt;&gt;',False)]}"
                         states="assigned,confirmed"
                         groups="base.group_extended"/>
+                    <field groups="base.group_extended" name="tracking_id"/>
+                    <button name="%(split_into)d" string="Split into" type="action"
+                        icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
+                        states="draft,assigned,confirmed,done"/>
                     <field name="location_id"/>
                     <field name="location_dest_id"/>
                     <field name="date_planned"/>
@@ -1378,6 +1395,9 @@
                                     domain="[('product_id','=?',product_id)]"
                                     on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"/>
                                 <button name="%(track_line)d" string="Split in production lots" type="action" icon="terp-stock_effects-object-colorize" colspan="2" />
+                                <button name="%(split_into)d" string="Split Stock Moves" type="action"
+                                icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
+                                states="draft,assigned,confirmed,done"/>
                             </group>
                         </page>
                     </notebook>
@@ -1460,17 +1480,19 @@
                         icon="gtk-convert" context="{'scrap': True}"
                         states="draft,waiting,confirmed,assigned" />
                     <field name="prodlot_id" groups="base.group_extended"/>
-                    <button name="%(track_line)d" string="Split" type="action"
-                        icon="gtk-justify-fill" attrs="{'invisible': [('prodlot_id','&lt;&gt;',False)]}"
+                    <button name="%(track_line)d" string="Split in production lots" type="action"
+                        icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('prodlot_id','&lt;&gt;',False)]}"
                         states="assigned,confirmed,done"
+                        context="{'default_use_exist': picking_id.type=='in'}"
                         groups="base.group_extended"/>
+                    <field name="tracking_id" groups="base.group_extended"/>
+                    <button name="%(split_into)d" string="Split Stock Moves" type="action"
+                        icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
+                        states="draft,assigned,confirmed,done"/>
                     <field name="date_planned"/>
                     <field name="backorder_id" groups="base.group_extended"/>
                     <field name="state"/>
-                    <button name="%(track_line)d" string="Split in production lots" type="action" icon="terp-stock_effects-object-colorize" states="draft,waiting,confirmed,assigned"/>
                     <button name="%(action_partial_move)d" string="Partial" type="action" states="assigned" icon="gtk-justify-fill"/>
-                    <button name="action_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes"/>
-                    <button name="action_done" states="assigned" string="Done" type="object" icon="gtk-jump-to"/>
                 </tree>
             </field>
         </record>
@@ -1506,7 +1528,10 @@
                                 context="{'location_id':location_id, 'product_id':product_id}"
                                 domain="[('product_id','=?',product_id)]"
                                 on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"/>
-                            <field name="tracking_id"/>
+                            <field groups="base.group_extended" name="tracking_id"/>
+                            <button name="%(split_into)d" string="Split Stock Moves" type="action"
+                                icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
+                                states="draft,assigned,confirmed,done"/>
                             <newline/>
                             <group col="2" colspan="2">
                                 <label/>
diff --git a/addons/stock/wizard/__init__.py b/addons/stock/wizard/__init__.py
index 82825000eaa..a211de96780 100644
--- a/addons/stock/wizard/__init__.py
+++ b/addons/stock/wizard/__init__.py
@@ -21,6 +21,7 @@
 
 import stock_traceability
 import stock_move
+import stock_splitinto
 import stock_partial_picking
 import stock_partial_move
 import stock_replacement

From 65a7931e6afd028f36df0c480f1e20068303163e Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 15 Jun 2010 10:58:57 +0200
Subject: [PATCH 05/39] contacts

bzr revid: fp@tinyerp.com-20100615085857-6muw8e05nrfh31f8
---
 addons/base_contact/base_contact_view.xml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/addons/base_contact/base_contact_view.xml b/addons/base_contact/base_contact_view.xml
index b4e7fa3e2ed..04429a94186 100644
--- a/addons/base_contact/base_contact_view.xml
+++ b/addons/base_contact/base_contact_view.xml
@@ -400,13 +400,5 @@
         src_model="res.partner.address"
         />
 
-    <menuitem icon="terp-purchase" id="base.menu_purchase_root"
-        name="Procurement Management" sequence="7" />
-    <menuitem id="base.menu_procurement_management_supplier"
-        name="Suppliers" parent="base.menu_purchase_root" sequence="3" />
-    <menuitem name="Contacts" id="menu_partner_contact_supplier_form"
-        action="action_partner_contact_form"
-        parent="base.menu_procurement_management_supplier" sequence="2" />
-
 </data>
 </openerp>

From 32e4fdd40e31b6480971887850bed50fb62f22e7 Mon Sep 17 00:00:00 2001
From: "nel@tinyerp.com" <>
Date: Tue, 15 Jun 2010 11:09:33 +0200
Subject: [PATCH 06/39] [ADD]stock :split

bzr revid: nel@tinyerp.com-20100615090933-sr3xl66g4q6x7rcb
---
 addons/product_expiry/product_expiry.py      | 11 +++
 addons/stock/wizard/stock_splitinto.py       | 79 ++++++++++++++++++++
 addons/stock/wizard/stock_splitinto_view.xml | 30 ++++++++
 3 files changed, 120 insertions(+)
 create mode 100644 addons/stock/wizard/stock_splitinto.py
 create mode 100644 addons/stock/wizard/stock_splitinto_view.xml

diff --git a/addons/product_expiry/product_expiry.py b/addons/product_expiry/product_expiry.py
index 92dc7974bf7..fdc63d28afe 100644
--- a/addons/product_expiry/product_expiry.py
+++ b/addons/product_expiry/product_expiry.py
@@ -25,6 +25,17 @@ import pooler
 class stock_production_lot(osv.osv):
     _name = 'stock.production.lot'
     _inherit = 'stock.production.lot'
+    def name_get(self, cr, uid, ids, context=None):
+        if not len(ids):
+            return []
+        result = []
+        for line in self.browse(cr, uid, ids, context):
+            if line.life_date:
+                result.append((line.id, (line.name or '')+' ('+line.life_date+')'))
+            else:
+                result.append((line.id, line.name))
+        return result
+
 
     def _get_date(dtype):
         """Return a function to compute the limit date for this type"""
diff --git a/addons/stock/wizard/stock_splitinto.py b/addons/stock/wizard/stock_splitinto.py
new file mode 100644
index 00000000000..a3b372d7eb8
--- /dev/null
+++ b/addons/stock/wizard/stock_splitinto.py
@@ -0,0 +1,79 @@
+# -*- 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/>.
+#
+##############################################################################
+
+from osv import fields, osv
+from tools.translate import _
+
+
+class stock_split_into(osv.osv_memory):
+    _name = "stock.split.into"
+    _description = "Split into"
+
+    def default_get(self, cr, uid, fields, context=None):
+        """ Get default values
+        @param self: The object pointer.
+        @param cr: A database cursor
+        @param uid: ID of the user currently logged in
+        @param fields: List of fields for default value
+        @param context: A standard dictionary
+        @return: Default values of fields
+        """
+        res = super(stock_split_into, self).default_get(cr, uid, fields, context=context)
+        move = self.pool.get('stock.move').browse(cr, uid, context['active_id'], context=context)
+        if 'quantity' in fields:
+            res.update({'quantity': move.product_qty})
+        return res
+
+    _columns = {
+        'quantity': fields.integer('Quantity'),
+    }
+    _defaults = {
+        'quantity': lambda *x: 1,
+    }
+
+    def split(self, cr, uid, data, context=None):
+        rec_id = context and context.get('active_ids', False)
+        move_obj = self.pool.get('stock.move')
+        new_move = []
+        update_val = {}
+        value_to_split = self.browse(cr, uid, data[0], context)
+        quantity =  value_to_split.quantity or 0.0
+        for move in move_obj.browse(cr, uid, rec_id):
+            move_qty = move.product_qty
+            uos_qty_rest = move.product_uos_qty
+            quantity_rest = move_qty - quantity
+            if quantity_rest == 0:
+                continue
+            uos_qty = quantity / move_qty * move.product_uos_qty
+            uos_qty_rest = quantity_rest / move_qty * move.product_uos_qty
+            default_val = {
+                'product_qty': quantity,
+                'product_uos_qty': uos_qty,
+                'state': move.state
+            }
+            current_move = move_obj.copy(cr, uid, move.id, default_val)
+            new_move.append(current_move)
+            update_val['product_qty'] = quantity_rest
+            update_val['product_uos_qty'] = uos_qty_rest
+            move_obj.write(cr, uid, [move.id], update_val)
+        return {}
+stock_split_into()
+
diff --git a/addons/stock/wizard/stock_splitinto_view.xml b/addons/stock/wizard/stock_splitinto_view.xml
new file mode 100644
index 00000000000..116511b8755
--- /dev/null
+++ b/addons/stock/wizard/stock_splitinto_view.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    
+	    <record id="view_stock_move_split_wizard" model="ir.ui.view">
+	            <field name="name">Split move</field>
+	            <field name="model">stock.split.into</field>
+	            <field name="type">form</field>
+	            <field name="arch" type="xml">
+	                <form string="Split Move">
+	                	<field name="quantity" colspan="4"/>
+	                	<button icon='gtk-cancel' special="cancel"
+	                		string="Cancel" />
+	                	<button name="split" string="Ok"
+	                		type="object" icon="gtk-ok" />
+	                </form>
+	            </field>
+	        </record>
+	
+	        <record id="split_into" model="ir.actions.act_window">
+	            <field name="name">Split into</field>
+	            <field name="type">ir.actions.act_window</field>
+	            <field name="res_model">stock.split.into</field>
+	            <field name="view_type">form</field>
+	            <field name="view_mode">form</field>
+	            <field name="target">new</field>
+	        </record>
+	        
+	</data>
+</openerp>	

From 1e97b2e03acc0b3758ba9eb4383fd8ae608ee015 Mon Sep 17 00:00:00 2001
From: apa <apa@apa>
Date: Tue, 15 Jun 2010 15:48:01 +0530
Subject: [PATCH 07/39] [IMP]:stock:Improved stock move views.

bzr revid: apa@apa-20100615101801-nieka4u1cgwi4nwb
---
 addons/stock/stock_view.xml | 37 ++++++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index bf2eb7668d5..c9a157a74b9 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -664,7 +664,7 @@
                                                 domain="[('product_id','=?',product_id)]"
                                                 on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"/>
                                             <field groups="base.group_extended" name="tracking_id"/>
-                                            
+
                                             <newline/>
                                             <label/>
                                             <button name="%(track_line)d" string="Split in production lots" type="action" icon="terp-stock_effects-object-colorize"/>
@@ -821,7 +821,7 @@
                                                 on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"/>
                                             <field groups="base.group_extended" name="tracking_id"/>
                                             <button name="%(split_into)d" string="Split into" type="action"
-                                                icon="terp-stock_effects-object-colorize" 
+                                                icon="terp-stock_effects-object-colorize"
                                                 states="draft,assigned,confirmed,done"/>
                                             <separator colspan="4" string="Move State"/>
                                             <field name="state"/>
@@ -967,7 +967,7 @@
                                         icon="gtk-convert" context="{'scrap': True}"
                                         states="draft,waiting,confirmed,assigned" />
                                     <field name="prodlot_id" groups="base.group_extended"/>
-                                    <button name="%(track_line)d" string="Split in production lots" type="action" 
+                                    <button name="%(track_line)d" string="Split in production lots" type="action"
                                         icon="gtk-justify-fill" attrs="{'invisible': [('prodlot_id','&lt;&gt;',False)]}"
                                         states="assigned,confirmed,done"
                                         groups="base.group_extended"/>
@@ -1184,11 +1184,11 @@
                                             <field name="prodlot_id" groups="base.group_extended" context="{'location_id':location_id, 'product_id':product_id}" domain="[('product_id','=?',product_id)]" on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"/>
                                             <field groups="base.group_extended" name="tracking_id"/>
                                             <newline/>
-                                          
+
                                             <newline/>
                                             <label/>
-                                          <button groups="base.group_extended" name="267" string="Split in production lots" type="action" icon="terp-stock_effects-object-colorize"/>
-  <button name="275" string="Split Stock Moves" type="action" icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}" states="draft,assigned,confirmed,done"/>
+                                          	<button groups="base.group_extended" name="267" string="Split in production lots" type="action" icon="terp-stock_effects-object-colorize"/>
+  											<button name="275" string="Split Stock Moves" type="action" icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}" states="draft,assigned,confirmed,done"/>
                                             <separator colspan="4" string="Move State"/>
                                             <field name="state"/>
                                             <group colspan="2">
@@ -1399,10 +1399,13 @@
                                     context="{'location_id':location_id, 'product_id':product_id}"
                                     domain="[('product_id','=?',product_id)]"
                                     on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"/>
-                                <button name="%(track_line)d" string="Split in production lots" type="action" icon="terp-stock_effects-object-colorize" colspan="2" />
-                                <button name="%(split_into)d" string="Split Stock Moves" type="action"
-                                icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
-                                states="draft,assigned,confirmed,done"/>
+                                <newline/>
+                                <group colspan="4" col="4">
+                                	<button name="%(track_line)d" string="Split in production lots" type="action" icon="terp-stock_effects-object-colorize" colspan="2" />
+                                	<button name="%(split_into)d" string="Split Stock Moves" type="action"
+                                		icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
+                                		states="draft,assigned,confirmed,done"/>
+                                </group>
                             </group>
                         </page>
                     </notebook>
@@ -1527,21 +1530,21 @@
                             <field name="priority"/>
                             <field name="address_id" context="{'contact_display':'partner'}"/>
                             <newline/>
-                            <field name="picking_id"/>
                             <newline/>
                             <field name="prodlot_id" groups="base.group_extended"
                                 context="{'location_id':location_id, 'product_id':product_id}"
                                 domain="[('product_id','=?',product_id)]"
                                 on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"/>
                             <field groups="base.group_extended" name="tracking_id"/>
-                            <button name="%(split_into)d" string="Split Stock Moves" type="action"
-                                icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
-                                states="draft,assigned,confirmed,done"/>
+
                             <newline/>
+                            <field name="picking_id"/>
                             <group col="2" colspan="2">
-                                <label/>
-                                <button name="%(track_line)d" string="Split in production lots" type="action" icon="terp-stock_effects-object-colorize"/>
-                            </group>
+	                            <button name="%(split_into)d" string="Split Stock Moves" type="action"
+	                            	icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
+	                            	states="draft,assigned,confirmed,done"/>
+	                            <button name="%(track_line)d" string="Split in production lots" type="action" icon="terp-stock_effects-object-colorize"/>
+                        	</group>
                             <separator colspan="4" string="Move State"/>
                             <field name="state"/>
                             <group col="5" colspan="2">

From f037f0c6d78f0a47fb023f4076c6e80b4cff2ccd Mon Sep 17 00:00:00 2001
From: Quentin De Paoli <qdp@cyan>
Date: Tue, 15 Jun 2010 12:37:07 +0200
Subject: [PATCH 08/39] [IMP] stock, stock_location: push and pull flows
 improved. Set the chained company and picking type

bzr revid: qdp@cyan-20100615103707-acoazfhxvmx82hm9
---
 addons/stock/stock.py             | 12 +++++++-----
 addons/stock/stock_view.xml       |  4 +++-
 addons/stock_location/mrp_pull.py |  4 ++--
 addons/stock_location/stock.py    |  5 ++++-
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index be1b7d66663..bf308f191b5 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -170,7 +170,6 @@ class stock_location(osv.osv):
         'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the stock location without removing it."),
         'usage': fields.selection([('supplier', 'Supplier Location'), ('view', 'View'), ('internal', 'Internal Location'), ('customer', 'Customer Location'), ('inventory', 'Inventory'), ('procurement', 'Procurement'), ('production', 'Production'), ('transit', 'Transit Location for Inter-Companies Transfers')], 'Location Type', required=True),
         'allocation_method': fields.selection([('fifo', 'FIFO'), ('lifo', 'LIFO'), ('nearest', 'Nearest')], 'Allocation Method', required=True),
-
         'complete_name': fields.function(_complete_name, method=True, type='char', size=100, string="Location Name"),
 
         'stock_real': fields.function(_product_qty_available, method=True, type='float', string='Real Stock', multi="stock"),
@@ -193,6 +192,8 @@ class stock_location(osv.osv):
                 "validated automatically. With 'Manual Operation', the stock move has to be validated "\
                 "by a worker. With 'Automatic No Step Added', the location is replaced in the original move."
             ),
+        'chained_picking_type': fields.selection([('out', 'Sending Goods'), ('in', 'Getting Goods'), ('internal', 'Internal'), ('delivery', 'Delivery')], 'Shipping Type', help="Shipping type specify of the chained move, goods coming in or going out."),
+        'chained_company_id': fields.many2one('res.company', 'Chained Company', help='Set here the belonging company of the chained move'),
         'chained_delay': fields.integer('Chained lead time (days)'),
         'address_id': fields.many2one('res.partner.address', 'Location Address'),
         'icon': fields.selection(tools.icons, 'Icon', size=64),
@@ -237,7 +238,7 @@ class stock_location(osv.osv):
         elif location.chained_location_type == 'fixed':
             result = location.chained_location_id
         if result:
-            return result, location.chained_auto_packing, location.chained_delay, location.chained_journal_id and location.chained_journal_id.id or False
+            return result, location.chained_auto_packing, location.chained_delay, location.chained_journal_id and location.chained_journal_id.id or False, location.chained_company_id and location.chained_company_id.id or False, location.chained_picking_type
         return result
 
     def picking_type_get(self, cr, uid, from_location, to_location, context={}):
@@ -1572,11 +1573,10 @@ class stock_move(osv.osv):
         def create_chained_picking(self, cr, uid, moves, context):
             new_moves = []
             for picking, todo in self._chain_compute(cr, uid, moves, context).items():
-                ptype = self.pool.get('stock.location').picking_type_get(cr, uid, todo[0][0].location_dest_id, todo[0][1][0])
+                ptype = todo[0][1][5] and todo[0][1][5] or self.pool.get('stock.location').picking_type_get(cr, uid, todo[0][0].location_dest_id, todo[0][1][0])
                 pick_name = ''
                 if ptype == 'delivery':
                     pick_name = self.pool.get('ir.sequence').get(cr, uid, 'stock.picking.delivery')
-                print todo
                 pickid = self.pool.get('stock.picking').create(cr, uid, {
                     'name': pick_name or picking.name,
                     'origin': str(picking.origin or ''),
@@ -1585,16 +1585,18 @@ class stock_move(osv.osv):
                     'move_type': picking.move_type,
                     'auto_picking': todo[0][1][1] == 'auto',
                     'stock_journal_id': todo[0][1][3],
+                    'company_id': todo[0][1][4],
                     'address_id': picking.address_id.id,
                     'invoice_state': 'none'
                 })
-                for move, (loc, auto, delay, journal) in todo:
+                for move, (loc, auto, delay, journal, company_id, ptype) in todo:
                     new_id = self.pool.get('stock.move').copy(cr, uid, move.id, {
                         'location_id': move.location_dest_id.id,
                         'location_dest_id': loc.id,
                         'date_moved': time.strftime('%Y-%m-%d'),
                         'picking_id': pickid,
                         'state': 'waiting',
+                        'company_id': company_id,
                         'move_history_ids': [],
                         'date_planned': (datetime.strptime(move.date_planned, '%Y-%m-%d %H:%M:%S') + relativedelta(days=delay or 0)).strftime('%Y-%m-%d'),
                         'move_history_ids2': []}
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index c9a157a74b9..5733f8c9375 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -422,7 +422,9 @@
                         <field name="chained_location_id"/>
                         <field name="chained_auto_packing"/>
                         <field name="chained_delay"/>
-                        <field name="chained_journal_id" groups="base.group_extended"/>
+                        <field name="chained_journal_id"/>
+                        <field name="chained_picking_type"/>
+                        <field name="chained_company_id" widget="selection"/>
                     </group>
                     <group col="2" colspan="2">
                         <separator string="Localization" colspan="2"/>
diff --git a/addons/stock_location/mrp_pull.py b/addons/stock_location/mrp_pull.py
index a8a5026bf4c..4f9c22a54cd 100644
--- a/addons/stock_location/mrp_pull.py
+++ b/addons/stock_location/mrp_pull.py
@@ -68,7 +68,7 @@ class procurement_order(osv.osv):
             origin = (proc.origin or proc.name or '').split(':')[0] +':'+line.name
             picking_id = self.pool.get('stock.picking').create(cr, uid, {
                 'origin': origin,
-                'company_id': line.company_id and line.company_id.id or False,
+                'company_id': line.chained_company_id and line.chained_company_id.id or False,
                 'type': line.picking_type,
                 'stock_journal_id': line.journal_id and line.journal_id.id or False,
                 'move_type': 'one',
@@ -79,7 +79,7 @@ class procurement_order(osv.osv):
             move_id = self.pool.get('stock.move').create(cr, uid, {
                 'name': line.name,
                 'picking_id': picking_id,
-                'company_id': line.company_id and line.company_id.id or False,
+                'company_id': line.chained_company_id and line.chained_company_id.id or False,
                 'product_id': proc.product_id.id,
                 'date_planned': proc.date_planned,
                 'product_qty': proc.product_qty,
diff --git a/addons/stock_location/stock.py b/addons/stock_location/stock.py
index f3460fa7e30..d49b9ffbafa 100644
--- a/addons/stock_location/stock.py
+++ b/addons/stock_location/stock.py
@@ -40,6 +40,7 @@ class stock_location_path(osv.osv):
             ("none", "Not from Picking")], "Invoice Status",
             required=True,),
         'picking_type': fields.selection([('out','Sending Goods'),('in','Getting Goods'),('internal','Internal'),('delivery','Delivery')], 'Shipping Type', required=True, select=True, help="Depending on the company, choose whatever you want to receive or send products"),
+        'chained_company_id': fields.many2one('res.company', 'Chained Company', help='Set here the belonging company of the chained move'),
         'auto': fields.selection(
             [('auto','Automatic Move'), ('manual','Manual Operation'),('transparent','Automatic No Step Added')],
             'Automatic Move',
@@ -54,6 +55,7 @@ class stock_location_path(osv.osv):
         'auto': lambda *arg: 'auto',
         'delay': lambda *arg: 1,
         'invoice_state': lambda *args: 'none',
+        'picking_type':lambda *args:'out',
     }
 stock_location_path()
 
@@ -71,6 +73,7 @@ class product_pulled_flow(osv.osv):
         'company_id': fields.many2one('res.company', 'Company', help="Is used to know to which company belong packings and moves"),
         'partner_address_id': fields.many2one('res.partner.address', 'Partner Address'),
         'picking_type': fields.selection([('out','Sending Goods'),('in','Getting Goods'),('internal','Internal'),('delivery','Delivery')], 'Shipping Type', required=True, select=True, help="Depending on the company, choose whatever you want to receive or send products"),
+        'chained_company_id': fields.many2one('res.company', 'Chained Company', help='Set here the belonging company of the chained move'),
         'product_id':fields.many2one('product.product','Product'),
         'invoice_state': fields.selection([
             ("invoiced", "Invoiced"),
@@ -117,7 +120,7 @@ class stock_location(osv.osv):
         if product:
             for path in product.path_ids:
                 if path.location_from_id.id == location.id:
-                    return path.location_dest_id, path.auto, path.delay, path.journal_id.id
+                    return path.location_dest_id, path.auto, path.delay, path.journal_id and path.journal_id.id or False, path.chained_company_id and path.chained_companyd_id.id or False, path.picking_type
         return super(stock_location, self).chained_location_get(cr, uid, location, partner, product, context)
 stock_location()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From c6eae9c717bf0560e33cb81d5becd4f4a193ce04 Mon Sep 17 00:00:00 2001
From: "nel@tinyerp.com" <>
Date: Tue, 15 Jun 2010 14:41:14 +0200
Subject: [PATCH 09/39] [IMP] claim

bzr revid: nel@tinyerp.com-20100615124114-b3l2s343ueiz883e
---
 addons/claim_from_delivery/__init__.py        |  2 +-
 addons/claim_from_delivery/claim_delivery.py  | 29 +++++++++++++++++++
 .../claim_delivery_view.xml                   | 24 +++++++++++++--
 addons/crm_claim/crm_claim.py                 |  3 +-
 addons/product_expiry/product_expiry.py       |  1 +
 addons/product_expiry/wizard/stock_partial.py |  8 +++++
 .../wizard/stock_partial_view.xml             |  3 ++
 7 files changed, 66 insertions(+), 4 deletions(-)
 create mode 100644 addons/claim_from_delivery/claim_delivery.py

diff --git a/addons/claim_from_delivery/__init__.py b/addons/claim_from_delivery/__init__.py
index 6f95fbf0fbc..b10828031a8 100644
--- a/addons/claim_from_delivery/__init__.py
+++ b/addons/claim_from_delivery/__init__.py
@@ -17,6 +17,6 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
 #
 ##############################################################################
-
+import claim_delivery
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/claim_from_delivery/claim_delivery.py b/addons/claim_from_delivery/claim_delivery.py
new file mode 100644
index 00000000000..4e81a0a3067
--- /dev/null
+++ b/addons/claim_from_delivery/claim_delivery.py
@@ -0,0 +1,29 @@
+# -*- 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/>.
+#
+##############################################################################
+
+from osv import fields, osv
+
+class stock_picking(osv.osv):
+    _inherit = "stock.picking"
+    _columns = {
+        'partner_id': fields.related('address_id','partner_id',type='many2one', relation="res.partner", string="Partner"),
+        }
+stock_picking()
diff --git a/addons/claim_from_delivery/claim_delivery_view.xml b/addons/claim_from_delivery/claim_delivery_view.xml
index a1c8be870e2..7fb68cc6348 100644
--- a/addons/claim_from_delivery/claim_delivery_view.xml
+++ b/addons/claim_from_delivery/claim_delivery_view.xml
@@ -1,12 +1,32 @@
 <openerp>
 	<data>
-  
+
+        <record id="view_picking_delivery" model="ir.ui.view">
+            <field name="name">stock.picking.delivery.form20</field>
+            <field name="model">stock.picking</field>
+            <field name="type">form</field>
+            <field name="priority" eval="2"/>
+            <field name="inherit_id" ref="stock.view_picking_delivery_form"/>
+            <field name="arch" type="xml">
+              <xpath expr="//form/group/field[@name='date']"  position="after">
+                <field name="partner_id" invisible="1"/>
+              </xpath>
+            </field>
+        </record>
+
     <act_window
-            id="act_claim_from_delivery"
+      id="action_claim_from_delivery"
             name="Claim"
+            domain="[]"
             target="current"
             view_mode="form"
             res_model="crm.claim"
             src_model="stock.picking"/>
+
+
+        <record id="action_claim_from_delivery" model="ir.actions.act_window">
+          <field name="context">{'default_partner_address_id': address_id, 'default_partner_id': partner_id}</field>
+        </record>
+
 	</data>
 </openerp>
diff --git a/addons/crm_claim/crm_claim.py b/addons/crm_claim/crm_claim.py
index d9a7a2b34c0..e8a14df42a8 100644
--- a/addons/crm_claim/crm_claim.py
+++ b/addons/crm_claim/crm_claim.py
@@ -74,7 +74,8 @@ class crm_claim(osv.osv, crm.crm_case):
         'company_id': fields.many2one('res.company', 'Company'), 
         'partner_id': fields.many2one('res.partner', 'Partner'), 
         'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact', \
-                                 domain="[('partner_id','=',partner_id)]"), 
+                                # domain="[('partner_id','=',partner_id)]"
+                                 ), 
         'email_cc': fields.text('Watchers Emails', size=252, help="These people will receive a copy of the future communication between partner and users by email"), 
         'email_from': fields.char('Email', size=128, help="These people will receive email."), 
         'partner_name': fields.char("Employee's Name", size=64), 
diff --git a/addons/product_expiry/product_expiry.py b/addons/product_expiry/product_expiry.py
index fdc63d28afe..fd22ecff8b6 100644
--- a/addons/product_expiry/product_expiry.py
+++ b/addons/product_expiry/product_expiry.py
@@ -21,6 +21,7 @@
 import datetime
 from osv import fields, osv
 import pooler
+import time
 
 class stock_production_lot(osv.osv):
     _name = 'stock.production.lot'
diff --git a/addons/product_expiry/wizard/stock_partial.py b/addons/product_expiry/wizard/stock_partial.py
index bc44628078c..e893b36c3cf 100644
--- a/addons/product_expiry/wizard/stock_partial.py
+++ b/addons/product_expiry/wizard/stock_partial.py
@@ -68,5 +68,13 @@ class stock_move_split_lines_exist(osv.osv_memory):
     _columns = {
         'date': fields.date('Date'),
     }
+    def on_change_product(self, cr, uid, ids, product_id):
+        if not product_id:
+            return {'value':{'date': False}}
+        day_life = self.pool.get('product.product').browse(cr, uid, product_id).life_time
+        date_life = (datetime.datetime.now() + datetime.timedelta(days=day_life))
+        return {'value':{'date': date_life.strftime('%Y-%m-%d')
+}}
+
 
 stock_move_split_lines_exist()
diff --git a/addons/product_expiry/wizard/stock_partial_view.xml b/addons/product_expiry/wizard/stock_partial_view.xml
index fabc531cf14..ca3554ea900 100644
--- a/addons/product_expiry/wizard/stock_partial_view.xml
+++ b/addons/product_expiry/wizard/stock_partial_view.xml
@@ -9,6 +9,9 @@
              <field name="inherit_id" ref="stock.view_split_in_lots"/>
               <field name="arch" type="xml">
               <data>
+                <xpath expr="//form/group/field[@name='line_exist_ids']/tree/field[@name='prodlot_id']"  position="replace">
+                  <field name="prodlot_id" on_change="on_change_product(parent.product_id)"/>
+                </xpath>
                 <xpath expr="//form/group/field[@name='line_exist_ids']/tree/field[@name='quantity']"  position="after">
                   <field name="date"/>
                 </xpath>

From 06dd77aa000e17224f686ce61b4ca142bad1e102 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Tue, 15 Jun 2010 18:20:36 +0530
Subject: [PATCH 10/39] [ADD,IMP] point_of_sale : new point of sale report
 added, improvemetns in cashbox

bzr revid: vir@tinyerp.com-20100615125036-0u76xmmnk2m98aox
---
 addons/point_of_sale/__openerp__.py           |  1 +
 .../point_of_sale/account_bank_statement.py   |  3 +
 addons/point_of_sale/report/__init__.py       |  1 +
 .../point_of_sale/report/report_pos_order.py  | 89 +++++++++++++++++
 .../report/report_pos_order_view.xml          | 98 +++++++++++++++++++
 addons/point_of_sale/statement_view.xml       | 43 +++++++-
 6 files changed, 231 insertions(+), 4 deletions(-)
 create mode 100644 addons/point_of_sale/report/report_pos_order.py
 create mode 100644 addons/point_of_sale/report/report_pos_order_view.xml

diff --git a/addons/point_of_sale/__openerp__.py b/addons/point_of_sale/__openerp__.py
index 27707bcf0e0..68d3bd85d8d 100644
--- a/addons/point_of_sale/__openerp__.py
+++ b/addons/point_of_sale/__openerp__.py
@@ -66,6 +66,7 @@ Main features :
         'pos_report.xml',
        # 'pos_wizard.xml',
         'pos_view.xml',
+        'report/report_pos_order_view.xml',
         'pos_sequence.xml',
         'posrule_data.xml',
         'pos_data.xml',
diff --git a/addons/point_of_sale/account_bank_statement.py b/addons/point_of_sale/account_bank_statement.py
index 1f8ccc80162..7b808a7273c 100644
--- a/addons/point_of_sale/account_bank_statement.py
+++ b/addons/point_of_sale/account_bank_statement.py
@@ -246,6 +246,9 @@ class account_bank_statement(osv.osv):
             self.write(cr, uid, statement.id, {'balance_end_real':Decimal(str(val_statement_line))+Decimal(str(val2)),'closing_date':time.strftime("%Y-%m-%d %H:%M:%S"),'state':'draft'})
            # self.write(cr, uid, statement.id, {'balance_end_real':bal_st+val_statement_line,'closing_date':time.strftime("%Y-%m-%d %H:%M:%S"),'state':'draft'})
         return  super(account_bank_statement, self).button_confirm(cr, uid, ids, context=None)
+    
+    def button_cancel(self, cr, uid, ids, context={}):
+        self.write(cr, uid, ids, {'state':'draft'}, context=context)
 
 account_bank_statement()
 
diff --git a/addons/point_of_sale/report/__init__.py b/addons/point_of_sale/report/__init__.py
index 4af503ff9da..9f0f94bb816 100644
--- a/addons/point_of_sale/report/__init__.py
+++ b/addons/point_of_sale/report/__init__.py
@@ -37,5 +37,6 @@ import pos_sales_user_today_current_user
 import pos_receipt_with_remboursment
 import pos_receipt_without_remboursment
 import point_of_sale_report
+import report_pos_order
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/point_of_sale/report/report_pos_order.py b/addons/point_of_sale/report/report_pos_order.py
new file mode 100644
index 00000000000..082ff3f434e
--- /dev/null
+++ b/addons/point_of_sale/report/report_pos_order.py
@@ -0,0 +1,89 @@
+# -*- 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 tools
+from osv import fields,osv
+
+class report_pos_order(osv.osv):
+    _name = "report.pos.order"
+    _description = "Point of Sale Orders Statistics"
+    _auto = False
+    _columns ={
+        'date': fields.date('Date Order', readonly=True),
+        'date_validation': fields.date('Date Confirm', readonly=True),
+        'date_payment': fields.date('Date Confirm', readonly=True),
+        'year': fields.char('Year', size=4, readonly=True),
+        'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'),
+            ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'),
+            ('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True),
+        'day': fields.char('Day', size=128, readonly=True),
+        'partner_id':fields.many2one('res.partner', 'Partner', readonly=True),
+        'product_id':fields.many2one('product.product', 'Product', readonly=True),
+        'state': fields.selection([('draft', 'Draft'), ('payment', 'Payment'),
+                                    ('advance','Advance'),
+                                   ('paid', 'Paid'), ('done', 'Done'), ('invoiced', 'Invoiced'), ('cancel', 'Cancel')],
+                                  'State'),
+        'user_id':fields.many2one('res.users', 'Salesman', readonly=True),
+        'price_total':fields.float('Total Price', readonly=True),
+        'shop_id':fields.many2one('sale.shop', 'Shop', readonly=True),
+        'company_id':fields.many2one('res.company', 'Company', readonly=True),
+        'nbr':fields.integer('# of Lines', readonly=True),
+        'product_qty':fields.float('# of Qty', readonly=True),
+        'journal_id': fields.many2one('account.journal', 'Journal'),
+    }
+    _order = 'date desc'
+    def init(self, cr):
+        tools.drop_view_if_exists(cr, 'report_pos_order')
+        cr.execute("""
+            create or replace view report_pos_order as (
+                select el.*,
+
+                    (select 1) as nbr,
+                    to_date(to_char(po.date_order, 'dd-MM-YYYY'),'dd-MM-YYYY') as date,
+                    po.date_validation as date_validation,
+                    po.date_payment as date_payment,
+                    to_char(po.date_order, 'YYYY') as year,
+                    to_char(po.date_order, 'MM') as month,
+                    to_char(po.date_order, 'YYYY-MM-DD') as day,
+                    po.partner_id as partner_id,
+                    po.state as state,
+                    po.user_id as user_id,
+                    po.shop_id as shop_id,
+                    po.company_id as company_id,
+                    po.sale_journal as journal_id
+
+                from
+                    pos_order as po,
+                    ( select pl.id as id,
+                        pl.product_id as product_id,
+                        pl.qty as product_qty,
+                        sum(pl.qty * pl.price_unit)- sum(pl.qty * pl.price_ded) as price_total,
+                        pl.order_id
+                    from
+                        pos_order_line as pl
+                        left join product_template pt on (pt.id=pl.product_id)
+                    group by
+                        pl.id,pl.order_id, pl.qty,pl.product_id)  el
+                where po.id = el.order_id
+                )
+            """)
+
+report_pos_order()
diff --git a/addons/point_of_sale/report/report_pos_order_view.xml b/addons/point_of_sale/report/report_pos_order_view.xml
new file mode 100644
index 00000000000..ecd3d431a3a
--- /dev/null
+++ b/addons/point_of_sale/report/report_pos_order_view.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="view_report_pos_order_tree" model="ir.ui.view">
+	        <field name="name">report.pos.order.tree</field>
+	        <field name="model">report.pos.order</field>
+	        <field name="type">tree</field>
+	        <field name="arch" type="xml">
+	            <tree string="Point of Sale Analysis">
+	                <field name="date" />
+	                <field name="date_validation" invisible="1"/>
+	                <field name="date_payment" invisible="1"/>
+	                <field name="user_id" invisible="1"/>
+	                <field name="year" invisible="1"/>
+	                <field name="day" invisible="1"/>
+	                <field name="month" invisible="1"/>
+	                <field name="partner_id" invisible="1"/>
+                    <field name="product_id" invisible="1"/>
+	                <field name="shop_id" invisible="1"/>
+	                <field name="journal_id" invisible="1"/>
+                    <field name="company_id" invisible="1" groups="base.group_multi_company"/>
+	                <field name="nbr" sum="# of Lines"/>
+	                <field name="product_qty" sum="# of Qty"/>
+	                <field name="price_total" sum="Total Price"/>
+	                <field name="state" invisible="1"/>
+	            </tree>
+	        </field>
+        </record>
+
+        <record id="view_report_pos_order_search" model="ir.ui.view">
+	        <field name="name">report.pos.order.search</field>
+	        <field name="model">report.pos.order</field>
+	        <field name="type">search</field>
+	        <field name="arch" type="xml">
+	            <search string="Point of Sale Analysis">
+	                <group>
+	                    <filter icon="terp-go-year" string="  365 Days  "
+	                        domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
+	                        help="POS ordered created last 365 days"/>
+	                    <filter icon="terp-go-month" string="   30 Days   "
+	                        name="month"
+	                        domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
+	                        help="POS ordered created in last 30 days"/>
+	                    <filter icon="terp-go-week"
+	                         string="    7 Days    "
+	                         separator="1"
+	                         domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
+	                         help="POS ordered created last 7 days"/>
+	                    <separator orientation="vertical"/>
+	                    <filter icon="terp-document-new"
+	                        string="Draft"
+	                        domain="[('state','=','draft')]"/>
+	                    <filter icon="terp-dolar"
+	                        string="Paid"
+	                        domain="[('state','=',('paid'))]"/>
+	                    <filter icon="terp-dolar"
+                            string="Invoiced"
+                            domain="[('state','=',('invoiced'))]"/>
+                    <separator orientation="vertical"/>
+                    <field name="partner_id"/>
+                    <field name="user_id" widget="selection">
+                        <filter icon="terp-dolar"
+                            string="My Sales"
+                            help="My Sales"
+                            domain="[('user_id','=',uid)]"/>
+                    </field>
+	                </group>
+	                <newline/>
+	                <group expand="0" string="Group By..." colspan="10" col="12">
+	                    <filter string="Salesman" icon="terp-personal" name="User" context="{'group_by':'user_id'}"/>
+	                    <filter string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}"/>
+	                    <separator orientation="vertical"/>
+                        <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+	                    <separator orientation="vertical"/>
+	                    <filter string="Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>
+	                    <filter string="Shop" icon="terp-go-home" context="{'group_by':'shop_id'}"/>
+                        <filter string="Company" icon="terp-go-home" groups="base.group_multi_company" context="{'group_by':'company_id'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Day" icon="terp-go-month" context="{'group_by':'day'}"/>
+                        <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
+                        <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
+	                </group>
+	            </search>
+	        </field>
+        </record>
+
+        <record id="action_report_pos_order_all" model="ir.actions.act_window">
+	        <field name="name">Point of Sale Analysis</field>
+	        <field name="res_model">report.pos.order</field>
+	        <field name="view_type">form</field>
+	        <field name="view_mode">tree,graph</field>
+	        <field name="search_view_id" ref="view_report_pos_order_search"/>
+	        <field name="context">{'search_default_month':1,'search_default_User':1}</field>
+	    </record>
+
+	    <menuitem action="action_report_pos_order_all" id="menu_report_pos_order_all" parent="menu_point_rep" sequence="1"/>
+	</data>
+</openerp>
\ No newline at end of file
diff --git a/addons/point_of_sale/statement_view.xml b/addons/point_of_sale/statement_view.xml
index a4acd7429ec..65b5fb419d6 100644
--- a/addons/point_of_sale/statement_view.xml
+++ b/addons/point_of_sale/statement_view.xml
@@ -24,7 +24,7 @@
             <field name="model">account.bank.statement</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="red:balance_end_real!=balance_end;blue:state=='draft' and (balance_end_real==balance_end)" string="Statement">
+                <tree colors="red:balance_end_real!=balance_end;blue:state=='draft' and (balance_end_real==balance_end);black:state in ('open');blue:state in ('draft')" string="Statement">
                     <field name="date"/>
                     <field name="name"/>
                     <field name="journal_id"/>
@@ -34,6 +34,9 @@
                     <field name="balance_end"/>
                     <field name="user_id"/>
                     <field name="state"/>
+                    <button type="object" string="Open" name="button_open" states="draft" icon="terp-camera_test"/>
+                    <button type="object" string="Confirm" name="button_confirm" states="open" icon="terp-gtk-go-back-rtl"/>
+                    <button type="object" string="Cancel" name="button_cancel" states="confirm" icon="terp-gtk-stop"/>
                 </tree>
             </field>
         </record>
@@ -349,11 +352,43 @@
 
         <menuitem action="action_bank_statement_treenew" id="menu_statement_tree2" parent="menu_statement_tree_all" sequence="1"/>
 
+        <record id="view_account_bank_statment_filter" model="ir.ui.view">
+            <field name="name">account.bank.statment.select</field>
+            <field name="model">account.bank.statement</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Cashbox">
+                   <group col='9' colspan='4'>
+                       <filter icon="terp-camera_test" string="Open"
+                           domain="[('state','=','open')]"
+                           help="All open cashboxes"/>
+                       <filter icon="terp-dialog-close" string="To Close"
+                           domain="[('state','=','draft')]"
+                           help="All cashboxes to close"/>
+                       <filter icon="terp-go-today" name="Today" string="Today"
+                          domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d 23:59:59'))]"
+                           help="All cashboxes to opened today"/>
+                       <separator orientation="vertical"/>
+                       <field name="name"/>
+                   </group>
+                   <newline/>
+                   <group expand="0" string="Group By..." colspan="4" col="20">
+                       <filter string="Journal" icon="terp-folder-blue" domain="[]" context="{'group_by':'journal_id'}"/>
+                       <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                   </group>
+               </search>
+            </field>
+        </record>
+
         <record model="ir.actions.act_window" id="action_pos_account_bank_statment">
             <field name="name">All Cashboxes</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">account.bank.statement</field>
             <field name="view_type">form</field>
+            <field name="view_id" eval="False"/>
+            <field name="context">{'search_default_Today':1}</field>
+            <field name="search_view_id" ref="view_account_bank_statment_filter"/>
+
         </record>
         <record model="ir.actions.act_window.view" id="act_statement_a1">
                     <field name="sequence" eval="1"/>
@@ -367,7 +402,7 @@
                     <field name="view_id" ref="view_bank_statement_form3"/>
                     <field name="act_window_id" ref="action_pos_account_bank_statment"/>
         </record>
-        <menuitem name="All Cashboxes" parent="menu_point_report_register"
+        <menuitem name="All Cashboxes" parent="menu_statement_tree_all"
                  action="action_pos_account_bank_statment" id="menu_pos_bank_statment_tree" groups="base.group_extended" sequence="4"/>
 
         <record model="ir.actions.act_window" id="action_my_all_pos_account_bank_statment">
@@ -414,8 +449,8 @@
                     <field name="act_window_id" ref="action_cashboxes_to_close"/>
         </record>
 
-        <menuitem name="Cashboxes to Close" parent="menu_pos_bank_statment_tree"
-                 action="action_cashboxes_to_close" id="menu_cashboxes_to_close_tree" groups="base.group_extended"/>
+<!--        <menuitem name="Cashboxes to Close" parent="menu_statement_tree_all"-->
+<!--                 action="action_cashboxes_to_close" id="menu_cashboxes_to_close_tree" groups="base.group_extended"/>-->
 
 
         <menuitem

From b54be75ee88af1406d71a6eeae82055270ff971a Mon Sep 17 00:00:00 2001
From: "nel@tinyerp.com" <>
Date: Tue, 15 Jun 2010 15:44:08 +0200
Subject: [PATCH 11/39] [IMP] stock: modify views

bzr revid: nel@tinyerp.com-20100615134408-83lz9ct98smt9x7b
---
 addons/stock/stock_view.xml | 72 ++++++++++++++++++++++---------------
 1 file changed, 43 insertions(+), 29 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 5733f8c9375..f23306c64aa 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -619,25 +619,28 @@
                     </group>
                     <notebook colspan="4">
                         <page string="General Information">
-                            <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines, 'address_out_id': address_id}" editable="top">
-                                <tree colors="grey:state in ('cancel')" string="Stock Moves">
+                            <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines, 'address_out_id': address_id}">
+                                <tree colors="grey:state in ('cancel')" string="Stock Moves" editable="top">
                                     <field name="name" string="Move Name"/>
                                     <field name="product_id"/>
                                     <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
                                     <field name="product_uom" string="UOM"/>
                                     <field name="picking_id"/>
                                     <field name="prodlot_id" groups="base.group_extended"/>
-                                    <field groups="base.group_extended" name="tracking_id"/>
-                                    <field name="location_id"/>
-                                    <field name="location_dest_id"/>
-                                    <field name="date_planned"/>
-                                    <field name="date_expected" string="Date Expected"/>
-                                    <field name="state"/>
                                     <button
                                         name="%(stock.track_line)d"
                                         string="Split in production lots"
                                            type="action" icon="terp-stock_effects-object-colorize"
                                            states="draft,waiting,confirmed,assigned" />
+                                    <field groups="base.group_extended" name="tracking_id"/>
+                                    <button name="%(split_into)d" string="Split Stock Moves" type="action"
+                                            icon="terp-stock_effects-object-colorize" 
+                                            states="draft,assigned,confirmed,done"/>
+                                    <field name="location_id"/>
+                                    <field name="location_dest_id"/>
+                                    <field name="date_planned"/>
+                                    <field name="date_expected" string="Date Expected"/>
+                                    <field name="state"/>
 
                                     <button name="%(stock.move_scrap)d"
                                         string="Scrap Products" type="action"
@@ -670,9 +673,9 @@
                                             <newline/>
                                             <label/>
                                             <button name="%(track_line)d" string="Split in production lots" type="action" icon="terp-stock_effects-object-colorize"/>
-                                            <button name="%(split_into)d" string="Split into" type="action"
-                                                icon="terp-stock_effects-object-colorize" />
                                             <button name="%(move_scrap)d" string="Scrap Move Line" type="action" icon="gtk-justify-fill"/>
+                                            <button name="%(split_into)d" string="Split Stock Moves" type="action"
+                                                icon="terp-stock_effects-object-colorize" />
                                             <separator colspan="4" string="Move State"/>
                                             <field name="state"/>
                                             <group colspan="2">
@@ -773,8 +776,8 @@
                     </group>
                         <notebook colspan="4">
                         <page string="General Information">
-                            <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines, 'address_out_id': address_id}">
-                                <tree colors="grey:state in ('cancel')" string="Stock Moves">
+                            <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines, 'address_out_id': address_id}" >
+                                <tree colors="grey:state in ('cancel')" string="Stock Moves" editable="top">
                                     <field name="name" string="Move Name"/>
                                     <field name="product_id"/>
                                     <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
@@ -782,7 +785,7 @@
                                     <field name="picking_id" />
                                     <field name="prodlot_id" groups="base.group_extended"/>
                                     <field groups="base.group_extended" name="tracking_id"/>
-                                    <button name="%(split_into)d" string="Split into" type="action"
+                                    <button name="%(split_into)d" string="Split Stock Moves" type="action"
                                         icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
                                         states="draft,assigned,confirmed,done"/>
                                     <field name="location_id"/>
@@ -817,12 +820,17 @@
                                             <field name="date_planned"/>
                                              <field name="date_expected"  string="Date Expected"/>
                                             <field groups="base.group_extended" name="product_packaging"  domain="[('product_id','=',product_id)]"/>
+                                            <newline/>
                                             <field name="prodlot_id" groups="base.group_extended"
                                                 context="{'location_id':location_id, 'product_id':product_id}"
                                                 domain="[('product_id','=?',product_id)]"
                                                 on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"/>
                                             <field groups="base.group_extended" name="tracking_id"/>
-                                            <button name="%(split_into)d" string="Split into" type="action"
+
+                                            <label/>
+                                            <button name="%(track_line)d" string="Split in production lots" type="action" icon="terp-stock_effects-object-colorize"/>
+                                            <label/>
+                                            <button name="%(split_into)d" string="Split Stock Moves" type="action"
                                                 icon="terp-stock_effects-object-colorize"
                                                 states="draft,assigned,confirmed,done"/>
                                             <separator colspan="4" string="Move State"/>
@@ -959,7 +967,7 @@
                     </group>
                     <notebook colspan="4">
                         <page string="General Information">
-                            <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines, 'address_out_id': address_id}">
+                            <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines, 'address_out_id': address_id}" >
                                 <tree colors="grey:state in ('cancel')" string="Stock Moves" editable="top">
                                     <field name="product_id"/>
                                     <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
@@ -970,18 +978,18 @@
                                         states="draft,waiting,confirmed,assigned" />
                                     <field name="prodlot_id" groups="base.group_extended"/>
                                     <button name="%(track_line)d" string="Split in production lots" type="action"
-                                        icon="gtk-justify-fill" attrs="{'invisible': [('prodlot_id','&lt;&gt;',False)]}"
+                                        icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('prodlot_id','&lt;&gt;',False)]}"
                                         states="assigned,confirmed,done"
                                         groups="base.group_extended"/>
                                     <field name="tracking_id" groups="base.group_extended"/>
-                                  <button name="%(split_into)d" string="Split into" type="action"
-                                      icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
+                                  <button name="%(split_into)d" string="Split Stock Moves" type="action"
+                                      icon="terp-stock_effects-object-colorize"
                                       states="draft,assigned,confirmed,done"/>
                                     <field name="location_id"/>
                                     <field name="date_planned"/>
                                     <field name="state"/>
                                     <button name="%(action_partial_move)d" string="Partial" type="action" states="confirmed,assigned" icon="gtk-justify-fill"/>
-                                    <button name="action_done" states="confirmed,assigned" string="Done" type="object" icon="gtk-jump-to"/>
+                                    <!--button name="action_done" states="confirmed,assigned" string="Done" type="object" icon="gtk-jump-to"/-->
                                 </tree>
                                 <form string="Stock Moves">
                                     <notebook colspan="4">
@@ -999,16 +1007,19 @@
                                             <field name="date_planned"/>
                                              <field name="date_expected"  string="Date Expected"/>
                                             <field groups="base.group_extended" name="product_packaging" domain="[('product_id','=',product_id)]"/>
+                                            <newline/>
                                             <field name="prodlot_id" groups="base.group_extended"
                                                 context="{'location_id':location_id, 'product_id':product_id}"
                                                 domain="[('product_id','=?',product_id)]"
                                                 on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"/>
                                             <field groups="base.group_extended" name="tracking_id"/>
-                                            <button name="%(split_into)d" string="Split into" type="action"
-                                                icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
-                                                states="draft,assigned,confirmed,done"/>
                                             <label/>
                                             <button name="%(track_line)d" string="Split in production lots" type="action" icon="terp-stock_effects-object-colorize"/>
+                                            <label/>
+                                            <button name="%(split_into)d" string="Split Stock Moves" type="action"
+                                                icon="terp-stock_effects-object-colorize" 
+                                                states="draft,assigned,confirmed,done"/>
+                                            <label/>
                                             <separator colspan="4" string="Move State"/>
                                             <field name="state"/>
                                             <group colspan="2">
@@ -1144,7 +1155,7 @@
                     </group>
                     <notebook colspan="4">
                         <page string="General Information">
-                            <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines, 'address_in_id': address_id}">
+                            <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines, 'address_in_id': address_id}" >
                                 <tree colors="grey:state in ('cancel')" string="Stock Moves" editable="top">
                                     <field name="product_id"/>
                                     <field name="product_qty"/>
@@ -1156,13 +1167,12 @@
                                            string="Split in production lots"
                                            type="action" icon="terp-stock_effects-object-colorize"
                                            states="draft,waiting,confirmed,assigned" />
-
                                     <field name="tracking_id" groups="base.group_extended"/>
-                                    <button name="%(split_into)d" string="Split into" type="action"
+                                    <button name="%(split_into)d" string="Split Stock Moves" type="action"
                                         icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
                                         states="draft,assigned,confirmed,done"/>
                                     <field name="state"/>
-                                                                         <button name="%(stock.move_scrap)d"
+                                     <button name="%(stock.move_scrap)d"
                                         string="Scrap Products" type="action"
                                         icon="gtk-convert" context="{'scrap': True}"
                                         states="draft,waiting,confirmed,assigned" />
@@ -1185,12 +1195,12 @@
                                             <newline/>
                                             <field name="prodlot_id" groups="base.group_extended" context="{'location_id':location_id, 'product_id':product_id}" domain="[('product_id','=?',product_id)]" on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"/>
                                             <field groups="base.group_extended" name="tracking_id"/>
-                                            <newline/>
 
                                             <newline/>
                                             <label/>
                                           	<button groups="base.group_extended" name="267" string="Split in production lots" type="action" icon="terp-stock_effects-object-colorize"/>
-  											<button name="275" string="Split Stock Moves" type="action" icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}" states="draft,assigned,confirmed,done"/>
+                                            <label/>
+                                            <button name="275" string="Split Stock Moves" type="action" icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}" states="draft,assigned,confirmed,done"/>
                                             <separator colspan="4" string="Move State"/>
                                             <field name="state"/>
                                             <group colspan="2">
@@ -1344,7 +1354,7 @@
                         states="assigned,confirmed"
                         groups="base.group_extended"/>
                     <field groups="base.group_extended" name="tracking_id"/>
-                    <button name="%(split_into)d" string="Split into" type="action"
+                    <button name="%(split_into)d" string="Split Stock Moves" type="action"
                         icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
                         states="draft,assigned,confirmed,done"/>
                     <field name="location_id"/>
@@ -1403,7 +1413,9 @@
                                     on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"/>
                                 <newline/>
                                 <group colspan="4" col="4">
+                                  <label/>
                                 	<button name="%(track_line)d" string="Split in production lots" type="action" icon="terp-stock_effects-object-colorize" colspan="2" />
+                                  <label/>
                                 	<button name="%(split_into)d" string="Split Stock Moves" type="action"
                                 		icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
                                 		states="draft,assigned,confirmed,done"/>
@@ -1542,9 +1554,11 @@
                             <newline/>
                             <field name="picking_id"/>
                             <group col="2" colspan="2">
+                              <label/>
 	                            <button name="%(split_into)d" string="Split Stock Moves" type="action"
 	                            	icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
 	                            	states="draft,assigned,confirmed,done"/>
+                              <label/>
 	                            <button name="%(track_line)d" string="Split in production lots" type="action" icon="terp-stock_effects-object-colorize"/>
                         	</group>
                             <separator colspan="4" string="Move State"/>

From 06e7359da75536e35032fbf2a9ce2de131e3f0af Mon Sep 17 00:00:00 2001
From: "nel@tinyerp.com" <>
Date: Tue, 15 Jun 2010 21:19:08 +0200
Subject: [PATCH 12/39] [FIX] sale: problem of company id on move and picking
 when validating SO add button set last track name

bzr revid: nel@tinyerp.com-20100615191908-nmcdaihdz04zof1r
---
 addons/sale/__openerp__.py                   |  2 +-
 addons/stock/security/ir.model.access.csv    |  2 ++
 addons/stock/stock.py                        | 20 +++++++++++++++++---
 addons/stock/stock_view.xml                  | 18 ++++++++++++++++++
 addons/stock/wizard/stock_splitinto.py       |  5 +++++
 addons/stock/wizard/stock_splitinto_view.xml |  3 ++-
 6 files changed, 45 insertions(+), 5 deletions(-)

diff --git a/addons/sale/__openerp__.py b/addons/sale/__openerp__.py
index 2f265b3d6f7..bacfc3b7abe 100644
--- a/addons/sale/__openerp__.py
+++ b/addons/sale/__openerp__.py
@@ -60,7 +60,7 @@
         'stock_view.xml',
 #        'process/sale_process.xml',
     ],
-    'demo_xml': ['sale_demo.xml'],
+  #  'demo_xml': ['sale_demo.xml'],
     'test': [
              'test/shipping_manual_sale_order.yml',
              'test/prepaid_sale_order.yml',
diff --git a/addons/stock/security/ir.model.access.csv b/addons/stock/security/ir.model.access.csv
index 803431d8bd0..9b8c7a100b3 100644
--- a/addons/stock/security/ir.model.access.csv
+++ b/addons/stock/security/ir.model.access.csv
@@ -42,3 +42,5 @@
 "access_stock_inventory_merge","stock.inventory.merge","model_stock_inventory_merge","stock.group_stock_user",1,0,0,0
 "access_stock_change_standard_price","stock.change.standard.price","model_stock_change_standard_price","stock.group_stock_user",1,0,0,0
 "access_action_traceability","action.traceability","model_action_traceability","stock.group_stock_user",1,0,0,0
+"access_stock_split_into","stock.split.into","model_stock_split_into","stock.group_stock_user",1,0,0,0
+"access_stock_split_into_manager","stock.split.into","model_stock_split_into","stock.group_stock_manager",1,1,1,1
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index bf308f191b5..0d8bda2f2f3 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -612,7 +612,7 @@ class stock_picking(osv.osv):
         'type': lambda *a: 'in',
         'invoice_state': lambda *a: 'none',
         'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
-        'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock_picking', context=c)
+        'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.picking', context=c)
     }
 
     def copy(self, cr, uid, id, default=None, context={}):
@@ -1302,6 +1302,7 @@ stock_production_lot_revision()
 #   location_dest_id is only used for predicting futur stocks
 #
 class stock_move(osv.osv):
+
     def _getSSCC(self, cr, uid, context={}):
         cr.execute('select id from stock_tracking where create_uid=%s order by id desc limit 1', (uid,))
         res = cr.fetchone()
@@ -1572,6 +1573,7 @@ class stock_move(osv.osv):
 
         def create_chained_picking(self, cr, uid, moves, context):
             new_moves = []
+            res_obj =  self.pool.get('res.company')
             for picking, todo in self._chain_compute(cr, uid, moves, context).items():
                 ptype = todo[0][1][5] and todo[0][1][5] or self.pool.get('stock.location').picking_type_get(cr, uid, todo[0][0].location_dest_id, todo[0][1][0])
                 pick_name = ''
@@ -1585,8 +1587,9 @@ class stock_move(osv.osv):
                     'move_type': picking.move_type,
                     'auto_picking': todo[0][1][1] == 'auto',
                     'stock_journal_id': todo[0][1][3],
-                    'company_id': todo[0][1][4],
+                    'company_id': todo[0][1][4] or res_obj._company_default_get(cr, uid, 'stock.company', context),
                     'address_id': picking.address_id.id,
+
                     'invoice_state': 'none'
                 })
                 for move, (loc, auto, delay, journal, company_id, ptype) in todo:
@@ -1596,7 +1599,7 @@ class stock_move(osv.osv):
                         'date_moved': time.strftime('%Y-%m-%d'),
                         'picking_id': pickid,
                         'state': 'waiting',
-                        'company_id': company_id,
+                        'company_id': company_id or res_obj._company_default_get(cr, uid, 'stock.company', context)  ,
                         'move_history_ids': [],
                         'date_planned': (datetime.strptime(move.date_planned, '%Y-%m-%d %H:%M:%S') + relativedelta(days=delay or 0)).strftime('%Y-%m-%d'),
                         'move_history_ids2': []}
@@ -1682,6 +1685,17 @@ class stock_move(osv.osv):
                 wf_service.trg_write(uid, 'stock.picking', pick_id, cr)
         return count
 
+    def setlast_tracking(self, cr, uid, ids, context=None):
+        new_move = []
+        update_val = {}
+        last_prod = [line.prodlot_id for line in self.browse(cr, uid, ids)[0].picking_id.move_lines if line.prodlot_id]
+        last_prod.sort(key=lambda p: p.date, reverse=True)
+        last_prod_id = last_prod and last_prod[0].id
+        update_val['prodlot_id'] = last_prod_id
+        self.write(cr, uid, ids, update_val)
+        return True
+    
+
     #
     # Cancel move => cancel others move and pickings
     #
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index f23306c64aa..7cef0343edc 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -636,6 +636,9 @@
                                     <button name="%(split_into)d" string="Split Stock Moves" type="action"
                                             icon="terp-stock_effects-object-colorize" 
                                             states="draft,assigned,confirmed,done"/>
+                                    <button name="setlast_tracking" string="Set Last Tracking" type="object"
+                                        icon="terp-stock_effects-object-colorize" 
+                                        states="draft,assigned,confirmed,done"/>
                                     <field name="location_id"/>
                                     <field name="location_dest_id"/>
                                     <field name="date_planned"/>
@@ -788,6 +791,9 @@
                                     <button name="%(split_into)d" string="Split Stock Moves" type="action"
                                         icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
                                         states="draft,assigned,confirmed,done"/>
+                                    <button name="setlast_tracking" string="Set Last Tracking" type="object"
+                                        icon="terp-stock_effects-object-colorize" 
+                                        states="draft,assigned,confirmed,done"/>
                                     <field name="location_id"/>
                                     <field name="location_dest_id"/>
                                     <field name="date_planned"/>
@@ -985,6 +991,9 @@
                                   <button name="%(split_into)d" string="Split Stock Moves" type="action"
                                       icon="terp-stock_effects-object-colorize"
                                       states="draft,assigned,confirmed,done"/>
+                                <button name="setlast_tracking" string="Set Last Tracking" type="object"
+                                    icon="terp-stock_effects-object-colorize" 
+                                    states="draft,assigned,confirmed,done"/>
                                     <field name="location_id"/>
                                     <field name="date_planned"/>
                                     <field name="state"/>
@@ -1171,6 +1180,9 @@
                                     <button name="%(split_into)d" string="Split Stock Moves" type="action"
                                         icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
                                         states="draft,assigned,confirmed,done"/>
+                                    <button name="setlast_tracking" string="Set Last Tracking" type="object"
+                                        icon="terp-stock_effects-object-colorize" 
+                                        states="draft,assigned,confirmed,done"/>
                                     <field name="state"/>
                                      <button name="%(stock.move_scrap)d"
                                         string="Scrap Products" type="action"
@@ -1357,6 +1369,9 @@
                     <button name="%(split_into)d" string="Split Stock Moves" type="action"
                         icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
                         states="draft,assigned,confirmed,done"/>
+                    <button name="setlast_tracking" string="Set Last Tracking" type="object"
+                        icon="terp-stock_effects-object-colorize" 
+                        states="draft,assigned,confirmed,done"/>
                     <field name="location_id"/>
                     <field name="location_dest_id"/>
                     <field name="date_planned"/>
@@ -1511,6 +1526,9 @@
                     <button name="%(split_into)d" string="Split Stock Moves" type="action"
                         icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
                         states="draft,assigned,confirmed,done"/>
+                    <button name="setlast_tracking" string="Set Last Tracking" type="object"
+                        icon="terp-stock_effects-object-colorize" 
+                        states="draft,assigned,confirmed,done"/>
                     <field name="date_planned"/>
                     <field name="backorder_id" groups="base.group_extended"/>
                     <field name="state"/>
diff --git a/addons/stock/wizard/stock_splitinto.py b/addons/stock/wizard/stock_splitinto.py
index a3b372d7eb8..dcc97d6379d 100644
--- a/addons/stock/wizard/stock_splitinto.py
+++ b/addons/stock/wizard/stock_splitinto.py
@@ -56,12 +56,16 @@ class stock_split_into(osv.osv_memory):
         update_val = {}
         value_to_split = self.browse(cr, uid, data[0], context)
         quantity =  value_to_split.quantity or 0.0
+        ir_sequence_obj = self.pool.get('ir.sequence')
+        prodlot_obj = self.pool.get('stock.production.lot')
         for move in move_obj.browse(cr, uid, rec_id):
             move_qty = move.product_qty
             uos_qty_rest = move.product_uos_qty
             quantity_rest = move_qty - quantity
             if quantity_rest == 0:
                 continue
+            sequence = ir_sequence_obj.get(cr, uid, 'stock.lot.serial')
+            prodlot_id = prodlot_obj.create(cr, uid, {'name': sequence}, {'product_id': move.product_id.id})
             uos_qty = quantity / move_qty * move.product_uos_qty
             uos_qty_rest = quantity_rest / move_qty * move.product_uos_qty
             default_val = {
@@ -72,6 +76,7 @@ class stock_split_into(osv.osv_memory):
             current_move = move_obj.copy(cr, uid, move.id, default_val)
             new_move.append(current_move)
             update_val['product_qty'] = quantity_rest
+            update_val['prodlot_id'] = prodlot_id
             update_val['product_uos_qty'] = uos_qty_rest
             move_obj.write(cr, uid, [move.id], update_val)
         return {}
diff --git a/addons/stock/wizard/stock_splitinto_view.xml b/addons/stock/wizard/stock_splitinto_view.xml
index 116511b8755..50555eea926 100644
--- a/addons/stock/wizard/stock_splitinto_view.xml
+++ b/addons/stock/wizard/stock_splitinto_view.xml
@@ -8,7 +8,8 @@
 	            <field name="type">form</field>
 	            <field name="arch" type="xml">
 	                <form string="Split Move">
-	                	<field name="quantity" colspan="4"/>
+                  <separator string="Set quantity to split your palets" colspan="4"/>
+	                	<field name="quantity"/>
 	                	<button icon='gtk-cancel' special="cancel"
 	                		string="Cancel" />
 	                	<button name="split" string="Ok"

From 45bf2eb613a1623810f1eb51e718003e9587ee27 Mon Sep 17 00:00:00 2001
From: "nel@tinyerp.com" <>
Date: Tue, 15 Jun 2010 21:20:04 +0200
Subject: [PATCH 13/39] [REM] sale: demo comment

bzr revid: nel@tinyerp.com-20100615192004-lfet61j3yggupk2x
---
 addons/sale/__openerp__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale/__openerp__.py b/addons/sale/__openerp__.py
index bacfc3b7abe..2f265b3d6f7 100644
--- a/addons/sale/__openerp__.py
+++ b/addons/sale/__openerp__.py
@@ -60,7 +60,7 @@
         'stock_view.xml',
 #        'process/sale_process.xml',
     ],
-  #  'demo_xml': ['sale_demo.xml'],
+    'demo_xml': ['sale_demo.xml'],
     'test': [
              'test/shipping_manual_sale_order.yml',
              'test/prepaid_sale_order.yml',

From ecd057eb706b9ac535b676f3cccfcbb848098c19 Mon Sep 17 00:00:00 2001
From: "nel@tinyerp.com" <>
Date: Tue, 15 Jun 2010 22:20:04 +0200
Subject: [PATCH 14/39] [IMP] stock, claim views

bzr revid: nel@tinyerp.com-20100615202004-grbyetb7kwe8yewy
---
 addons/crm_claim/crm_claim_view.xml           | 15 +++++++++++----
 addons/product_expiry/wizard/stock_partial.py |  2 +-
 addons/stock/stock_view.xml                   | 13 +++++++++----
 addons/stock/wizard/stock_move.py             |  3 ++-
 4 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index c59e0aabdc8..b25009c2339 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -92,11 +92,18 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Claims">
-                <group colspan="4" col="4">
-                    <field name="name"/>
-                    <field name="date" string="Date of Claim"/>
-                    <field name="date_deadline" string="Deadline"/>
+
+             <group colspan="4" col="4">
+                <group colspan="1" col="2">
+                    <field name="name" />
                 </group>
+                <group colspan="1" col="2">
+                     <field name="date" string="Date of Claim"/>
+                 </group>
+                <group colspan="1" col="2">
+                    <field name="date_deadline" string="Deadline"/><newline/>
+                </group>
+              </group>
                 <group colspan="4" col="4">
 
                 <notebook>
diff --git a/addons/product_expiry/wizard/stock_partial.py b/addons/product_expiry/wizard/stock_partial.py
index e893b36c3cf..94adaa63452 100644
--- a/addons/product_expiry/wizard/stock_partial.py
+++ b/addons/product_expiry/wizard/stock_partial.py
@@ -66,7 +66,7 @@ class stock_move_split_lines_exist(osv.osv_memory):
     _name = "stock.move.split.lines.exist"
     _inherit = "stock.move.split.lines.exist"
     _columns = {
-        'date': fields.date('Date'),
+        'date': fields.date('Expiry Date'),
     }
     def on_change_product(self, cr, uid, ids, product_id):
         if not product_id:
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 7cef0343edc..d95611b17ac 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -637,6 +637,7 @@
                                             icon="terp-stock_effects-object-colorize" 
                                             states="draft,assigned,confirmed,done"/>
                                     <button name="setlast_tracking" string="Set Last Tracking" type="object"
+                                        attrs="{'invisible': [('tracking_id','=',False)]}" 
                                         icon="terp-stock_effects-object-colorize" 
                                         states="draft,assigned,confirmed,done"/>
                                     <field name="location_id"/>
@@ -792,6 +793,7 @@
                                         icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
                                         states="draft,assigned,confirmed,done"/>
                                     <button name="setlast_tracking" string="Set Last Tracking" type="object"
+                                        attrs="{'invisible': [('tracking_id','=',False)]}" 
                                         icon="terp-stock_effects-object-colorize" 
                                         states="draft,assigned,confirmed,done"/>
                                     <field name="location_id"/>
@@ -992,6 +994,7 @@
                                       icon="terp-stock_effects-object-colorize"
                                       states="draft,assigned,confirmed,done"/>
                                 <button name="setlast_tracking" string="Set Last Tracking" type="object"
+                                    attrs="{'invisible': [('tracking_id','=',False)]}" 
                                     icon="terp-stock_effects-object-colorize" 
                                     states="draft,assigned,confirmed,done"/>
                                     <field name="location_id"/>
@@ -1166,9 +1169,9 @@
                         <page string="General Information">
                             <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines, 'address_in_id': address_id}" >
                                 <tree colors="grey:state in ('cancel')" string="Stock Moves" editable="top">
-                                    <field name="product_id"/>
-                                    <field name="product_qty"/>
-                                    <field name="product_uom" string="Product Unit of Measure"/>
+                                    <field name="product_id" readonly="1"/>
+                                    <field name="product_qty" readonly="1"/>
+                                    <field name="product_uom" string="UOM" readonly="1"/>
                                     <field name="location_dest_id"/>
                                     <field name="prodlot_id" groups="base.group_extended"/>
                                       <button
@@ -1181,7 +1184,7 @@
                                         icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
                                         states="draft,assigned,confirmed,done"/>
                                     <button name="setlast_tracking" string="Set Last Tracking" type="object"
-                                        icon="terp-stock_effects-object-colorize" 
+                                        icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','=',False)]}"
                                         states="draft,assigned,confirmed,done"/>
                                     <field name="state"/>
                                      <button name="%(stock.move_scrap)d"
@@ -1371,6 +1374,7 @@
                         states="draft,assigned,confirmed,done"/>
                     <button name="setlast_tracking" string="Set Last Tracking" type="object"
                         icon="terp-stock_effects-object-colorize" 
+                        attrs="{'invisible': [('tracking_id','=',False)]}" 
                         states="draft,assigned,confirmed,done"/>
                     <field name="location_id"/>
                     <field name="location_dest_id"/>
@@ -1527,6 +1531,7 @@
                         icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
                         states="draft,assigned,confirmed,done"/>
                     <button name="setlast_tracking" string="Set Last Tracking" type="object"
+                        attrs="{'invisible': [('tracking_id','=',False)]}" 
                         icon="terp-stock_effects-object-colorize" 
                         states="draft,assigned,confirmed,done"/>
                     <field name="date_planned"/>
diff --git a/addons/stock/wizard/stock_move.py b/addons/stock/wizard/stock_move.py
index 8616f939bb8..0ce4855e8d9 100644
--- a/addons/stock/wizard/stock_move.py
+++ b/addons/stock/wizard/stock_move.py
@@ -258,7 +258,7 @@ class split_in_production_lot(osv.osv_memory):
                         prodlot_id = prodlot_obj.create(cr, uid, {'name': line.name},
                         # 'prefix' : line.name},
                                                  {'product_id': move.product_id.id})
-                    move_obj.write(cr, uid, [current_move], {'prodlot_id': prodlot_id})
+                    move_obj.write(cr, uid, [current_move], {'prodlot_id': prodlot_id, 'state':move.state})
                     prodlot = prodlot_obj.browse(cr, uid, prodlot_id)
                  #   ref = '%d' % (move.id)
                  #   if prodlot.ref:
@@ -269,6 +269,7 @@ class split_in_production_lot(osv.osv_memory):
                     if quantity_rest > 0:
                         update_val['product_qty'] = quantity_rest
                         update_val['product_uos_qty'] = uos_qty_rest
+                        update_val['state'] = move.state
                         move_obj.write(cr, uid, [move.id], update_val)
         return new_move
 split_in_production_lot()

From 0fb6db81bb7d9ea6369c6916b4eb32ffd370b0da Mon Sep 17 00:00:00 2001
From: "nel@tinyerp.com" <>
Date: Tue, 15 Jun 2010 22:43:32 +0200
Subject: [PATCH 15/39] [IMP] stock: qty on wizard

bzr revid: nel@tinyerp.com-20100615204332-txko0ubmayc59vk5
---
 addons/stock/stock_view.xml             | 16 +++++++++-------
 addons/stock/wizard/stock_move.py       |  3 +++
 addons/stock/wizard/stock_move_view.xml | 20 +++++++++++++++-----
 3 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index d95611b17ac..3171387aaa6 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -637,7 +637,7 @@
                                             icon="terp-stock_effects-object-colorize" 
                                             states="draft,assigned,confirmed,done"/>
                                     <button name="setlast_tracking" string="Set Last Tracking" type="object"
-                                        attrs="{'invisible': [('tracking_id','=',False)]}" 
+                                        attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}" 
                                         icon="terp-stock_effects-object-colorize" 
                                         states="draft,assigned,confirmed,done"/>
                                     <field name="location_id"/>
@@ -793,7 +793,7 @@
                                         icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
                                         states="draft,assigned,confirmed,done"/>
                                     <button name="setlast_tracking" string="Set Last Tracking" type="object"
-                                        attrs="{'invisible': [('tracking_id','=',False)]}" 
+                                        attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}" 
                                         icon="terp-stock_effects-object-colorize" 
                                         states="draft,assigned,confirmed,done"/>
                                     <field name="location_id"/>
@@ -994,14 +994,14 @@
                                       icon="terp-stock_effects-object-colorize"
                                       states="draft,assigned,confirmed,done"/>
                                 <button name="setlast_tracking" string="Set Last Tracking" type="object"
-                                    attrs="{'invisible': [('tracking_id','=',False)]}" 
+                                    attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}" 
                                     icon="terp-stock_effects-object-colorize" 
                                     states="draft,assigned,confirmed,done"/>
                                     <field name="location_id"/>
                                     <field name="date_planned"/>
                                     <field name="state"/>
                                     <button name="%(action_partial_move)d" string="Partial" type="action" states="confirmed,assigned" icon="gtk-justify-fill"/>
-                                    <!--button name="action_done" states="confirmed,assigned" string="Done" type="object" icon="gtk-jump-to"/-->
+                                    <button name="action_done" states="confirmed,assigned" string="Done" type="object" icon="gtk-jump-to"/>
                                 </tree>
                                 <form string="Stock Moves">
                                     <notebook colspan="4">
@@ -1184,7 +1184,7 @@
                                         icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
                                         states="draft,assigned,confirmed,done"/>
                                     <button name="setlast_tracking" string="Set Last Tracking" type="object"
-                                        icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','=',False)]}"
+                                        icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
                                         states="draft,assigned,confirmed,done"/>
                                     <field name="state"/>
                                      <button name="%(stock.move_scrap)d"
@@ -1374,13 +1374,14 @@
                         states="draft,assigned,confirmed,done"/>
                     <button name="setlast_tracking" string="Set Last Tracking" type="object"
                         icon="terp-stock_effects-object-colorize" 
-                        attrs="{'invisible': [('tracking_id','=',False)]}" 
+                        attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}" 
                         states="draft,assigned,confirmed,done"/>
                     <field name="location_id"/>
                     <field name="location_dest_id"/>
                     <field name="date_planned"/>
                     <field name="date_expected"/>
                     <field name="state"/>
+                    <button name="action_done" states="confirmed,assigned" string="Done" type="object" icon="gtk-jump-to"/>
                 </tree>
             </field>
         </record>
@@ -1531,13 +1532,14 @@
                         icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
                         states="draft,assigned,confirmed,done"/>
                     <button name="setlast_tracking" string="Set Last Tracking" type="object"
-                        attrs="{'invisible': [('tracking_id','=',False)]}" 
+                        attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}" 
                         icon="terp-stock_effects-object-colorize" 
                         states="draft,assigned,confirmed,done"/>
                     <field name="date_planned"/>
                     <field name="backorder_id" groups="base.group_extended"/>
                     <field name="state"/>
                     <button name="%(action_partial_move)d" string="Partial" type="action" states="assigned" icon="gtk-justify-fill"/>
+                    <button name="action_done" states="confirmed,assigned" string="Done" type="object" icon="gtk-jump-to"/>
                 </tree>
             </field>
         </record>
diff --git a/addons/stock/wizard/stock_move.py b/addons/stock/wizard/stock_move.py
index 0ce4855e8d9..918250236cb 100644
--- a/addons/stock/wizard/stock_move.py
+++ b/addons/stock/wizard/stock_move.py
@@ -179,6 +179,8 @@ class split_in_production_lot(osv.osv_memory):
         move = self.pool.get('stock.move').browse(cr, uid, context['active_id'], context=context)
         if 'product_id' in fields:
             res.update({'product_id': move.product_id.id})
+        if 'product_uom' in fields:
+            res.update({'product_uom': move.product_uom.id})
         if 'qty' in fields:
             res.update({'qty': move.product_qty})
         return res
@@ -186,6 +188,7 @@ class split_in_production_lot(osv.osv_memory):
     _columns = {
         'qty': fields.integer('Quantity'),
         'product_id': fields.many2one('product.product', 'Product', required=True, select=True),
+        'product_uom': fields.many2one('product.uom', 'Product UOM'),
         'line_ids': fields.one2many('stock.move.split.lines', 'lot_id', 'Lots Number'),
         'line_exist_ids': fields.one2many('stock.move.split.lines.exist', 'lot_id', 'Lots Existing Numbers'),
         'use_exist' : fields.boolean('Use Exist'),
diff --git a/addons/stock/wizard/stock_move_view.xml b/addons/stock/wizard/stock_move_view.xml
index bba27bfe9c7..05c35d5a830 100644
--- a/addons/stock/wizard/stock_move_view.xml
+++ b/addons/stock/wizard/stock_move_view.xml
@@ -103,11 +103,21 @@
 	            <field name="model">stock.move.split</field>
 	            <field name="type">form</field>
 	            <field name="arch" type="xml">
-	                <form string="Split in lots">
-	                	<field name="product_id" colspan="4" readonly="1"/>
-	                	<newline/>
-	                	<field name="use_exist"/>
-                    <field name="qty" readonly="1"/>
+              <form string="Split in lots">
+                  <field name="product_id" colspan="4" readonly="1"/>
+                  <newline/>
+                  <group colspan="4" col="4">
+                      <group colspan="1" col="2">
+                          <field name="use_exist"/>
+                      </group>
+                      <group colspan="1" col="2">
+                          <field name="qty" readonly="1"/>
+                       </group>
+                      <group colspan="1" col="2">
+                          <field name="product_uom" readonly="1"/>
+                      </group>
+                  </group>
+
                   <group colspan="4" attrs="{'invisible':[('use_exist','=',True)]}">
 	                	<field name="line_ids" colspan="4" nolabel="1">
 	                		<tree string="Lots Number" editable="top">

From 027c719db0df272d86981503220a513241d86150 Mon Sep 17 00:00:00 2001
From: "nel@tinyerp.com" <>
Date: Tue, 15 Jun 2010 23:12:38 +0200
Subject: [PATCH 16/39] [FIX] make packing done when all moves are

bzr revid: nel@tinyerp.com-20100615211238-dk5foc9sbbrxh5jr
---
 addons/stock/stock.py                        | 10 +++++-
 addons/stock/wizard/stock_partial_picking.py | 32 --------------------
 2 files changed, 9 insertions(+), 33 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 0d8bda2f2f3..5a01ddbc83b 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1688,10 +1688,16 @@ class stock_move(osv.osv):
     def setlast_tracking(self, cr, uid, ids, context=None):
         new_move = []
         update_val = {}
+        ir_sequence_obj = self.pool.get('ir.sequence')
+        prodlot_obj = self.pool.get('stock.production.lot')
         last_prod = [line.prodlot_id for line in self.browse(cr, uid, ids)[0].picking_id.move_lines if line.prodlot_id]
         last_prod.sort(key=lambda p: p.date, reverse=True)
         last_prod_id = last_prod and last_prod[0].id
         update_val['prodlot_id'] = last_prod_id
+        if update_val.get('prodlot_id',[])==[]:
+            sequence = ir_sequence_obj.get(cr, uid, 'stock.lot.serial')
+            prodlot_id = prodlot_obj.create(cr, uid, {'name': sequence}, {'product_id': self.browse(cr, uid, ids)[0].product_id.id})
+            update_val['prodlot_id'] = prodlot_id
         self.write(cr, uid, ids, update_val)
         return True
     
@@ -1843,10 +1849,12 @@ class stock_move(osv.osv):
         for pick in picking_obj.browse(cr, uid, picking_ids):
             if all(move.state == 'done' for move in pick.move_lines):
                 picking_obj.action_done(cr, uid, [pick.id])
-
         wf_service = netsvc.LocalService("workflow")
         for id in ids:
             wf_service.trg_trigger(uid, 'stock.move', id, cr)
+        for pick in picking_obj.browse(cr, uid, picking_ids):
+            if len([move.state == 'done' for move in pick.move_lines]) == len(pick.move_lines):
+                wf_service.trg_validate(uid, 'stock.picking', pick.id, 'button_done', cr)
         return True
     
     def create_account_move(self, cr, uid, move,account_id,account_variation,amount, context=None):
diff --git a/addons/stock/wizard/stock_partial_picking.py b/addons/stock/wizard/stock_partial_picking.py
index 1326050dd7d..c81e8bbf2eb 100644
--- a/addons/stock/wizard/stock_partial_picking.py
+++ b/addons/stock/wizard/stock_partial_picking.py
@@ -30,9 +30,6 @@ class stock_partial_picking(osv.osv_memory):
     _description = "Partial Picking"
     _columns = {
             'date': fields.datetime('Date', required=True),
-            'partner_id': fields.many2one('res.partner',string="Partner", required=True),
-            'address_id': fields.many2one('res.partner.address', 'Delivery Address', help="Address where goods are to be delivered", required=True),
-            'type': fields.char("Type", size=3),
      }
 
     def view_init(self, cr, uid, fields_list, context=None):
@@ -66,12 +63,6 @@ class stock_partial_picking(osv.osv_memory):
         _moves_arch_lst = """<form string="Deliver Products">
                         <separator colspan="4" string="Delivery Information"/>
                     	<field name="date" colspan="4" />
-                         <group colspan="4" attrs="{'invisible':[('type','=','in')]}">
-                    	<field name="partner_id"  attrs="{'required':[('type','!=','in')]}" />
-                    	<field name="address_id"  attrs="{'required':[('type','!=','in')]}"/>
-                    	<field name="type" invisible="1"/>
-                    	<newline/>
-                        </group>
                         <separator colspan="4" string="Move Detail"/>
                     	"""
         _moves_fields = result['fields']
@@ -160,30 +151,9 @@ class stock_partial_picking(osv.osv_memory):
         if 'date' in fields:
             res.update({'date': time.strftime('%Y-%m-%d %H:%M:%S')})
         for pick in pick_obj.browse(cr, uid, context.get('active_ids', [])):
-            if 'partner_id' in fields:
-                res.update({'partner_id': pick.address_id.partner_id and pick.address_id.partner_id.id or False })                
-            if 'address_id' in fields:
-                res.update({'address_id': pick.address_id.id})            
             for m in pick.move_lines:
                 if m.state in ('done', 'cancel'):
                     continue
-                res['type'] = m.picking_id and m.picking_id.type or ''
-                address_ids = list(set([(pick.address_id and pick.address_id.id, pick.address_id and pick.address_id.partner_id and  pick.address_id.partner_id.id) for pick in pick_obj.browse(cr, uid, context.get('active_ids', []))]))
-                address_ids1 = list(set([(pick.address_id and pick.address_id.id, pick.address_id and pick.address_id.partner_id and  pick.address_id.partner_id.id) for pick in pick_obj.browse(cr, uid, context.get('active_ids', [])) if pick.address_id]))
-                if len(address_ids1) == 1:
-                    if m.picking_id and m.picking_id.type=='out':
-                        res['address_id'] = address_ids[0] and address_ids[0][0] or False
-                        res['partner_id'] = address_ids[0][1] or False  
-                if  m.picking_id and m.picking_id.type=='in':
-                        res['partner_id'] = m.company_id.partner_id.id or False
-                        partner_company = m.company_id.partner_id and m.company_id.partner_id 
-                        if partner_company:
-                            address_default = [add.id for add in  m.company_id.partner_id.address if add.type=='default']
-                            address_delivery = [add.id for add in  m.company_id.partner_id.address if add.type=='delivery']
-                        if len(address_delivery):
-                            res['address_id'] =  address_delivery and address_delivery[0] or False
-                        else:
-                            res['address_id'] =  address_default and address_default[0] or False
                 if 'move%s_product_id'%(m.id) in fields:
                     res['move%s_product_id'%(m.id)] = m.product_id.id
                 if 'move%s_product_qty'%(m.id) in fields:
@@ -223,8 +193,6 @@ class stock_partial_picking(osv.osv_memory):
         picking_ids = context.get('active_ids', False)
         partial = self.browse(cr, uid, ids[0], context)
         partial_datas = {
-            'partner_id' : partial.partner_id and partial.partner_id.id or False,
-            'address_id' : partial.address_id and partial.address_id.id or False,
             'delivery_date' : partial.date         
         }
         for pick in pick_obj.browse(cr, uid, picking_ids):

From 7101687e14cefd49029f8f2b21bc12171e4169ba Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 15 Jun 2010 23:26:08 +0200
Subject: [PATCH 17/39] bugfix

bzr revid: fp@tinyerp.com-20100615212608-9bqnuqv3qu4cmp2u
---
 addons/mrp/mrp_view.xml                       | 41 -------------------
 addons/mrp/security/ir.model.access.csv       |  4 +-
 addons/mrp/test/mrp_phantom_bom.yml           |  6 +--
 addons/project/security/ir.model.access.csv   |  3 --
 addons/sale/test/sale_procurement.yml         | 19 ++++-----
 .../sale/test/shipping_manual_sale_order.yml  |  2 +-
 addons/stock/stock.py                         |  4 +-
 addons/stock/wizard/stock_move.py             |  1 -
 8 files changed, 15 insertions(+), 65 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 3837588035e..b3004fffb2f 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -856,46 +856,5 @@
         <menuitem action="resource.action_resource_calendar_form" id="menu_view_resource_calendar_search_mrp" parent="menu_mrp_configuration" sequence="1"/>
         <menuitem action="resource.action_resource_calendar_leave_tree" id="menu_view_resource_calendar_leaves_search_mrp" parent="menu_pm_resources_mrp" sequence="1"/>
 
-        <!-- Display the BoMs in the product form -->
-
-        <record model="ir.ui.view" id="view_product_form_expiry">
-            <field name="name">product.normal.form</field>
-            <field name="model">product.product</field>
-            <field name="inherit_id" ref="product.product_normal_form_view" />
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <notebook position="inside">
-                    <page string="Bill of Materials">
-                        <field name="bom_ids" colspan="4" nolabel="1" widget="one2many_form">
-                            <group colspan="4" col="6">
-                                <field name="name" select="1" colspan="4"/>
-                                <field name="code" select="1" string="BoM Reference" groups="base.group_extended"/>
-                                <newline/>
-                                <field name="product_uom"/>
-                                <field name="product_qty"/>
-                                <field name="routing_id" groups="base.group_extended"/>
-                                <newline/>
-                                <field name="product_uos" groups="product.group_uos"/>
-                                <field name="product_uos_qty" groups="product.group_uos" />
-                                <newline/>
-                                <field name="type" groups="base.group_extended"/>
-                                <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
-                            </group>
-                            <field colspan="4" name="bom_lines" nolabel="1" widget="one2many_list">
-                                <tree string="Components" editable="bottom">
-                                    <field name="product_id" on_change="onchange_product_id(product_id, name)" select="1"/>
-                                    <field name="product_uom"/>
-                                    <field name="product_qty"/>
-                                    <field name="name" invisible="1"/>
-                                    <field name="date_start"/>
-                                    <field name="date_stop"/>
-                                </tree>
-                            </field>
-                        </field>
-                    </page>
-                </notebook>
-            </field>
-        </record>
- 
     </data>
 </openerp>
diff --git a/addons/mrp/security/ir.model.access.csv b/addons/mrp/security/ir.model.access.csv
index 8089be4a431..736203b307d 100644
--- a/addons/mrp/security/ir.model.access.csv
+++ b/addons/mrp/security/ir.model.access.csv
@@ -2,8 +2,8 @@
 "access_mrp_workcenter","mrp.workcenter","model_mrp_workcenter","mrp.group_mrp_user",1,0,0,0
 "access_mrp_routing","mrp.routing","model_mrp_routing","mrp.group_mrp_user",1,0,0,0
 "access_mrp_routing_workcenter","mrp.routing.workcenter","model_mrp_routing_workcenter","mrp.group_mrp_user",1,0,0,0
-"access_mrp_bom","mrp.bom","model_mrp_bom","mrp.group_mrp_user",1,0,0,0
-"access_mrp_bom_revision","mrp.bom.revision","model_mrp_bom_revision","mrp.group_mrp_user",1,0,0,0
+"access_mrp_bom","mrp.bom","model_mrp_bom","group_mrp_user",1,0,0,0
+"access_mrp_bom_revision","mrp.bom.revision","model_mrp_bom_revision","group_mrp_user",1,0,0,0
 "access_mrp_production","mrp.production","model_mrp_production","mrp.group_mrp_user",1,1,1,1
 "access_mrp_production_workcenter_line","mrp.production.workcenter.line","model_mrp_production_workcenter_line","mrp.group_mrp_user",1,1,1,1
 "access_mrp_production_product_line","mrp.production.product.line","model_mrp_production_product_line","mrp.group_mrp_user",1,1,1,1
diff --git a/addons/mrp/test/mrp_phantom_bom.yml b/addons/mrp/test/mrp_phantom_bom.yml
index 4a3e2e3e1da..885607d9539 100644
--- a/addons/mrp/test/mrp_phantom_bom.yml
+++ b/addons/mrp/test/mrp_phantom_bom.yml
@@ -182,14 +182,14 @@
 -
   !python {model: procurement.order}: |
     from tools.translate import _
-    proc_ids = self.search(cr, uid, [('state','!=','cofirmed')])
+    proc_ids = self.search(cr, uid, [('state','!=','confirmed')])
     assert proc_ids, _('No Procurements!')
 -
   The scheduler runs.
 -
   !function {model: procurement.order, name: run_scheduler}:
     - model: procurement.order
-      search: "[('state','!=','cofirmed')]"
+      search: "[('state','!=','confirmed')]"
 -
   I am checking Internal picking. I see one picking for Orange juice and its 
   stock moves for Oranges, Sugar and Water made correctly.
@@ -247,4 +247,4 @@
      picking_ids = pick_obj.search(cr, uid, [('type','=','in')])
      self.view_init(cr, uid, ['date','partner_id','address_id'],context={'active_ids': picking_ids})
      self.do_partial(cr, uid, [1], context={'active_ids': picking_ids})
-     
\ No newline at end of file
+
diff --git a/addons/project/security/ir.model.access.csv b/addons/project/security/ir.model.access.csv
index 1a2fac38c6a..502c8af0596 100644
--- a/addons/project/security/ir.model.access.csv
+++ b/addons/project/security/ir.model.access.csv
@@ -19,9 +19,6 @@
 "access_task_by_days","task.by.days","model_task_by_days","project.group_project_user",1,1,1,1
 "access_close_task","close.task","model_close_task","project.group_project_user",1,1,1,1
 "access_close_task_manager","close.task manager","model_close_task","project.group_project_manager",1,1,1,1
-"access_resource_calendar_project_user","resource.resource.calendar project user","resource.model_resource_calendar","project.group_project_user",1,0,0,0
-"access_resource_calendar_project_manager","resource.resource.calendar project manager","resource.model_resource_calendar","project.group_project_manager",1,1,1,1
-"access_fiscalyear_sequence_project_manager","account.sequence.fiscalyear project manager","account.model_account_sequence_fiscalyear","project.group_project_manager",1,1,0,0
 "access_partner_task user","base.res.partner user","base.model_res_partner","project.group_project_user",1,0,0,0
 "access_partner_task manager","base.res.partner manager","base.model_res_partner","project.group_project_manager",1,0,0,0
 "access_partner_address_task user","base.res.partner.address user","base.model_res_partner_address","project.group_project_user",1,0,0,0
diff --git a/addons/sale/test/sale_procurement.yml b/addons/sale/test/sale_procurement.yml
index 33ba22667ec..2475c7bdceb 100644
--- a/addons/sale/test/sale_procurement.yml
+++ b/addons/sale/test/sale_procurement.yml
@@ -2,9 +2,7 @@
   In order to test the sale order working with procurements I will create some
   products with different supply method and procurement method.
 -
-  I create two products.
--
-  I create one product Table.
+  I create one product Table as MTO.
 -
   !record {model: product.product, id: product_product_table0}:
     categ_id: product.cat1
@@ -15,7 +13,7 @@
     uom_id: product.product_uom_unit
     uom_po_id: product.product_uom_unit
 -
-  I create another product Wood.
+  I create another product Wood as MTS.
 -
   !record {model: product.product, id: product_product_wood0}:
     categ_id: product.cat1
@@ -26,7 +24,7 @@
     uom_id: product.product_uom_kgm
     uom_po_id: product.product_uom_kgm
 -
-  I define Minimum stock rule for my stockable product wood
+  I define Minimum stock rule for my stockable product Wood (qty between 10 and 15)
 - 
   !record {model: stock.warehouse.orderpoint, id: stock_warehouse_orderpoint_op0}:
     company_id: base.main_company
@@ -77,19 +75,16 @@
     proc_ids = self.search(cr, uid, [('state','=','confirmed')])
     assert proc_ids, _('No Procurements!')
 - 
-  The scheduler runs.
+  I run the scheduler.
 -
   !function {model: procurement.order, name: run_scheduler}:
     - model: procurement.order
       search: "[('state','=','confirmed')]"
 -
   I check that the procurement for the product table is in exception state.
-  As my product's supply method is produce and mrp module is yet not installed.
+  As my product's supply method is produce and the BoM is not defined.
 -
   !python {model: procurement.order}: |
     from tools.translate import _
-    proc_ids = self.search(cr, uid, [('state','=','exception')])
-    assert proc_ids, _('No Procurements are in exception state!')
-  
-  
-  
\ No newline at end of file
+    proc_ids = self.search(cr, uid, [('state','=','exception'),('product_id','=',ref('sale.product_product_table0'))])
+    assert proc_ids, _('No Procurements are in exception state for the table!')
diff --git a/addons/sale/test/shipping_manual_sale_order.yml b/addons/sale/test/shipping_manual_sale_order.yml
index c030a80c64a..1f5bc5fe10a 100644
--- a/addons/sale/test/shipping_manual_sale_order.yml
+++ b/addons/sale/test/shipping_manual_sale_order.yml
@@ -1,5 +1,5 @@
 -
-  In order to test the sale module in the Open-ERP, I need to configure details regarding product & customer.
+  In order to test the sale module, I need to configure details regarding product & customer.
 -
   I am going to sell my Mobile products to the customer with name Cleartrail
 - 
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index bf308f191b5..0dcea3fc083 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -602,7 +602,7 @@ class stock_picking(osv.osv):
             ("2binvoiced", "To Be Invoiced"),
             ("none", "Not from Picking")], "Invoice Status",
             select=True, required=True, readonly=True, states={'draft': [('readonly', False)]}),
-        'company_id': fields.many2one('res.company', 'Company', required=True,select=1),
+        'company_id': fields.many2one('res.company', 'Company', select=1),
     }
     _defaults = {
         'name': lambda self, cr, uid, context: '/',
@@ -1379,7 +1379,7 @@ class stock_move(osv.osv):
                                   \nThe state is \'Waiting\' if the move is waiting for another one.'),
         'price_unit': fields.float('Unit Price',
             digits_compute= dp.get_precision('Account')),
-        'company_id': fields.many2one('res.company', 'Company', required=True,select=1),
+        'company_id': fields.many2one('res.company', 'Company', select=1),
         'partner_id': fields.related('picking_id','address_id','partner_id',type='many2one', relation="res.partner", string="Partner"),
         'backorder_id': fields.related('picking_id','backorder_id',type='many2one', relation="stock.picking", string="Back Order"),
         'origin': fields.related('picking_id','origin',type='char', size=64, relation="stock.picking", string="Origin"),
diff --git a/addons/stock/wizard/stock_move.py b/addons/stock/wizard/stock_move.py
index 8616f939bb8..ba41159df40 100644
--- a/addons/stock/wizard/stock_move.py
+++ b/addons/stock/wizard/stock_move.py
@@ -244,7 +244,6 @@ class split_in_production_lot(osv.osv_memory):
                     }
                     if quantity_rest > 0:
                         current_move = move_obj.copy(cr, uid, move.id, default_val)
-                        move_obj.action_confirm(cr, uid, [current_move])
                         new_move.append(current_move)
                     if quantity_rest == 0:
                         current_move = move.id

From d8d0b8846749b5f34f9e29463fd1e1d6e151b91b Mon Sep 17 00:00:00 2001
From: "nel@tinyerp.com" <>
Date: Wed, 16 Jun 2010 00:46:18 +0200
Subject: [PATCH 18/39] [ADD] Dates on sale order

bzr revid: nel@tinyerp.com-20100615224618-72p7gliuga9579rq
---
 addons/sale_order_dates/__init__.py    | 25 ++++++++++
 addons/sale_order_dates/__openerp__.py | 44 +++++++++++++++++
 addons/sale_order_dates/sale.py        | 68 ++++++++++++++++++++++++++
 addons/sale_order_dates/sale_view.xml  | 23 +++++++++
 4 files changed, 160 insertions(+)
 create mode 100644 addons/sale_order_dates/__init__.py
 create mode 100644 addons/sale_order_dates/__openerp__.py
 create mode 100644 addons/sale_order_dates/sale.py
 create mode 100644 addons/sale_order_dates/sale_view.xml

diff --git a/addons/sale_order_dates/__init__.py b/addons/sale_order_dates/__init__.py
new file mode 100644
index 00000000000..ed4a8b0a952
--- /dev/null
+++ b/addons/sale_order_dates/__init__.py
@@ -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 sale 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/sale_order_dates/__openerp__.py b/addons/sale_order_dates/__openerp__.py
new file mode 100644
index 00000000000..e8a2cf6e6b6
--- /dev/null
+++ b/addons/sale_order_dates/__openerp__.py
@@ -0,0 +1,44 @@
+# -*- 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/>.
+#
+##############################################################################
+
+
+{
+    'name': 'Customer & Sales',
+    'version': '1.0',
+    'category': 'Generic Modules/CRM & SRM',
+    'description': """Sale Orders Dates""",
+    'author': 'Tiny',
+    'website': 'http://www.openerp.com',
+    'depends': ["sale"],
+    'init_xml': [
+    ],
+
+    'update_xml': [
+        'sale_view.xml',
+    ],
+    'demo_xml': [
+    ], 
+    'test': [], 
+    'installable': True,
+    'active': False,
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale_order_dates/sale.py b/addons/sale_order_dates/sale.py
new file mode 100644
index 00000000000..1b4bad360e6
--- /dev/null
+++ b/addons/sale_order_dates/sale.py
@@ -0,0 +1,68 @@
+# -*- 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/>.
+#
+##############################################################################
+
+from osv import fields, osv
+import time
+from mx import DateTime
+class sale_order_dates(osv.osv):
+    _inherit = 'sale.order'
+    _name = 'sale.order'
+
+    def _get_effective_date(self, cr, uid, ids, name, arg, context={}):
+        res = {}
+        dates_list = []
+        for order in self.browse(cr, uid, ids):
+            dates_list = []
+            for pick in order.picking_ids:
+                dates_list.append(pick.date)
+            if dates_list:
+                res[order.id] = min(dates_list)
+            else:
+                res[order.id] =False
+            return res
+
+    def _get_commitment_date(self, cr, uid, ids, name, arg, context={}):
+        res = {}
+        dates_list = []
+        for order in self.browse(cr, uid, ids):
+            dates_list = []
+            for line in order.order_line:
+                dt=DateTime.strptime(order.date_order, '%Y-%m-%d') + DateTime.RelativeDateTime(days=line.delay or 0.0)
+                dt_s = dt.strftime('%Y-%m-%d')
+                dates_list.append(dt_s)
+            res[order.id] = min(dates_list)
+            return res
+
+    _columns = {
+        'commitment_date': fields.function(_get_commitment_date, method=True,store=True, type='date', string='Commitment Date'),
+        'requested_date': fields.date('Requested Date'),
+        'effective_date': fields.function(_get_effective_date, method=True, type='date', store=True,string='Effective Date'),
+    }
+sale_order_dates()
+"""
+ - date_commitment: min(fields.function using delay on SO lines +
+          date_order)
+        - date_requested: fields.date
+        - Effective date: fields.function the first picking done.
+"""
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale_order_dates/sale_view.xml b/addons/sale_order_dates/sale_view.xml
new file mode 100644
index 00000000000..7f5edf811ef
--- /dev/null
+++ b/addons/sale_order_dates/sale_view.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+
+   <record id="view_sale_orderfor" model="ir.ui.view">
+            <field name="name">sale.order.form.inherit5</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">
+              <field name="date_confirm" position="after">
+                    <separator string="Dates" colspan="4"/>
+                    <field name="commitment_date"/>
+                    <newline/>
+                    <field name="effective_date"/>
+                    <field name="requested_date"/>
+              </field>
+            </field>
+                </record>
+
+
+     </data>
+</openerp>

From 958fa866d0efc9d218b4983e38102b9f7f6cd36b Mon Sep 17 00:00:00 2001
From: Launchpad Code Hosting <codehost@crowberry>
Date: Wed, 16 Jun 2010 04:49:21 +0100
Subject: [PATCH 19/39] Launchpad automatic translations update.

bzr revid: codehost@crowberry-20100616034921-m6dig7ow87jg5av7
---
 addons/account/i18n/it.po             |   6 +-
 addons/base_module_quality/i18n/it.po |  22 +-
 addons/board/i18n/nl_BE.po            |  24 +-
 addons/google_map/i18n/ru.po          |   2 +-
 addons/mrp_operations/i18n/hi.po      |   2 +-
 addons/mrp_repair/i18n/hi.po          | 669 ++++++++++++++++++++++++++
 addons/multi_company/i18n/it.po       |  18 +-
 addons/product/i18n/vi.po             |   2 +-
 addons/stock/i18n/nl.po               |   2 +-
 addons/stock/i18n/pl.po               |   2 +-
 10 files changed, 709 insertions(+), 40 deletions(-)
 create mode 100644 addons/mrp_repair/i18n/hi.po

diff --git a/addons/account/i18n/it.po b/addons/account/i18n/it.po
index 4a6d2d3a2b8..499700a8777 100644
--- a/addons/account/i18n/it.po
+++ b/addons/account/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-06-04 16:42+0000\n"
+"PO-Revision-Date: 2010-06-15 07:00+0000\n"
 "Last-Translator: eLBati - albatos.com <lorenzo.battistini@albatos.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-11 03:42+0000\n"
+"X-Launchpad-Export-Date: 2010-06-16 03:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -1176,7 +1176,7 @@ msgstr ""
 #. module: account
 #: field:account.payment.term,line_ids:0
 msgid "Terms"
-msgstr "Periodi"
+msgstr "Condizioni"
 
 #. module: account
 #: rml:account.vat.declaration:0
diff --git a/addons/base_module_quality/i18n/it.po b/addons/base_module_quality/i18n/it.po
index 9a4838ace97..565dd1e0f4d 100644
--- a/addons/base_module_quality/i18n/it.po
+++ b/addons/base_module_quality/i18n/it.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-04-09 18:42+0000\n"
-"Last-Translator: Nicola Pedron <Unknown>\n"
+"PO-Revision-Date: 2010-06-15 12:50+0000\n"
+"Last-Translator: Rinux <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
+"X-Launchpad-Export-Date: 2010-06-16 03:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
@@ -33,7 +33,7 @@ msgstr ""
 #. module: base_module_quality
 #: model:ir.module.module,shortdesc:base_module_quality.module_meta_information
 msgid "Base module quality"
-msgstr ""
+msgstr "Modulo base di qualità"
 
 #. module: base_module_quality
 #: field:module.quality.check,name:0
@@ -63,7 +63,7 @@ msgstr ""
 #. module: base_module_quality
 #: field:module.quality.detail,ponderation:0
 msgid "Ponderation"
-msgstr ""
+msgstr "Ponderazione"
 
 #. module: base_module_quality
 #: help:module.quality.detail,ponderation:0
@@ -110,7 +110,7 @@ msgstr ""
 #. module: base_module_quality
 #: wizard_field:quality_detail_save,init,module_file:0
 msgid "Save report"
-msgstr ""
+msgstr "Salva report"
 
 #. module: base_module_quality
 #: wizard_field:quality_detail_save,init,name:0
@@ -120,12 +120,12 @@ msgstr ""
 #. module: base_module_quality
 #: field:module.quality.detail,score:0
 msgid "Score (%)"
-msgstr ""
+msgstr "Punteggio (%)"
 
 #. module: base_module_quality
 #: help:quality_detail_save,init,name:0
 msgid "Save report as .html format"
-msgstr ""
+msgstr "Salva report come formato .html"
 
 #. module: base_module_quality
 #: view:module.quality.detail:0
@@ -146,12 +146,12 @@ msgstr ""
 #. module: base_module_quality
 #: view:module.quality.detail:0
 msgid "Save Report"
-msgstr ""
+msgstr "Salva report"
 
 #. module: base_module_quality
 #: model:ir.actions.wizard,name:base_module_quality.create_quality_check_id
 msgid "Quality Check"
-msgstr ""
+msgstr "Controllo di qualità"
 
 #. module: base_module_quality
 #: model:ir.model,name:base_module_quality.model_module_quality_detail
@@ -182,4 +182,4 @@ msgstr ""
 #. module: base_module_quality
 #: field:module.quality.detail,quality_check_id:0
 msgid "Quality"
-msgstr ""
+msgstr "Qualità"
diff --git a/addons/board/i18n/nl_BE.po b/addons/board/i18n/nl_BE.po
index a16b538056f..2754b34b4bd 100644
--- a/addons/board/i18n/nl_BE.po
+++ b/addons/board/i18n/nl_BE.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-04-24 15:45+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-06-15 14:17+0000\n"
+"Last-Translator: Niels Huylebroeck <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-06-16 03:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
@@ -26,50 +26,50 @@ msgstr ""
 #. module: board
 #: model:ir.model,name:board.model_board_board
 msgid "board.board"
-msgstr ""
+msgstr "board.board"
 
 #. module: board
 #: field:board.note,user_id:0
 msgid "Author"
-msgstr ""
+msgstr "Auteur"
 
 #. module: board
 #: model:ir.module.module,shortdesc:board.module_meta_information
 msgid "Dashboard main module"
-msgstr ""
+msgstr "Algemene dashboard module"
 
 #. module: board
 #: view:board.note:0
 #: field:board.note,note:0
 msgid "Note"
-msgstr ""
+msgstr "Notitie"
 
 #. module: board
 #: field:board.board.line,width:0
 msgid "Width"
-msgstr ""
+msgstr "Breedte"
 
 #. module: board
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Ongeldige modelnaam in de actie-definitie."
 
 #. module: board
 #: field:board.board.line,name:0
 msgid "Title"
-msgstr ""
+msgstr "Titel"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_view_board_list_form
 #: model:ir.ui.menu,name:board.menu_view_board_form
 msgid "Dashboard Definition"
-msgstr ""
+msgstr "Dashboard definitie"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_view_board_note_form
 #: model:ir.ui.menu,name:board.menu_view_board_note_form
 msgid "Publish a note"
-msgstr ""
+msgstr "Publiceer een opmerking"
 
 #. module: board
 #: wizard_view:board.board.menu.create,init:0
diff --git a/addons/google_map/i18n/ru.po b/addons/google_map/i18n/ru.po
index 640f842cade..c4f6acceef1 100644
--- a/addons/google_map/i18n/ru.po
+++ b/addons/google_map/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-15 03:32+0000\n"
+"X-Launchpad-Export-Date: 2010-06-16 03:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/mrp_operations/i18n/hi.po b/addons/mrp_operations/i18n/hi.po
index 25ec3464854..fa9b4ac9ef8 100644
--- a/addons/mrp_operations/i18n/hi.po
+++ b/addons/mrp_operations/i18n/hi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-15 03:33+0000\n"
+"X-Launchpad-Export-Date: 2010-06-16 03:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
diff --git a/addons/mrp_repair/i18n/hi.po b/addons/mrp_repair/i18n/hi.po
new file mode 100644
index 00000000000..902b7bbf5bd
--- /dev/null
+++ b/addons/mrp_repair/i18n/hi.po
@@ -0,0 +1,669 @@
+# Hindi translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-06-15 06:37+0000\n"
+"Last-Translator: vir (Open ERP) <vir@tinyerp.com>\n"
+"Language-Team: Hindi <hi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-06-16 03:49+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Fees Line"
+msgstr "मुक्त लाइन"
+
+#. module: mrp_repair
+#: field:mrp.repair.fee,repair_id:0
+#: field:mrp.repair.line,repair_id:0
+msgid "Repair Order Ref"
+msgstr "मरम्मत के आदेश संदर्भ"
+
+#. module: mrp_repair
+#: field:mrp.repair.line,move_id:0
+msgid "Inventory Move"
+msgstr ""
+
+#. module: mrp_repair
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "कार्य की परिभाषा में मॉडल का नाम अमान्य है."
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Untaxed amount"
+msgstr "कर राशि के बिना"
+
+#. module: mrp_repair
+#: field:mrp.repair,state:0
+msgid "Repair State"
+msgstr ""
+
+#. module: mrp_repair
+#: rml:repair.order:0
+msgid "Printing Date"
+msgstr "मुद्रण दिनांक"
+
+#. module: mrp_repair
+#: field:mrp.repair.fee,product_uom_qty:0
+#: rml:repair.order:0
+msgid "Quantity"
+msgstr "मात्रा"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: mrp_repair
+#: selection:mrp.repair,state:0
+msgid "Invoice Exception"
+msgstr "चालान अपवाद"
+
+#. module: mrp_repair
+#: field:mrp.repair,address_id:0
+msgid "Delivery Address"
+msgstr "वितरण पता"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Make Invoice"
+msgstr "चालान बनाएँ"
+
+#. module: mrp_repair
+#: field:mrp.repair.fee,price_subtotal:0
+#: field:mrp.repair.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "उप कुल"
+
+#. module: mrp_repair
+#: rml:repair.order:0
+msgid "Invoice address :"
+msgstr "चालान पता"
+
+#. module: mrp_repair
+#: field:mrp.repair,guarantee_limit:0
+msgid "Guarantee limit"
+msgstr "गारंटी की सीमा"
+
+#. module: mrp_repair
+#: field:mrp.repair,amount_tax:0
+#: field:mrp.repair.fee,tax_id:0
+#: field:mrp.repair.line,tax_id:0
+msgid "Taxes"
+msgstr ""
+
+#. module: mrp_repair
+#: rml:repair.order:0
+msgid "Net Total :"
+msgstr "नेट कुल:"
+
+#. module: mrp_repair
+#: rml:repair.order:0
+msgid "VAT"
+msgstr "वैट"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Operations"
+msgstr "संचालन"
+
+#. module: mrp_repair
+#: field:mrp.repair,move_id:0
+msgid "Move"
+msgstr "स्थानान्तर"
+
+#. module: mrp_repair
+#: model:ir.actions.act_window,name:mrp_repair.action_repair_order_tree
+msgid "Repair Orders"
+msgstr "मरम्मत के आदेश"
+
+#. module: mrp_repair
+#: model:ir.actions.report.xml,name:mrp_repair.report_mrp_repair
+msgid "Quotation / Order"
+msgstr ""
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Extra Info"
+msgstr "अतिरिक्त जानकारी"
+
+#. module: mrp_repair
+#: field:mrp.repair,partner_id:0
+msgid "Partner"
+msgstr "साथी"
+
+#. module: mrp_repair
+#: model:ir.actions.act_window,name:mrp_repair.action_repair_quotation_tree
+#: model:ir.ui.menu,name:mrp_repair.menu_repair_quotation
+msgid "Repairs in quotation"
+msgstr ""
+
+#. module: mrp_repair
+#: selection:mrp.repair,state:0
+#: selection:mrp.repair.line,state:0
+msgid "Confirmed"
+msgstr "पुष्टि"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Recreate Invoice"
+msgstr "फिर से चालान बनाने"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Repairs order"
+msgstr "मरम्मत के आदेश"
+
+#. module: mrp_repair
+#: rml:repair.order:0
+msgid "Repair Order N° :"
+msgstr "मरम्मत के आदेश N °:"
+
+#. module: mrp_repair
+#: field:mrp.repair,prodlot_id:0
+#: rml:repair.order:0
+msgid "Lot Number"
+msgstr ""
+
+#. module: mrp_repair
+#: selection:mrp.repair,state:0
+msgid "Under Repair"
+msgstr "मरम्मत के तहत"
+
+#. module: mrp_repair
+#: field:mrp.repair,fees_lines:0
+msgid "Fees Lines"
+msgstr "फीस लाइन्स"
+
+#. module: mrp_repair
+#: model:ir.model,name:mrp_repair.model_mrp_repair_fee
+msgid "Repair Fees line"
+msgstr "मरम्मत शुल्क लाइन"
+
+#. module: mrp_repair
+#: rml:repair.order:0
+msgid "Fees Line(s)"
+msgstr "फीस लाइन (ओं)"
+
+#. module: mrp_repair
+#: selection:mrp.repair,state:0
+msgid "To be Invoiced"
+msgstr ""
+
+#. module: mrp_repair
+#: rml:repair.order:0
+msgid "Shipping address :"
+msgstr "शिपिंग का पता"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Start Repair"
+msgstr "मरम्मत शुरू"
+
+#. module: mrp_repair
+#: field:mrp.repair.line,product_uom_qty:0
+msgid "Quantity (UoM)"
+msgstr "मात्रा (UoM)"
+
+#. module: mrp_repair
+#: field:mrp.repair.fee,to_invoice:0
+#: field:mrp.repair.line,to_invoice:0
+msgid "To Invoice"
+msgstr ""
+
+#. module: mrp_repair
+#: model:ir.ui.menu,name:mrp_repair.menu_repair_order
+msgid "Repairs"
+msgstr "मरम्मत"
+
+#. module: mrp_repair
+#: field:mrp.repair,picking_id:0
+msgid "Packing"
+msgstr "पैकिंग"
+
+#. module: mrp_repair
+#: rml:repair.order:0
+msgid "Total :"
+msgstr "कुल:"
+
+#. module: mrp_repair
+#: field:mrp.repair,pricelist_id:0
+msgid "Pricelist"
+msgstr "मूल्य सूची"
+
+#. module: mrp_repair
+#: help:mrp.repair,state:0
+msgid "Gives the state of the Repair Order"
+msgstr "मरम्मत के आदेश की स्थिति देना"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+#: field:mrp.repair,quotation_notes:0
+msgid "Quotation Notes"
+msgstr ""
+
+#. module: mrp_repair
+#: model:ir.actions.act_window,name:mrp_repair.action_repair_progress_tree
+#: model:ir.ui.menu,name:mrp_repair.menu_repair_progress
+msgid "Repairs in progress"
+msgstr "मरम्मत में प्रगति"
+
+#. module: mrp_repair
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "संरचना देखने के लिए अमान्य XML!"
+
+#. module: mrp_repair
+#: help:mrp.repair,guarantee_limit:0
+msgid ""
+"The garantee limit is computed as: last move date + warranty defined on "
+"selected product. If the current date is below the garantee limit, each "
+"operation and fee you will add will be set as 'not to invoiced' by default. "
+"Note that you can change manually afterwards."
+msgstr ""
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Repair Line"
+msgstr ""
+
+#. module: mrp_repair
+#: rml:repair.order:0
+msgid "N° :"
+msgstr ""
+
+#. module: mrp_repair
+#: field:mrp.repair,invoice_method:0
+msgid "Invoice Method"
+msgstr ""
+
+#. module: mrp_repair
+#: field:mrp.repair,repaired:0
+msgid "Repaired"
+msgstr ""
+
+#. module: mrp_repair
+#: wizard_field:mrp.repair.make_invoice,init,group:0
+msgid "Group by partner invoice address"
+msgstr ""
+
+#. module: mrp_repair
+#: field:mrp.repair.fee,invoice_line_id:0
+#: field:mrp.repair.line,invoice_line_id:0
+msgid "Invoice Line"
+msgstr ""
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Total amount"
+msgstr ""
+
+#. module: mrp_repair
+#: selection:mrp.repair.line,state:0
+msgid "Canceled"
+msgstr ""
+
+#. module: mrp_repair
+#: selection:mrp.repair,invoice_method:0
+msgid "Before Repair"
+msgstr ""
+
+#. module: mrp_repair
+#: field:mrp.repair,location_id:0
+msgid "Current Location"
+msgstr ""
+
+#. module: mrp_repair
+#: wizard_button:mrp.repair.cancel,display,yes:0
+msgid "Yes"
+msgstr ""
+
+#. module: mrp_repair
+#: field:mrp.repair,invoiced:0
+#: field:mrp.repair.fee,invoiced:0
+#: field:mrp.repair.line,invoiced:0
+msgid "Invoiced"
+msgstr ""
+
+#. module: mrp_repair
+#: wizard_button:mrp.repair.cancel,display,end:0
+msgid "No"
+msgstr ""
+
+#. module: mrp_repair
+#: wizard_view:mrp.repair.make_invoice,init:0
+#: wizard_button:mrp.repair.make_invoice,init,invoice:0
+msgid "Create invoices"
+msgstr ""
+
+#. module: mrp_repair
+#: selection:mrp.repair.line,type:0
+#: rml:repair.order:0
+msgid "Add"
+msgstr ""
+
+#. module: mrp_repair
+#: selection:mrp.repair.line,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: mrp_repair
+#: model:ir.actions.act_window,name:mrp_repair.action_repair_order_form
+#: model:ir.ui.menu,name:mrp_repair.menu_repair_form
+msgid "New Repair"
+msgstr ""
+
+#. module: mrp_repair
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: mrp_repair
+#: field:mrp.repair,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr ""
+
+#. module: mrp_repair
+#: field:mrp.repair.line,state:0
+msgid "Status"
+msgstr ""
+
+#. module: mrp_repair
+#: rml:repair.order:0
+msgid "Guarantee Limit"
+msgstr ""
+
+#. module: mrp_repair
+#: field:mrp.repair,product_id:0
+#: rml:repair.order:0
+msgid "Product to Repair"
+msgstr ""
+
+#. module: mrp_repair
+#: help:mrp.repair,pricelist_id:0
+msgid "The pricelist comes from the selected partner, by default."
+msgstr ""
+
+#. module: mrp_repair
+#: wizard_view:mrp.repair.cancel,display:0
+msgid ""
+"This operation  will  cancel the  Repair process, but  will not cancel it's "
+"Invoice. Do you want to continue?"
+msgstr ""
+
+#. module: mrp_repair
+#: selection:mrp.repair,state:0
+msgid "Quotation"
+msgstr ""
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Compute"
+msgstr ""
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Confirm Repair"
+msgstr ""
+
+#. module: mrp_repair
+#: rml:repair.order:0
+msgid "Repair Quotation"
+msgstr ""
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "End Repair"
+msgstr ""
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "History"
+msgstr ""
+
+#. module: mrp_repair
+#: model:ir.model,name:mrp_repair.model_mrp_repair
+msgid "Repairs Order"
+msgstr ""
+
+#. module: mrp_repair
+#: model:ir.actions.act_window,name:mrp_repair.action_repair_ready_tree
+#: model:ir.ui.menu,name:mrp_repair.menu_repair_ready
+msgid "Repairs Ready to Start"
+msgstr ""
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Qty"
+msgstr ""
+
+#. module: mrp_repair
+#: selection:mrp.repair,state:0
+#: selection:mrp.repair.line,state:0
+msgid "Done"
+msgstr ""
+
+#. module: mrp_repair
+#: model:ir.actions.act_window,name:mrp_repair.action_repair_2binvoiced_tree
+#: model:ir.ui.menu,name:mrp_repair.menu_repair_2binvoiced
+msgid "Repairs to be invoiced"
+msgstr ""
+
+#. module: mrp_repair
+#: field:mrp.repair,invoice_id:0
+msgid "Invoice"
+msgstr ""
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Fees"
+msgstr ""
+
+#. module: mrp_repair
+#: selection:mrp.repair,state:0
+#: wizard_button:mrp.repair.make_invoice,init,end:0
+msgid "Cancel"
+msgstr ""
+
+#. module: mrp_repair
+#: field:mrp.repair.line,location_dest_id:0
+msgid "Dest. Location"
+msgstr ""
+
+#. module: mrp_repair
+#: rml:repair.order:0
+msgid "Operation Line(s)"
+msgstr ""
+
+#. module: mrp_repair
+#: model:ir.model,name:mrp_repair.model_mrp_repair_line
+msgid "Repair Operations Lines"
+msgstr ""
+
+#. module: mrp_repair
+#: field:mrp.repair,location_dest_id:0
+msgid "Delivery Location"
+msgstr ""
+
+#. module: mrp_repair
+#: model:ir.module.module,shortdesc:mrp_repair.module_meta_information
+msgid "Products Repairs Module"
+msgstr ""
+
+#. module: mrp_repair
+#: help:mrp.repair,invoice_method:0
+msgid ""
+"This field allow you to change the workflow of the repair order. If value "
+"selected is different from 'No Invoice', it also allow you to select the "
+"pricelist and invoicing address."
+msgstr ""
+
+#. module: mrp_repair
+#: field:mrp.repair.fee,price_unit:0
+#: field:mrp.repair.line,price_unit:0
+#: rml:repair.order:0
+msgid "Unit Price"
+msgstr ""
+
+#. module: mrp_repair
+#: wizard_view:mrp.repair.make_invoice,init:0
+msgid "Do you really want to create the invoices ?"
+msgstr ""
+
+#. module: mrp_repair
+#: field:mrp.repair.fee,name:0
+#: field:mrp.repair.line,name:0
+#: rml:repair.order:0
+msgid "Description"
+msgstr ""
+
+#. module: mrp_repair
+#: field:mrp.repair,operations:0
+msgid "Operation Lines"
+msgstr ""
+
+#. module: mrp_repair
+#: field:mrp.repair.fee,product_id:0
+#: field:mrp.repair.line,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Invoice Corrected"
+msgstr ""
+
+#. module: mrp_repair
+#: help:mrp.repair,deliver_bool:0
+msgid ""
+"Check this box if you want to manage the delivery once the product is "
+"repaired. If cheked, it will create a packing with selected product. Note "
+"that you can select the locations in the Info tab, if you have the extended "
+"view."
+msgstr ""
+
+#. module: mrp_repair
+#: field:mrp.repair.line,type:0
+msgid "Type"
+msgstr ""
+
+#. module: mrp_repair
+#: rml:repair.order:0
+msgid "Price"
+msgstr ""
+
+#. module: mrp_repair
+#: field:mrp.repair,deliver_bool:0
+msgid "Deliver"
+msgstr ""
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+#: field:mrp.repair,internal_notes:0
+msgid "Internal Notes"
+msgstr ""
+
+#. module: mrp_repair
+#: rml:repair.order:0
+msgid "Taxes:"
+msgstr ""
+
+#. module: mrp_repair
+#: model:ir.actions.wizard,name:mrp_repair.wizard_mrp_repair_make_invoice
+msgid "Make invoices"
+msgstr ""
+
+#. module: mrp_repair
+#: field:mrp.repair,name:0
+msgid "Repair Ref"
+msgstr ""
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "UoM"
+msgstr ""
+
+#. module: mrp_repair
+#: selection:mrp.repair.line,type:0
+#: rml:repair.order:0
+msgid "Remove"
+msgstr ""
+
+#. module: mrp_repair
+#: wizard_view:mrp.repair.cancel,display:0
+msgid "Cancel Repair...??"
+msgstr ""
+
+#. module: mrp_repair
+#: field:mrp.repair.fee,product_uom:0
+#: field:mrp.repair.line,product_uom:0
+msgid "Product UoM"
+msgstr ""
+
+#. module: mrp_repair
+#: field:mrp.repair,partner_invoice_id:0
+msgid "Invoicing Address"
+msgstr ""
+
+#. module: mrp_repair
+#: selection:mrp.repair,invoice_method:0
+msgid "After Repair"
+msgstr ""
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Invoicing"
+msgstr ""
+
+#. module: mrp_repair
+#: field:mrp.repair.line,location_id:0
+msgid "Source Location"
+msgstr ""
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Quality"
+msgstr ""
+
+#. module: mrp_repair
+#: model:ir.actions.wizard,name:mrp_repair.action_cancel_repair
+#: view:mrp.repair:0
+msgid "Cancel Repair"
+msgstr ""
+
+#. module: mrp_repair
+#: selection:mrp.repair,invoice_method:0
+msgid "No Invoice"
+msgstr ""
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "States"
+msgstr ""
+
+#. module: mrp_repair
+#: help:mrp.repair,partner_id:0
+msgid ""
+"This field allow you to choose the parner that will be invoiced and delivered"
+msgstr ""
+
+#. module: mrp_repair
+#: field:mrp.repair,amount_total:0
+msgid "Total"
+msgstr ""
+
+#. module: mrp_repair
+#: selection:mrp.repair,state:0
+msgid "Ready to Repair"
+msgstr ""
diff --git a/addons/multi_company/i18n/it.po b/addons/multi_company/i18n/it.po
index e817d7b073b..aa820150b5a 100644
--- a/addons/multi_company/i18n/it.po
+++ b/addons/multi_company/i18n/it.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-12-08 11:46+0000\n"
-"PO-Revision-Date: 2010-01-26 11:01+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2010-06-15 12:42+0000\n"
+"Last-Translator: Rinux <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
+"X-Launchpad-Export-Date: 2010-06-16 03:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: multi_company
@@ -70,7 +70,7 @@ msgstr ""
 #: model:ir.module.module,shortdesc:multi_company.module_meta_information
 #: view:multi_company.default:0
 msgid "Multi Company"
-msgstr ""
+msgstr "Multi Azienda"
 
 #. module: multi_company
 #: model:ir.module.module,description:multi_company.module_meta_information
@@ -133,17 +133,17 @@ msgstr ""
 #. module: multi_company
 #: model:ir.model,name:multi_company.model_multi_company_default
 msgid "multi_company.default"
-msgstr ""
+msgstr "multi_azienda.default"
 
 #. module: multi_company
 #: help:multi_company.default,company_id:0
 msgid "Company where the user is connected"
-msgstr ""
+msgstr "Azienda con la quale l'utente è connesso"
 
 #. module: multi_company
 #: model:ir.actions.act_window,name:multi_company.action_inventory_form
 msgid "Default Company per Object"
-msgstr ""
+msgstr "Azienda Predefinita per Oggetto"
 
 #. module: multi_company
 #: field:multi_company.default,expression:0
@@ -173,12 +173,12 @@ msgstr ""
 #. module: multi_company
 #: help:multi_company.default,expression:0
 msgid "Expression, must be True to match"
-msgstr ""
+msgstr "Espressione, deve essere Vero per corrispondere"
 
 #. module: multi_company
 #: model:ir.ui.menu,name:multi_company.menu_action_inventory_form
 msgid "Default company per Object"
-msgstr ""
+msgstr "Azienda predefinitaa per Oggetto"
 
 #. module: multi_company
 #: code:addons/multi_company/multi_company.py:0
diff --git a/addons/product/i18n/vi.po b/addons/product/i18n/vi.po
index ac596518e54..35d5e643150 100644
--- a/addons/product/i18n/vi.po
+++ b/addons/product/i18n/vi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-15 03:33+0000\n"
+"X-Launchpad-Export-Date: 2010-06-16 03:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/stock/i18n/nl.po b/addons/stock/i18n/nl.po
index 445249906e7..25a0c9e5358 100644
--- a/addons/stock/i18n/nl.po
+++ b/addons/stock/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-15 03:33+0000\n"
+"X-Launchpad-Export-Date: 2010-06-16 03:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/pl.po b/addons/stock/i18n/pl.po
index c1d33bc694d..aade911d099 100644
--- a/addons/stock/i18n/pl.po
+++ b/addons/stock/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-15 03:33+0000\n"
+"X-Launchpad-Export-Date: 2010-06-16 03:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock

From 52fc96eb47fdd58072f5fc1c1edc5d61d580bfd3 Mon Sep 17 00:00:00 2001
From: Dhara <dhara@dhara-laptop>
Date: Wed, 16 Jun 2010 12:27:48 +0530
Subject: [PATCH 20/39] selection field in activity

bzr revid: dhara@dhara-laptop-20100616065748-sytsadtsdxwrgioo
---
 addons/marketing_campaign/marketing_campaign.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/marketing_campaign/marketing_campaign.py b/addons/marketing_campaign/marketing_campaign.py
index da3b9c41a7c..4ed49a7c954 100644
--- a/addons/marketing_campaign/marketing_campaign.py
+++ b/addons/marketing_campaign/marketing_campaign.py
@@ -208,10 +208,7 @@ class marketing_campaign_activity(osv.osv):
         'start': fields.boolean('Start',help= "This activity is launched when the campaign starts."),
         'condition': fields.char('Condition', size=256, required=True,
                                  help="Python condition to know if the activity can be launched"),
-        'type': fields.selection([('email', 'E-mail'),
-                                  ('paper', 'Paper'),
-                                  ('action', 'Action'),
-                                  ('subcampaign', 'Sub-Campaign')],
+        'type': fields.selection(_actions_type,
                                   'Type', required=True,
                                   help="Describe type of action to be performed on the Activity.Eg : Send email,Send paper.."),
         'email_template_id': fields.many2one('email.template','Email Template'),
@@ -412,7 +409,10 @@ class marketing_campaign_workitem(osv.osv):
                             self.write(cr, uid, wi.id, {'state': 'done'})
                             self.process_chain(cr, uid, wi.id, context)
                         else:
-                            self.write(cr, uid, wi.id, {'state': 'exception'})
+                            vals = {'state': 'exception'}
+                            if type(result) == type({}) and 'error_msg' in result:
+                               vals['error_msg'] = result['error_msg']
+                            self.write(cr, uid, wi.id, vals)
                     except Exception,e:
                         self.write(cr, uid, wi.id, {'state': 'exception', 'error_msg': str(e)})
                 else :

From 7232a399b9594b95d37bd6e9277c9d8fa4c9856e Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Wed, 16 Jun 2010 12:49:14 +0530
Subject: [PATCH 21/39] [ADD] stock,point_of_sale : access rules are added

bzr revid: vir@tinyerp.com-20100616071914-nnp3ivcquvrt7yx6
---
 addons/point_of_sale/security/ir.model.access.csv | 2 ++
 addons/stock/security/ir.model.access.csv         | 7 +++++++
 2 files changed, 9 insertions(+)

diff --git a/addons/point_of_sale/security/ir.model.access.csv b/addons/point_of_sale/security/ir.model.access.csv
index ac87e1cc8b9..ee428ec2b19 100644
--- a/addons/point_of_sale/security/ir.model.access.csv
+++ b/addons/point_of_sale/security/ir.model.access.csv
@@ -37,3 +37,5 @@
 "access_pos_make_payment","pos.make.payment","model_pos_make_payment","point_of_sale.group_pos_user",1,0,0,0
 "access_pos_scan_product","pos.scan.product","model_pos_scan_product","point_of_sale.group_pos_user",1,0,0,0
 "access_pos_payment_report","pos.payment.report","model_pos_payment_report","point_of_sale.group_pos_user",1,0,0,0
+"access_report_pos_order","report.pos.order","model_report_pos_order","point_of_sale.group_pos_user",1,0,0,0
+"access_pos_return","pos.return","model_pos_return","point_of_sale.group_pos_user",1,0,0,0
diff --git a/addons/stock/security/ir.model.access.csv b/addons/stock/security/ir.model.access.csv
index 9b8c7a100b3..f7bbc7ea3b9 100644
--- a/addons/stock/security/ir.model.access.csv
+++ b/addons/stock/security/ir.model.access.csv
@@ -44,3 +44,10 @@
 "access_action_traceability","action.traceability","model_action_traceability","stock.group_stock_user",1,0,0,0
 "access_stock_split_into","stock.split.into","model_stock_split_into","stock.group_stock_user",1,0,0,0
 "access_stock_split_into_manager","stock.split.into","model_stock_split_into","stock.group_stock_manager",1,1,1,1
+"access_report_stock_move","report.stock.move","model_report_stock_move","stock.group_stock_user",1,1,1,1
+"access_report_stock_inventory","report.stock.inventory","model_report_stock_inventory","stock.group_stock_user",1,1,1,1
+"access_stock_replacement","stock.replacement","model_stock_replacement","stock.group_stock_user",1,1,1,1
+"access_stock_replacement_result","stock.replacement.result","model_stock_replacement_result","stock.group_stock_user",1,1,1,1
+"access_stock_ups","stock.ups","model_stock_ups","stock.group_stock_user",1,1,1,1
+"access_stock_ups_final","stock.ups.final","model_stock_ups_final","stock.group_stock_user",1,1,1,1
+"access_stock_ups_upload","stock.ups.upload","model_stock_ups_upload","stock.group_stock_user",1,1,1,1
\ No newline at end of file

From 016c096d9c02ebcab3e00cb89085b63ec7139c44 Mon Sep 17 00:00:00 2001
From: Dhara <dhara@dhara-laptop>
Date: Wed, 16 Jun 2010 12:57:36 +0530
Subject: [PATCH 22/39] [IMP] mailchimp list(1)

bzr revid: dhara@dhara-laptop-20100616072736-tdh32ytm3t1xflkg
---
 .../marketing_campaign_mailchimp/__init__.py  |   4 +-
 .../__openerp__.py                            |   1 +
 .../marketing_campaign_mailchimp.py           | 151 +++++++++++++-----
 .../marketing_campaign_mailchimp_view.xml     |  59 ++++---
 .../wizard/__init__.py                        |  24 +++
 .../wizard/create_list.py                     |  64 ++++++++
 .../wizard/create_list_view.xml               |  35 ++++
 7 files changed, 278 insertions(+), 60 deletions(-)
 create mode 100755 addons/marketing_campaign_mailchimp/wizard/__init__.py
 create mode 100755 addons/marketing_campaign_mailchimp/wizard/create_list.py
 create mode 100755 addons/marketing_campaign_mailchimp/wizard/create_list_view.xml

diff --git a/addons/marketing_campaign_mailchimp/__init__.py b/addons/marketing_campaign_mailchimp/__init__.py
index 0f354314327..808e5fc281f 100644
--- a/addons/marketing_campaign_mailchimp/__init__.py
+++ b/addons/marketing_campaign_mailchimp/__init__.py
@@ -20,5 +20,5 @@
 ##############################################################################
 
 import marketing_campaign_mailchimp
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+import wizard
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/marketing_campaign_mailchimp/__openerp__.py b/addons/marketing_campaign_mailchimp/__openerp__.py
index bd614607b97..2a913eaa8da 100644
--- a/addons/marketing_campaign_mailchimp/__openerp__.py
+++ b/addons/marketing_campaign_mailchimp/__openerp__.py
@@ -32,6 +32,7 @@
     'init_xml': [],
     'update_xml': [
         'marketing_campaign_mailchimp_view.xml',
+        'wizard/create_list_view.xml',
     ],
     'demo_xml': [],
     'installable': True,
diff --git a/addons/marketing_campaign_mailchimp/marketing_campaign_mailchimp.py b/addons/marketing_campaign_mailchimp/marketing_campaign_mailchimp.py
index a1c3162cee2..f3d8386623e 100644
--- a/addons/marketing_campaign_mailchimp/marketing_campaign_mailchimp.py
+++ b/addons/marketing_campaign_mailchimp/marketing_campaign_mailchimp.py
@@ -18,16 +18,19 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-
-from osv import fields, osv
-
+import urllib
 import urllib2
 import simplejson as json
+import time
+from datetime import datetime
 
+
+from osv import fields, osv
+from marketing_campaign.marketing_campaign import _intervalTypes
 mailchimp_url = 'http://%s.api.mailchimp.com/1.2'
 
-class marketing_campaign_mailchimp_account(osv.osv): #{{{
-    _name = "marketing.campaign.mailchimp.account"
+class mailchimp_account(osv.osv):
+    _name = "mailchimp.account"
     
     _columns = {
             'name': fields.char('Account Name', size=64),
@@ -52,12 +55,10 @@ class marketing_campaign_mailchimp_account(osv.osv): #{{{
                 params['password'] = mailchimp_account.password
         else :
                 params['apikey'] = mailchimp_account.apikey
-        params = '&'.join(map(lambda x : '%s=%s' %(x, params[x]), params))
         url = mailchimp_url%mailchimp_account.data_center+ '/?method=%s'%method
-        req = urllib2.Request(url, params)
-        handle = urllib2.urlopen(req)
-        response = json.loads(handle.read())
-        return response 
+        params = urllib.urlencode(params, doseq=True)
+        response = urllib2.urlopen(url, params)
+        return  json.loads(response.read())
     
     def button_approve(self, cr, uid, ids, context):
         acc_obj = self.browse(cr, uid, ids)[0]
@@ -80,33 +81,57 @@ class marketing_campaign_mailchimp_account(osv.osv): #{{{
     def button_cancel(self, cr, uid, ids, context):
         self.write(cr, uid, ids, {'state': 'cancelled'})
         return True
-    
-marketing_campaign_mailchimp_account() #}}}
+        
+    def add_partner_list(self, cr, uid, account_id, list_id,  partner_ids):
+        vals = {} # just dictionary with partner_id and updated in list or not
+        for partner in self.pool.get('res.partner').browse(cr, uid, partner_ids):
+            params = {'id' : list_id,
+                'email_address' : partner.email,
+                'email_type':'text',
+                'merge_vars[FNAME]':partner.name , 
+                'merge_vars[date]' : time.strftime('%Y-%m-%d'),
+                'merge_vars[phone]' : partner.phone,
+                'merge_vars[website]' : partner.website,
+                'merge_vars[address][country]' : partner.country.code,
+                'merge_vars[address][city]' : partner.city,
+                'double_optin':False}
+            vals[partner.id] = self.get_response(cr, uid, account_id,
+                                                         'listSubscribe', params)
+        return vals
+        
+mailchimp_account()
 
-#class marketing_campaign_mailchimp_list(osv.osv_memory): #{{{
-#    _name = "marketing.campaign.mailchimp.list"
-#    
-#    _columns = {
-#            'name': fields.char('Name', size=64),
-#            'mailchimp_account_id': fields.many2one('marketing.campaign.mailchimp.account', 'Account'),
-#            'list_id': fields.char('List Id', size=64,),
-#        }
-#    
-#    _defaults = {
-#            'state': lambda *a: 'draft'
-#        }
-#    
-#marketing_campaign_mailchimp_list() #}}}
+class mailchimp_list(osv.osv_memory):
+    _name = "mailchimp.list"
+    _description = "Mailchimp list"
+
+    _columns = {
+        'mailchimp_account_id': fields.many2one('mailchimp.account',
+                                             'Mailchimp Account', required=True),
+        'name': fields.char('Name', size=64)
+    }
+
+mailchimp_list()
+
+class marketing_campaign(osv.osv):
+    _inherit = "marketing.campaign"
 
-class marketing_campaign_segment(osv.osv): #{{{
-    _inherit = "marketing.campaign.segment"
-    
     _columns = {
-            'synchro': fields.boolean('Mailchimp Synchro'),
             'mailchimp_account_id': fields.many2one(
-                            'marketing.campaign.mailchimp.account', 'Account'),
+                            'mailchimp.account', 'Account'),
+            'mailchimp_campaign': fields.char('campaign', size=64),
+    }
+marketing_campaign()
+    
+
+class marketing_campaign_activity(osv.osv): 
+    _inherit = "marketing.campaign.activity"
+
+    _columns = {
+            'mailchimp_account_id': fields.many2one(
+                            'mailchimp.account', 'Account'),
             'mailchimp_list': fields.char('List', size=64),
-        }
+    }
     
     def onchange_mailchimp(self, cr, uid, ids, mailchimp_account_id):
         if mailchimp_account_id:
@@ -116,16 +141,70 @@ class marketing_campaign_segment(osv.osv): #{{{
     def onchange_mailchimp_list(self, cr, uid, ids, mailchimp_account_id, 
                                                                 mailchimp_list):
         if mailchimp_account_id and mailchimp_list:
-            lists = self.pool.get('marketing.campaign.mailchimp.account').get_response(cr,
+            lists = self.pool.get('mailchimp.account').get_response(cr,
                                              uid, mailchimp_account_id, 'lists')
-            list_names = [list['name'] for list in lists]
+            list_names = [l['name'] for l in lists]
             if mailchimp_list not in list_names:
                 raise osv.except_osv('Error!!!',"Lists doesn't exists")
         else :
             return {}
         return {'value':{}}
-marketing_campaign_segment() #}}}
-
 
+    def process_wi_mailchimp(self, cr, uid, activity, workitem, context={}):
+        mailchimp_account_id = activity.mailchimp_account_id.id
+        list_name = activity.mailchimp_list
+        mc_acc_obj = self.pool.get('mailchimp.account')
+        lists = mc_acc_obj.get_response(cr, uid, mailchimp_account_id, 'lists')
+        list_id = ''
+        for l in lists : 
+            if l['name'] == list_name:
+                list_id = l['id']
+                break;
+        res_model = workitem.object_id.model
+        res_id = workitem.res_id
+        model_obj = self.pool.get(res_model).browse(cr, uid, res_id)
+        params ={}
+        if res_model == 'res.partner' :
+            params.update({'email_address' : model_obj.email,
+                    'merge_vars[FNAME]':model_obj.name and model_obj.name or '', 
+                    'merge_vars[website]' : model_obj.website,
+                    'merge_vars[address][country]' : model_obj.country.code,
+                    })
+        elif res_model == 'crm.lead' :
+            params.update({'email_address' : model_obj.email_from,
+                    'merge_vars[FNAME]':model_obj.partner_name and \
+                                        model_obj.partner_name or '',
+                    'merge_vars[address][country]' : model_obj.country_id and \
+                                                model_obj.country_id.code or ''
+                    })
+        if params['email_address'] :
+            user = mc_acc_obj.get_response(cr, uid, mailchimp_account_id,
+                                     'listMemberInfo', 
+                                     {'id' : list_id,
+                                    'email_address': params['email_address']})
+            # if there s no user with the specify email it will return error code 
+            # and thus we add that user otherwise user is alredy subscribe and there
+            # is no need to subscribe user again
+            if 'error' in user:
+                params.update({'id' : list_id,
+                    'email_type':'text',
+                    'double_optin':False,
+                    'merge_vars[date]' : time.strftime('%Y-%m-%d'),
+                    'merge_vars[address][city]' : model_obj.city and model_obj.city or '',
+                    'merge_vars[phone]' : model_obj.phone and model_obj.phone or '',
+                    })
+                res = mc_acc_obj.get_response(cr, uid, mailchimp_account_id, 'listSubscribe', params)
+                # handle mailchimp error
+            return True
+        else : 
+            return {'error_msg' : "Invalid Email Address"}
+    
+    def __init__(self, *args):
+        res = super(marketing_campaign_activity, self).__init__(*args)
+        self._actions.update({'mailchimp' : self.process_wi_mailchimp})
+        self._actions_type.append(('mailchimp', 'Mailchimp'))
+        return res 
+    
 
+marketing_campaign_activity()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/marketing_campaign_mailchimp/marketing_campaign_mailchimp_view.xml b/addons/marketing_campaign_mailchimp/marketing_campaign_mailchimp_view.xml
index 7a84f17311d..f2151d8d820 100644
--- a/addons/marketing_campaign_mailchimp/marketing_campaign_mailchimp_view.xml
+++ b/addons/marketing_campaign_mailchimp/marketing_campaign_mailchimp_view.xml
@@ -4,23 +4,38 @@
 
     <!--
     ================================================================
-    Marketing Segments Inherited View - mailchimp
+    Marketing Activity Inherited View - mailchimp
     ================================================================
     -->
 
-    <record model="ir.ui.view" id="view_marketing_campaign_segment_form_inherit">
-        <field name="name">marketing.campaign.segment.form.inherit</field>
-        <field name="model">marketing.campaign.segment</field>
+    <record model="ir.ui.view" id="view_marketing_campaign_activity_form_inherit">
+        <field name="name">marketing.campaign.activity.form.inherit</field>
+        <field name="model">marketing.campaign.activity</field>
         <field name="type">form</field>
-        <field name="inherit_id" ref="marketing_campaign.view_marketing_campaign_segment_form"/>
+        <field name="inherit_id" ref="marketing_campaign.view_marketing_campaign_activity_form"/>
         <field name="arch" type="xml">
-            <field name="date_done" position="after">
-                <separator string="Mailchimp Synchronization" colspan="4"/>
-                <field name="synchro"/>
-                <group colspan="2" attrs="{'invisible':[('synchro','!=',True)]}">
-                    <field name="mailchimp_account_id" attrs="{'required':[('synchro','=',True)]}" domain="[('state','=','approved')]" on_change="onchange_mailchimp(mailchimp_account_id)"/>
-                    <field name="mailchimp_list" attrs="{'required':[('synchro','=',True)]}" on_change="onchange_mailchimp_list(mailchimp_account_id,mailchimp_list)"/>
-                </group>
+            <field name="type" position="after">
+                <group colspan="2" ><!--attrs="{'invisible':[('type','!=','mailchimp')]}"-->
+                    <field name="mailchimp_account_id" attrs="{'required':[('type','=','mailchimp')]}" domain="[('state','=','approved')]" on_change="onchange_mailchimp(mailchimp_account_id)"/>
+                    <field name="mailchimp_list" attrs="{'required':[('type','=','mailchimp')]}" on_change="onchange_mailchimp_list(mailchimp_account_id,mailchimp_list)"/>
+                </group>                
+            </field>
+        </field>
+    </record>
+
+
+
+    <record model="ir.ui.view" id="view_marketing_campaign_form_inherit">
+        <field name="name">marketing.campaign.form.inherit</field>
+        <field name="model">marketing.campaign</field>
+        <field name="type">form</field>
+        <field name="inherit_id" ref="marketing_campaign.view_marketing_campaign_form"/>
+        <field name="arch" type="xml">
+            <field name="type" position="after">
+                <group colspan="2" attrs="{'invisible':[('type','!=','mailchimp')]}">
+                    <field name="mailchimp_account_id" attrs="{'required':[('type','=','mailchimp')]}" domain="[('state','=','approved')]" on_change="onchange_mailchimp(mailchimp_account_id)"/>
+                    <field name="mailchimp_list" attrs="{'required':[('type','=','mailchimp')]}" on_change="onchange_mailchimp_list(mailchimp_account_id,mailchimp_list)"/>
+                </group>                
             </field>
         </field>
     </record>
@@ -35,9 +50,9 @@
     <menuitem name="Tools" id="base.menu_tools" icon="STOCK_PREFERENCES" sequence="15"/>
     <menuitem name="Mailchimps" id="menu_action_mailchimp" parent="base.menu_tools" />
 
-    <record model="ir.ui.view" id="view_marketing_campaign_mailchimp_account_tree">
-        <field name="name">marketing.campaign.mailchimp.account.tree</field>
-        <field name="model">marketing.campaign.mailchimp.account</field>
+    <record model="ir.ui.view" id="view_mailchimp_account_tree">
+        <field name="name">mailchimp.account.tree</field>
+        <field name="model">mailchimp.account</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="All Accounts">
@@ -49,9 +64,9 @@
         </field>
     </record>
 
-    <record model="ir.ui.view" id="view_marketing_campaign_mailchimp_account_form">
-        <field name="name">marketing.campaign.mailchimp.account.form</field>
-        <field name="model">marketing.campaign.mailchimp.account</field>
+    <record model="ir.ui.view" id="view_mailchimp_account_form">
+        <field name="name">mailchimp.account.form</field>
+        <field name="model">mailchimp.account</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Account">
@@ -71,16 +86,16 @@
         </field>
     </record>
 
-    <record model="ir.actions.act_window" id="action_marketing_campaign_mailchimp_account">
+    <record model="ir.actions.act_window" id="action_mailchimp_account">
         <field name="name">All Mailchimp Accounts</field>
         <field name="type">ir.actions.act_window</field>
-        <field name="res_model">marketing.campaign.mailchimp.account</field>
+        <field name="res_model">mailchimp.account</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
-        <field name="view_id" ref="view_marketing_campaign_mailchimp_account_tree"/>
+        <field name="view_id" ref="view_mailchimp_account_tree"/>
     </record>
 
-    <menuitem id="menu_action_marketing_campaign_mailchimp_account" parent="menu_action_mailchimp" action="action_marketing_campaign_mailchimp_account" sequence="40"/>
+    <menuitem id="menu_action_mailchimp_account" parent="menu_action_mailchimp" action="action_mailchimp_account" sequence="40"/>
 
     </data>
 </openerp>
diff --git a/addons/marketing_campaign_mailchimp/wizard/__init__.py b/addons/marketing_campaign_mailchimp/wizard/__init__.py
new file mode 100755
index 00000000000..713b0c1e773
--- /dev/null
+++ b/addons/marketing_campaign_mailchimp/wizard/__init__.py
@@ -0,0 +1,24 @@
+# -*- 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 create_list
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/marketing_campaign_mailchimp/wizard/create_list.py b/addons/marketing_campaign_mailchimp/wizard/create_list.py
new file mode 100755
index 00000000000..0a490787de5
--- /dev/null
+++ b/addons/marketing_campaign_mailchimp/wizard/create_list.py
@@ -0,0 +1,64 @@
+# -*- 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/>.
+#
+##############################################################################
+
+from osv import fields, osv
+from tools.translate import _
+import netsvc
+
+class create_list(osv.osv_memory):
+    _name = "create.list"
+    _description = "Create List of mailchimp"
+# crm.lead remain
+    _columns = {
+        'mailchimp_account_id': fields.many2one('mailchimp.account',
+                                             'Mailchimp Account', required=True),
+        'mailchimp_list_id': fields.many2one('mailchimp.list', 'List'),
+        'list_name': fields.char('Name',size = 64),
+        'partner_ids': fields.many2many('res.partner',
+                                        'create_list_partner_rel',
+                                        'cust_list_id', 'partner_id',
+                                        'Partner'),
+
+        }
+        
+    def onchange_mailchimp_account_id(self, cr, uid, ids, mailchimp_account_id,
+                                                                action):
+        print mailchimp_account_id,action,
+        return {'value':{}}   
+        
+    def create_list(self, cr, uid, ids, context=None):
+        create_list_obj = self.browse(cr, uid, ids[0])
+        print create_list_obj.id
+        mailchimp_account_obj = self.pool.get('mailchimp.account')
+        account_id = create_list_obj.mailchimp_account_id
+        lists = mailchimp_account_obj.get_response(cr, uid, account_id.id, 'lists')
+        lists = dict([(l['name'],l['id']) for l in lists])
+        print lists        
+        if create_list_obj.list_name not in lists.keys():
+            raise  osv.except_osv(_('UserError'),
+                _('There is no list define in account %s') % (account_id.name))
+        list_id = lists[create_list_obj.list_name]
+        mailchimp_account_obj.add_partner_list(cr, uid, account_id.id, list_id,
+                                                    create_list_obj.partner_ids)
+        return {}
+create_list()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/marketing_campaign_mailchimp/wizard/create_list_view.xml b/addons/marketing_campaign_mailchimp/wizard/create_list_view.xml
new file mode 100755
index 00000000000..f15826aeaea
--- /dev/null
+++ b/addons/marketing_campaign_mailchimp/wizard/create_list_view.xml
@@ -0,0 +1,35 @@
+<openerp>
+      <data>
+        <record id="view_create_list" model="ir.ui.view">
+            <field name="name">create.list.form</field>
+            <field name="model">create.list</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+            <form string="Update List">
+                <field name="mailchimp_account_id" on_change = "onchange_mailchimp_account_id(mailchimp_account_id,action)"/>
+                <field name="list_name" />
+                <newline/>
+                <separator string="Partner" colspan="4"/>
+                <field name="partner_ids" nolabel="1" colspan="4"/>
+                <!--group ">
+                    <field name="mailchimp_list_id" />
+                </group-->
+                <group col="4" colspan="4">
+                    <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                    <button name="create_list" string="Update" type="object" icon="gtk-ok"/>
+                </group>
+            </form>
+        </field>
+    </record>
+	<record id="action_create_list" model="ir.actions.act_window">
+        <field name="name">Update List</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">create.list</field>
+        <field name="view_type">form</field>
+        <field name="view_id" ref="view_create_list"/>
+        <field name="target">new</field>
+    </record>
+    <menuitem id="menu_action_mailchimp_create_list" parent="menu_action_mailchimp" action="action_create_list" sequence="40"/>
+
+     </data>
+</openerp>

From 4c1ac43aa239f776da09318bb827679fa7e1fc07 Mon Sep 17 00:00:00 2001
From: "qdp-launchpad@tinyerp.com" <>
Date: Wed, 16 Jun 2010 12:08:18 +0200
Subject: [PATCH 23/39] [FIX] stock: put back required=True on company_id field
 of picking and stock move [REF] stock_location: removed the
 chained_company_id stuff

bzr revid: qdp-launchpad@tinyerp.com-20100616100818-uihigpv4fklgxbdz
---
 addons/stock/stock.py             | 4 ++--
 addons/stock_location/mrp_pull.py | 4 ++--
 addons/stock_location/stock.py    | 4 +---
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 87346d092f6..00bdb4e07e8 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -602,7 +602,7 @@ class stock_picking(osv.osv):
             ("2binvoiced", "To Be Invoiced"),
             ("none", "Not from Picking")], "Invoice Status",
             select=True, required=True, readonly=True, states={'draft': [('readonly', False)]}),
-        'company_id': fields.many2one('res.company', 'Company', select=1),
+        'company_id': fields.many2one('res.company', 'Company', required=True, select=1),
     }
     _defaults = {
         'name': lambda self, cr, uid, context: '/',
@@ -1380,7 +1380,7 @@ class stock_move(osv.osv):
                                   \nThe state is \'Waiting\' if the move is waiting for another one.'),
         'price_unit': fields.float('Unit Price',
             digits_compute= dp.get_precision('Account')),
-        'company_id': fields.many2one('res.company', 'Company', select=1),
+        'company_id': fields.many2one('res.company', 'Company', required=True, select=1),
         'partner_id': fields.related('picking_id','address_id','partner_id',type='many2one', relation="res.partner", string="Partner"),
         'backorder_id': fields.related('picking_id','backorder_id',type='many2one', relation="stock.picking", string="Back Order"),
         'origin': fields.related('picking_id','origin',type='char', size=64, relation="stock.picking", string="Origin"),
diff --git a/addons/stock_location/mrp_pull.py b/addons/stock_location/mrp_pull.py
index 4f9c22a54cd..a8a5026bf4c 100644
--- a/addons/stock_location/mrp_pull.py
+++ b/addons/stock_location/mrp_pull.py
@@ -68,7 +68,7 @@ class procurement_order(osv.osv):
             origin = (proc.origin or proc.name or '').split(':')[0] +':'+line.name
             picking_id = self.pool.get('stock.picking').create(cr, uid, {
                 'origin': origin,
-                'company_id': line.chained_company_id and line.chained_company_id.id or False,
+                'company_id': line.company_id and line.company_id.id or False,
                 'type': line.picking_type,
                 'stock_journal_id': line.journal_id and line.journal_id.id or False,
                 'move_type': 'one',
@@ -79,7 +79,7 @@ class procurement_order(osv.osv):
             move_id = self.pool.get('stock.move').create(cr, uid, {
                 'name': line.name,
                 'picking_id': picking_id,
-                'company_id': line.chained_company_id and line.chained_company_id.id or False,
+                'company_id': line.company_id and line.company_id.id or False,
                 'product_id': proc.product_id.id,
                 'date_planned': proc.date_planned,
                 'product_qty': proc.product_qty,
diff --git a/addons/stock_location/stock.py b/addons/stock_location/stock.py
index d49b9ffbafa..561cdbbecda 100644
--- a/addons/stock_location/stock.py
+++ b/addons/stock_location/stock.py
@@ -40,7 +40,6 @@ class stock_location_path(osv.osv):
             ("none", "Not from Picking")], "Invoice Status",
             required=True,),
         'picking_type': fields.selection([('out','Sending Goods'),('in','Getting Goods'),('internal','Internal'),('delivery','Delivery')], 'Shipping Type', required=True, select=True, help="Depending on the company, choose whatever you want to receive or send products"),
-        'chained_company_id': fields.many2one('res.company', 'Chained Company', help='Set here the belonging company of the chained move'),
         'auto': fields.selection(
             [('auto','Automatic Move'), ('manual','Manual Operation'),('transparent','Automatic No Step Added')],
             'Automatic Move',
@@ -73,7 +72,6 @@ class product_pulled_flow(osv.osv):
         'company_id': fields.many2one('res.company', 'Company', help="Is used to know to which company belong packings and moves"),
         'partner_address_id': fields.many2one('res.partner.address', 'Partner Address'),
         'picking_type': fields.selection([('out','Sending Goods'),('in','Getting Goods'),('internal','Internal'),('delivery','Delivery')], 'Shipping Type', required=True, select=True, help="Depending on the company, choose whatever you want to receive or send products"),
-        'chained_company_id': fields.many2one('res.company', 'Chained Company', help='Set here the belonging company of the chained move'),
         'product_id':fields.many2one('product.product','Product'),
         'invoice_state': fields.selection([
             ("invoiced", "Invoiced"),
@@ -120,7 +118,7 @@ class stock_location(osv.osv):
         if product:
             for path in product.path_ids:
                 if path.location_from_id.id == location.id:
-                    return path.location_dest_id, path.auto, path.delay, path.journal_id and path.journal_id.id or False, path.chained_company_id and path.chained_companyd_id.id or False, path.picking_type
+                    return path.location_dest_id, path.auto, path.delay, path.journal_id and path.journal_id.id or False, path.company_id and path.company_id.id or False, path.picking_type
         return super(stock_location, self).chained_location_get(cr, uid, location, partner, product, context)
 stock_location()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From b140d34b193a2574d11704e5d964ffb830d3d34b Mon Sep 17 00:00:00 2001
From: "nel@tinyerp.com" <>
Date: Wed, 16 Jun 2010 12:47:07 +0200
Subject: [PATCH 24/39] [ADD]  stock_avg_consommation: for consommation of
 product by location and by period

bzr revid: nel@tinyerp.com-20100616104707-d4tp02d0qvr7wljz
---
 addons/account/report/__init__.py             |   2 +-
 addons/stock/stock.py                         |  28 +++--
 addons/stock/stock_view.xml                   |   4 +
 addons/stock_avg_consommation/__init__.py     |  25 +++++
 addons/stock_avg_consommation/__openerp__.py  |  35 ++++++
 .../stock_avg_consommation.py                 | 100 ++++++++++++++++++
 .../stock_avg_consommation_view.xml           |  18 ++++
 .../stock_avg_consommation/wizard/__init__.py |  24 +++++
 .../wizard/stock_avg_consommation_wizard.py   |  57 ++++++++++
 9 files changed, 283 insertions(+), 10 deletions(-)
 create mode 100644 addons/stock_avg_consommation/__init__.py
 create mode 100644 addons/stock_avg_consommation/__openerp__.py
 create mode 100644 addons/stock_avg_consommation/stock_avg_consommation.py
 create mode 100644 addons/stock_avg_consommation/stock_avg_consommation_view.xml
 create mode 100644 addons/stock_avg_consommation/wizard/__init__.py
 create mode 100644 addons/stock_avg_consommation/wizard/stock_avg_consommation_wizard.py

diff --git a/addons/account/report/__init__.py b/addons/account/report/__init__.py
index 482b9b62280..ad965e04b57 100644
--- a/addons/account/report/__init__.py
+++ b/addons/account/report/__init__.py
@@ -30,7 +30,7 @@ import invoice
 import overdue
 import aged_trial_balance
 import tax_report
-import account_tax_code
+#import account_tax_code
 import account_balance_landscape
 import compare_account_balance
 import account_invoice_report
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 87346d092f6..1b8e3de26e5 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1689,15 +1689,25 @@ class stock_move(osv.osv):
         new_move = []
         update_val = {}
         ir_sequence_obj = self.pool.get('ir.sequence')
-        prodlot_obj = self.pool.get('stock.production.lot')
-        last_prod = [line.prodlot_id for line in self.browse(cr, uid, ids)[0].picking_id.move_lines if line.prodlot_id]
-        last_prod.sort(key=lambda p: p.date, reverse=True)
-        last_prod_id = last_prod and last_prod[0].id
-        update_val['prodlot_id'] = last_prod_id
-        if update_val.get('prodlot_id',[])==[]:
-            sequence = ir_sequence_obj.get(cr, uid, 'stock.lot.serial')
-            prodlot_id = prodlot_obj.create(cr, uid, {'name': sequence}, {'product_id': self.browse(cr, uid, ids)[0].product_id.id})
-            update_val['prodlot_id'] = prodlot_id
+        tracking_obj = self.pool.get('stock.tracking')
+        tracking = False
+        tracking = context.get('tracking', False)
+    #    import pdb; pdb.set_trace()
+        if tracking:
+            tracking_id = tracking_obj.search(cr, uid, ['name','=', tracking])
+            if prodlot_id:
+                update_val['prodlot_id'] = prodlot_id
+            else: 
+                tracking_id = tracking_obj.create(cr, uid, {'name': tracking}, {'product_id': self.browse(cr, uid, ids)[0].product_id.id})
+                update_val['tracking_id'] = tracking_id
+        else:
+            last_track = [line.tracking_id for line in self.browse(cr, uid, ids)[0].picking_id.move_lines if line.tracking_id]
+            if not last_track:
+                track_ids= tracking_obj.search(cr, uid, [])
+                last_track = [track for track in tracking_obj.browse(cr, uid, track_ids)]
+            last_track.sort(key=lambda p: p.date, reverse=True)
+            last_track_id = last_track and last_track[0].id
+            update_val['tracking_id'] = last_track_id
         self.write(cr, uid, ids, update_val)
         return True
     
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 3171387aaa6..ab33b07aacb 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1630,6 +1630,10 @@
                         <separator orientation="vertical"/>
                         <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_planned'}" />
                     </group>
+                    <newline/>
+                    <group expand="0" string="Extended options..." groups="base.group_extended">
+                       <field name="tracking_id"  context="{'tracking': self}" domain="[]" />
+                    </group>
                 </search>
             </field>
         </record>
diff --git a/addons/stock_avg_consommation/__init__.py b/addons/stock_avg_consommation/__init__.py
new file mode 100644
index 00000000000..c4d17a90d9a
--- /dev/null
+++ b/addons/stock_avg_consommation/__init__.py
@@ -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 stock_avg_consommation
+import wizard
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock_avg_consommation/__openerp__.py b/addons/stock_avg_consommation/__openerp__.py
new file mode 100644
index 00000000000..37008770cae
--- /dev/null
+++ b/addons/stock_avg_consommation/__openerp__.py
@@ -0,0 +1,35 @@
+# -*- 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/>.
+#
+##############################################################################
+
+
+{
+    'name': 'Stock Average consommation',
+    'version': '1.0',
+    'category': 'Generic Modules/Inventory Control',
+    'author': 'Tiny',
+    'depends': ['stock'],
+    'init_xml': [],
+    'update_xml': ['stock_avg_consommation_view.xml'],
+    'demo_xml': [],
+    'installable': True,
+    'active': False,
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock_avg_consommation/stock_avg_consommation.py b/addons/stock_avg_consommation/stock_avg_consommation.py
new file mode 100644
index 00000000000..b9dab63d18b
--- /dev/null
+++ b/addons/stock_avg_consommation/stock_avg_consommation.py
@@ -0,0 +1,100 @@
+# -*- 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/>.
+#
+##############################################################################
+
+from osv import fields,osv
+import tools
+import ir
+import pooler
+from mx import DateTime
+from datetime import datetime
+import time
+from dateutil.relativedelta import relativedelta
+
+class stock_avg_consommation(osv.osv):
+    _name = "stock.avg.consommation"
+    _inherit="product.product"
+
+    def _compute_avg_consommation(self, cr, uid, ids, fields, args, context={}):
+        print  ids, fields, args, context
+        date_str=False
+        from_date=context.get('from_date',False)
+        to_date=context.get('to_date',False)
+
+        if from_date and to_date:
+            date_str="date_planned>='%s' and date_planned<='%s'"%(from_date,to_date)
+        elif from_date:
+            date_str="date_planned>='%s'"%(from_date)
+        elif to_date:
+            date_str="date_planned<='%s'"%(to_date)
+
+        date_object_to = to_date and  datetime.strptime(to_date, '%Y-%m-%d %H:%M:%S') or datetime.now()
+        date_object_from = from_date and datetime.strptime(from_date, '%Y-%m-%d %H:%M:%S')  or (datetime.now() + relativedelta(days=-30))
+        dd = date_object_to - date_object_from
+        total_days=dd.days+1
+        if not from_date and not to_date:
+            date_str="date_planned>='%s' and date_planned<='%s'"%(date_object_from.strftime('%Y-%m-%d 00:00:00'), date_object_to.strftime('%Y-%m-%d 23:59:59'))
+        elif not from_date:
+            date_str="date_planned>='%s'"%(date_object_from.strftime('%Y-%m-%d 00:00:00'))
+        elif not to_date:
+            date_str="date_planned<='%s'"%(date_object_to.strftime('%Y-%m-%d 23:59:59'))
+        res={}
+        for line_id in ids:
+            res[line_id] = False
+        location_ids = []
+
+        if context.get('location', False):
+            if type(context['location']) == type(1):
+                location_ids = [context['location']]
+            elif type(context['location']) in (type(''), type(u'')):
+                location_ids = self.pool.get('stock.location').search(cr, uid, [('name','ilike',context['location'])], context=context)
+            else:
+                location_ids = context['location']
+        else:
+            location_ids = []
+            wids = self.pool.get('stock.warehouse').search(cr, uid, [], context=context)
+            for w in self.pool.get('stock.warehouse').browse(cr, uid, wids, context=context):
+                location_ids.append(w.lot_stock_id.id)
+
+        # build the list of ids of children of the location given by id
+        if context.get('compute_child',True):
+            child_location_ids = self.pool.get('stock.location').search(cr, uid, [('location_id', 'child_of', location_ids)])
+            location_ids = child_location_ids or location_ids
+        else:
+            location_ids = location_ids
+
+
+
+        #sql = """select product_id,sum(product_qty) from stock_move sm,stock_picking sp where sm.picking_id=sp.id and sp.type in ('out','delivery') and %s and  location_id <> ANY(%s) and location_dest_id =ANY(%s) group by product_id""" % (date_str, location_ids, location_ids)
+        sql = """select product_id,sum(product_qty) from stock_move sm,stock_picking sp where sm.picking_id=sp.id and sp.type in ('out','delivery') and """+date_str+""" and  sm.location_id not in %s and sm.location_dest_id in %s group by product_id"""
+        cr.execute(sql, [tuple(location_ids), tuple(location_ids)])
+        product_ids = []
+        res_sum = cr.fetchall()
+        for line_id, avg in res_sum:
+            res[line_id] = avg/total_days
+            product_ids.append(avg)
+        return res
+
+    _columns = {
+        'avg_consommation':fields.function(_compute_avg_consommation,method=True, type='float', string="Average Consommation"),
+    }
+stock_avg_consommation()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock_avg_consommation/stock_avg_consommation_view.xml b/addons/stock_avg_consommation/stock_avg_consommation_view.xml
new file mode 100644
index 00000000000..d9afed69af3
--- /dev/null
+++ b/addons/stock_avg_consommation/stock_avg_consommation_view.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+       <record id="stock_avg_consommation_tree" model="ir.ui.view">
+            <field name="name">stock.avg.consommation.tree</field>
+            <field name="model">stock.avg.consommation</field>
+            <field name="type">tree</field>
+            <field name="inherit_id" ref="product.product_product_tree_view"/>
+            <field name="arch" type="xml">
+   				<field name="state" position="after">
+                        <field name="avg_consommation" />
+                </field>
+            </field>
+        </record>
+	</data>
+</openerp>
+
+
diff --git a/addons/stock_avg_consommation/wizard/__init__.py b/addons/stock_avg_consommation/wizard/__init__.py
new file mode 100644
index 00000000000..a7d7cfed3dc
--- /dev/null
+++ b/addons/stock_avg_consommation/wizard/__init__.py
@@ -0,0 +1,24 @@
+# -*- 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 stock_avg_consommation_wizard
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock_avg_consommation/wizard/stock_avg_consommation_wizard.py b/addons/stock_avg_consommation/wizard/stock_avg_consommation_wizard.py
new file mode 100644
index 00000000000..7d5d8657aa2
--- /dev/null
+++ b/addons/stock_avg_consommation/wizard/stock_avg_consommation_wizard.py
@@ -0,0 +1,57 @@
+# -*- 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/>.
+#
+##############################################################################
+
+from osv import fields, osv
+
+class stock_location_product(osv.osv_memory):
+    _inherit = "stock.location.product"
+
+    def action_open_window(self, cr, uid, ids, context):
+        """ To open location wise product information specific to given duration
+         @param self: The object pointer.
+         @param cr: A database cursor
+         @param uid: ID of the user currently logged in
+         @param ids: An ID or list of IDs if we want more than one
+         @param context: A standard dictionary
+         @return: Invoice type
+        """
+
+        mod_obj = self.pool.get('ir.model.data')
+        view = mod_obj._get_id(cr, uid, 'stock_avg_consommation', 'stock_avg_consommation_tree')
+        id = mod_obj.read(cr, uid, view, ['res_id'])
+
+        for location_obj in self.read(cr, uid, ids, ['from_date', 'to_date']):
+            return {
+                'name': False,
+                'view_id':[id['res_id']],
+                'view_type': 'form',
+                'view_mode': 'tree,form',
+                'res_model': 'stock.avg.consommation',
+                'type': 'ir.actions.act_window',
+                'context': {'location': context['active_id'],
+                       'from_date': location_obj['from_date'],
+                       'to_date': location_obj['to_date']},
+                'domain': [('type', '<>', 'service')],
+            }
+
+stock_location_product()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

From 39adfe070f8f41cc7cf2aa8fbd4f8d7221b9986a Mon Sep 17 00:00:00 2001
From: "nel@tinyerp.com" <>
Date: Wed, 16 Jun 2010 13:15:00 +0200
Subject: [PATCH 25/39] [FIX] sale orders dates

bzr revid: nel@tinyerp.com-20100616111500-hm9u1np13tt8nlnn
---
 addons/sale_order_dates/sale.py | 3 ++-
 addons/stock/stock_view.xml     | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/sale_order_dates/sale.py b/addons/sale_order_dates/sale.py
index 1b4bad360e6..877199b32ad 100644
--- a/addons/sale_order_dates/sale.py
+++ b/addons/sale_order_dates/sale.py
@@ -48,7 +48,8 @@ class sale_order_dates(osv.osv):
                 dt=DateTime.strptime(order.date_order, '%Y-%m-%d') + DateTime.RelativeDateTime(days=line.delay or 0.0)
                 dt_s = dt.strftime('%Y-%m-%d')
                 dates_list.append(dt_s)
-            res[order.id] = min(dates_list)
+            if dates_list:
+                res[order.id] = min(dates_list)
             return res
 
     _columns = {
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index ab33b07aacb..3fdfda9e057 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -322,6 +322,7 @@
                     <field name="date_planned" string="Date"/>
                     <field name="date_expected" string="Date Expected"/>
                     <field name="state"/>
+                    <button name="action_done" states="confirmed,assigned" string="Done" type="object" icon="gtk-jump-to"/>
                 </tree>
             </field>
         </record>

From 5c854d68caf08e1baecced7ec858c998e8b82d9e Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 16 Jun 2010 13:38:52 +0200
Subject: [PATCH 26/39] merge

bzr revid: fp@tinyerp.com-20100616113852-cj3dwha1w74l5q3w
---
 addons/idea/test/test_idea.yml         |  4 ++--
 addons/purchase/purchase_view.xml      |  3 +--
 addons/sale_order_dates/__openerp__.py |  8 +++++---
 addons/sale_order_dates/sale_view.xml  | 12 +++++-------
 addons/stock/stock.py                  |  5 +----
 5 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/addons/idea/test/test_idea.yml b/addons/idea/test/test_idea.yml
index 4c3f5301a5a..bcb764f8933 100644
--- a/addons/idea/test/test_idea.yml
+++ b/addons/idea/test/test_idea.yml
@@ -19,13 +19,13 @@
     user_id: base.user_root
     
 - |
-  I check that idea on draft state.
+  I check that the idea is in draft state.
 -
   !assert {model: idea.idea, id: idea_idea_0}:
     - state == 'draft'  
     
 - |
-  I open this idea by click on "Open" button.
+  I open this idea by clicking on the "Open" button.
 - 
   !workflow {model: idea.idea, action: idea_open, ref: idea_idea_0}
   
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 3a7277a4766..e6cf510b018 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -91,8 +91,7 @@
                                     <field name="product_qty"/>
                                     <field name="product_uom"/>
                                     <field name="price_unit"/>
-                                     <field name="price_subtotal" groups="base.group_extended"/>
-                                    <field name="invoiced"/>
+                                    <field name="price_subtotal" groups="base.group_extended"/>
                                 </tree>
                                 <!-- default form view -->
                             </field>
diff --git a/addons/sale_order_dates/__openerp__.py b/addons/sale_order_dates/__openerp__.py
index e8a2cf6e6b6..0f7a56fba20 100644
--- a/addons/sale_order_dates/__openerp__.py
+++ b/addons/sale_order_dates/__openerp__.py
@@ -21,11 +21,13 @@
 
 
 {
-    'name': 'Customer & Sales',
+    'name': 'Sale Order Dates',
     'version': '1.0',
     'category': 'Generic Modules/CRM & SRM',
-    'description': """Sale Orders Dates""",
-    'author': 'Tiny',
+    'description': """
+Add commitment, requested and effective dates on the sale order.
+""",
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ["sale"],
     'init_xml': [
diff --git a/addons/sale_order_dates/sale_view.xml b/addons/sale_order_dates/sale_view.xml
index 7f5edf811ef..54248fa0176 100644
--- a/addons/sale_order_dates/sale_view.xml
+++ b/addons/sale_order_dates/sale_view.xml
@@ -2,22 +2,20 @@
 <openerp>
     <data>
 
-   <record id="view_sale_orderfor" model="ir.ui.view">
+        <record id="view_sale_orderfor" model="ir.ui.view">
             <field name="name">sale.order.form.inherit5</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">
-              <field name="date_confirm" position="after">
-                    <separator string="Dates" colspan="4"/>
+                <field name="date_confirm" position="after">
                     <field name="commitment_date"/>
-                    <newline/>
                     <field name="effective_date"/>
                     <field name="requested_date"/>
-              </field>
+                </field>
             </field>
-                </record>
+        </record>
 
 
-     </data>
+    </data>
 </openerp>
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index a7241c2bbe6..924bf69c520 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -2251,7 +2251,7 @@ class stock_inventory(osv.osv):
                         'prodlot_id': lot_id,
                         'date': inv.date,
                         'date_planned': inv.date,
-                        'state': 'assigned'
+                        'state': 'done'
                     }
                     if change > 0:
                         value.update( {
@@ -2271,9 +2271,6 @@ class stock_inventory(osv.osv):
                             'product_qty': line.product_qty
                         })
                     move_ids.append(self._inventory_line_hook(cr, uid, line, value))
-            if len(move_ids):
-                self.pool.get('stock.move').action_done(cr, uid, move_ids,
-                        context=context)
             self.write(cr, uid, [inv.id], {'state': 'done', 'date_done': time.strftime('%Y-%m-%d %H:%M:%S'), 'move_ids': [(6, 0, move_ids)]})
         return True
 

From e28676b821b440bdaa9771adccf36b902dfe0b00 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Wed, 16 Jun 2010 17:11:41 +0530
Subject: [PATCH 27/39] [MOD,IMP] point_of_sale : improvements in pos order
 report, account,hr,mrp,project,stock: changes in icons

bzr revid: vir@tinyerp.com-20100616114141-l6nbfgc6wsof1hzh
---
 addons/account/account_invoice_view.xml       | 20 +++++------
 addons/account/account_view.xml               | 20 +++++------
 .../project_account_analytic_line_view.xml    |  2 +-
 .../account_analytic_entries_report_view.xml  |  2 +-
 .../report/account_analytic_report_view.xml   |  2 +-
 .../report/account_entries_report_view.xml    |  2 +-
 .../report/account_invoice_report_view.xml    |  2 +-
 .../account_automatic_reconcile_view.xml      |  4 +--
 .../wizard/account_central_journal_view.xml   |  2 +-
 .../wizard/account_change_currency_view.xml   |  2 +-
 addons/account/wizard/account_chart_view.xml  |  2 +-
 .../wizard/account_invoice_state_view.xml     |  6 ++--
 .../wizard/account_journal_select_view.xml    |  4 +--
 .../account_move_bank_reconcile_view.xml      |  4 +--
 .../wizard/account_move_journal_view.xml      |  4 +--
 ...ccount_move_line_reconcile_select_view.xml |  4 +--
 .../wizard/account_move_line_select_view.xml  |  4 +--
 ...ount_move_line_unreconcile_select_view.xml |  4 +--
 .../account_open_closed_fiscalyear_view.xml   |  4 +--
 .../account_partner_balance_report_view.xml   |  2 +-
 .../wizard/account_period_close_view.xml      |  2 +-
 .../account/wizard/account_reconcile_view.xml |  4 +--
 .../account_statement_from_invoice_view.xml   |  2 +-
 .../account/wizard/account_use_model_view.xml |  4 +--
 .../wizard/account_validate_move_view.xml     |  2 +-
 addons/crm/report/crm_lead_report_view.xml    |  2 +-
 .../crm/report/crm_phonecall_report_view.xml  |  2 +-
 .../report/crm_claim_report_view.xml          |  2 +-
 .../report/crm_fundraising_report_view.xml    |  2 +-
 addons/hr_attendance/hr_attendance_view.xml   |  2 +-
 .../report/hr_evaluation_report_view.xml      |  2 +-
 .../report/hr_expense_report_view.xml         |  2 +-
 .../report/available_holidays_view.xml        |  2 +-
 .../report/hr_holidays_report_view.xml        |  2 +-
 .../report/hr_recruitment_report_view.xml     |  2 +-
 .../hr_timesheet_invoice_report_view.xml      |  2 +-
 .../hr_timesheet_sheet_view.xml               | 20 +++++------
 .../report/timesheet_report_view.xml          |  2 +-
 .../mrp/report/mrp_production_order_view.xml  |  2 +-
 .../report/report_pos_order_view.xml          | 13 ++++---
 addons/project/report/project_report_view.xml |  2 +-
 .../report/project_issue_report_view.xml      |  4 +--
 .../purchase/report/purchase_report_view.xml  | 34 +++++++++----------
 addons/sale/report/sale_report_view.xml       |  4 +--
 .../stock/report/report_stock_move_view.xml   |  2 +-
 .../report/report_stock_picking_view.xml      |  2 +-
 46 files changed, 111 insertions(+), 106 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 1f86fb07b90..2421c4c044d 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -193,7 +193,7 @@
                                 </field>
                             </group>
                             <group col="4" colspan="2">
-                                <button colspan="2" name="button_reset_taxes" states="draft" string="Compute Taxes" type="object" icon="gtk-apply"/>
+                                <button colspan="2" name="button_reset_taxes" states="draft" string="Compute Taxes" type="object" icon="terp-stock_format-scientific"/>
                                 <field name="amount_untaxed"/>
                                 <label string="" colspan="2"/>
                                 <field name="amount_tax"/>
@@ -202,12 +202,12 @@
                                 <field name="state"/>
                                 <field name="residual"/>
                                 <group col="3" colspan="4">
-                                    <button name="invoice_open" states="draft,proforma2" string="Validate" icon="gtk-apply"/>
+                                    <button name="invoice_open" states="draft,proforma2" string="Validate" icon="terp-camera_test"/>
                                     <button name="%(action_account_invoice_pay)d" type='action' string='Pay Invoice' states='open' icon="gtk-ok"/>
-                                    <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel"/>
-                                    <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
+                                    <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="terp-gtk-stop"/>
+                                    <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="stock_effects-object-colorize"/>
                                     <button name="%(action_account_state_open)d" type='action' string='Re-Open' states='paid' icon="gtk-convert"/>
-                                    <button name="%(action_account_invoice_refund)d" type='action' string='Credit Note' states='paid' icon="gtk-execute"/>
+                                    <button name="%(action_account_invoice_refund)d" type='action' string='Credit Note' states='paid' icon="terp-dolar"/>
                                 </group>
                             </group>
                         </page>
@@ -256,7 +256,7 @@
                     <field name="number"/>
                     <field name="type" invisible="1"/>
                     <field name="currency_id" domain="[('company_id','=', company_id)]" on_change="onchange_currency_id(currency_id, company_id)" width="50"/>
-                    <button name="%(action_account_change_currency)d" type="action" icon="gtk-apply" string="Change Currency"/>
+                    <button name="%(action_account_change_currency)d" type="action" icon="terp-stock_effects-object-colorize" string="Change Currency"/>
                     <newline/>
                     <field name="partner_id" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank,company_id)" groups="base.group_user"/>
                     <field domain="[('partner_id','=',partner_id)]" name="address_invoice_id"/>
@@ -286,7 +286,7 @@
                                 </field>
                             </group>
                             <group col="4" colspan="2">
-                                <button colspan="2" name="button_reset_taxes" states="draft" string="Compute Taxes" type="object" groups="base.group_user" icon="gtk-apply"/>
+                                <button colspan="2" name="button_reset_taxes" states="draft" string="Compute Taxes" type="object" groups="base.group_user" icon="terp-stock_format-scientific"/>
                                 <field name="amount_untaxed"/>
                                 <label string="" colspan="2"/>
                                 <field name="amount_tax"/>
@@ -295,11 +295,11 @@
                                 <field name="state"/>
                                 <field name="residual"/>
                                 <group col="4" colspan="4" groups="base.group_user">
-                                    <button name="invoice_proforma2" states="draft" string="PRO-FORMA" icon="gtk-print"/>
-                                    <button name="invoice_open" states="draft,proforma2" string="Create" icon="gtk-execute"/>
+                                    <button name="invoice_proforma2" states="draft" string="PRO-FORMA" icon="terp-check"/>
+                                    <button name="invoice_open" states="draft,proforma2" string="Create" icon="terp-document-new"/>
                                     <button name="%(action_account_invoice_pay)d" type='action' string='Pay Invoice' states='open' icon="gtk-ok"/>
                                     <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel"/>
-                                    <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
+                                    <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
                                     <button name='%(action_account_state_open)d' type='action' string='Re-Open' states='paid' icon="gtk-convert"/>
                                     <button name="%(action_account_invoice_refund)d" type='action' string='Credit Note' states='paid' icon="gtk-execute"/>
                                 </group>
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 1b9e166ac81..ab28fa3925c 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -407,9 +407,9 @@
                     <group col="7" colspan="4">
                         <field name="state"/>
                         <field name="balance_end"/>
-                        <button name="button_dummy" states="draft" string="Compute" icon="gtk-execute"/>
-                        <button name="button_confirm" states="draft" string="Confirm" type="object"  icon="gtk-apply"/>
-                        <button name="button_cancel" states="confirm" string="Cancel" type="object" icon="gtk-cancel"/>
+                        <button name="button_dummy" states="draft" string="Compute" icon="terp-stock_format-scientific"/>
+                        <button name="button_confirm" states="draft" string="Confirm" type="object"  icon="terp-camera_test"/>
+                        <button name="button_cancel" states="confirm" string="Cancel" type="object" icon="terp-gtk-stop"/>
                     </group>
                 </form>
             </field>
@@ -465,7 +465,7 @@
                         <field name="total_entry"/>
                         <field name="total_new"/>
                         <field name="total_balance"/>
-                        <button colspan="2" name="dummy" string="Compute" icon="gtk-execute"/>
+                        <button colspan="2" name="dummy" string="Compute" icon="terp-stock_format-scientific"/>
                     </group>
                 </form>
             </field>
@@ -956,8 +956,8 @@
                             <field name="narration" colspan="4" nolabel="1"/>
                             <field name="state" select="1"/>
                             <group col="2" colspan="2">
-                                <button name="button_validate" states="draft" string="Validate" type="object" icon="gtk-execute"/>
-                                <button name="button_cancel" states="posted" string="Cancel" type="object" icon="gtk-cancel"/>
+                                <button name="button_validate" states="draft" string="Validate" type="object" icon="terp-camera_test"/>
+                                <button name="button_cancel" states="posted" string="Cancel" type="object" icon="terp-gtk-stop"/>
                             </group>
                         </page>
                         <page string="Other Information">
@@ -1094,9 +1094,9 @@
                     <group col="7" colspan="4">
                         <field name="state"/>
                         <field name="balance_end"/>
-                        <button name="button_dummy" states="draft" string="Compute" icon="gtk-execute"/>
-                        <button name="button_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
-                        <button name="button_cancel" states="confirm" string="Cancel" type="object" icon="gtk-cancel"/>
+                        <button name="button_dummy" states="draft" string="Compute" icon="terp-stock_format-scientific"/>
+                        <button name="button_confirm" states="draft" string="Confirm" type="object" icon="terp-camera_test"/>
+                        <button name="button_cancel" states="confirm" string="Cancel" type="object" icon="terp-gtk-stop"/>
                     </group>
                 </form>
             </field>
@@ -1372,7 +1372,7 @@
                     <field name="period_type"/>
                     <field name="model_id"/>
                     <group col="2" colspan="2">
-                        <button name="compute" states="draft,running" string="Compute" type="object" icon="gtk-execute"/>
+                        <button name="compute" states="draft,running" string="Compute" type="object" icon="terp-stock_format-scientific"/>
                         <button name="remove_line" states="running" string="Remove Lines" type="object" icon="gtk-remove"/>
                     </group>
                     <separator colspan="4" string="Subscription Lines"/>
diff --git a/addons/account/project/wizard/project_account_analytic_line_view.xml b/addons/account/project/wizard/project_account_analytic_line_view.xml
index 96d9186cfa8..d564ffb5c81 100644
--- a/addons/account/project/wizard/project_account_analytic_line_view.xml
+++ b/addons/account/project/wizard/project_account_analytic_line_view.xml
@@ -17,7 +17,7 @@
                        	 <separator string="" colspan="4" />
                     <group colspan="4" col="6">
                     	 <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	 <button icon="gtk-execute" string="Open Entries" name="action_open_window" type="object"/>
+                    	 <button icon="terp-gtk-go-back-rtl" string="Open Entries" name="action_open_window" type="object"/>
                    	</group>
                 </form>
             </field>
diff --git a/addons/account/report/account_analytic_entries_report_view.xml b/addons/account/report/account_analytic_entries_report_view.xml
index 1564859540a..3b9e3ec193e 100644
--- a/addons/account/report/account_analytic_entries_report_view.xml
+++ b/addons/account/report/account_analytic_entries_report_view.xml
@@ -66,7 +66,7 @@
                     <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
                     <filter string="Product UOM" icon="terp-mrp" context="{'group_by':'product_uom_id'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Day" icon="terp-go-month" context="{'group_by':'day'}"/>
+                    <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
                     <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
                     <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
                 </group>
diff --git a/addons/account/report/account_analytic_report_view.xml b/addons/account/report/account_analytic_report_view.xml
index 290e6950569..070b3a8c10a 100644
--- a/addons/account/report/account_analytic_report_view.xml
+++ b/addons/account/report/account_analytic_report_view.xml
@@ -82,7 +82,7 @@
                     <filter string="Account Type" icon="terp-stock_symbol-selection" context="{'group_by':'type'}"/>
                     <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Day" icon="terp-go-month" context="{'group_by':'day'}"/>
+                    <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
                     <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
                     <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
                 </group>
diff --git a/addons/account/report/account_entries_report_view.xml b/addons/account/report/account_entries_report_view.xml
index 0c3a77db2a7..5645c34d20c 100644
--- a/addons/account/report/account_entries_report_view.xml
+++ b/addons/account/report/account_entries_report_view.xml
@@ -93,7 +93,7 @@
                     <filter string="Period" icon="terp-go-month" context="{'group_by':'period_id'}"/>
                     <filter string="Period of Move Line" icon="terp-go-month" context="{'group_by':'period_id2'}"/>
                     <newline/>
-                    <filter string="Day" icon="terp-go-month" context="{'group_by':'day'}"/>
+                    <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
                     <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
                     <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
                  </group>
diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index 542b695e7dd..448f2abaf6d 100644
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -111,7 +111,7 @@
                     <separator orientation="vertical"/>
                     <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                     <newline/>
-                    <filter string="Day" icon="terp-go-month" context="{'group_by':'day'}"/>
+                    <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
                     <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
                     <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
                 </group>
diff --git a/addons/account/wizard/account_automatic_reconcile_view.xml b/addons/account/wizard/account_automatic_reconcile_view.xml
index 9711fc9b941..02fbb5a7376 100644
--- a/addons/account/wizard/account_automatic_reconcile_view.xml
+++ b/addons/account/wizard/account_automatic_reconcile_view.xml
@@ -21,7 +21,7 @@
 				    <separator string ="" colspan="4"/>
 				    <group colspan="2" col="4">
      					<button special="cancel" string="Cancel" icon="gtk-cancel"/>
-               			<button name="reconcile" string="Reconcile" type="object" icon="gtk-ok"/>
+               			<button name="reconcile" string="Reconcile" type="object" icon="terp-stock_effects-object-colorize"/>
  					</group>
 				</form>
              </field>
@@ -56,7 +56,7 @@
 	    			<field name="unreconciled"/>
      				<group colspan="4" col="6">
                        	<separator colspan="6"/>
-     					<button special="cancel" string="Ok" icon="gtk-ok" default_focus="1"/>
+     					<button special="cancel" string="Ok" icon="terp-dialog-close" default_focus="1"/>
  					</group>
 				</form>
              </field>
diff --git a/addons/account/wizard/account_central_journal_view.xml b/addons/account/wizard/account_central_journal_view.xml
index dfe704c7051..b833af4a9dd 100644
--- a/addons/account/wizard/account_central_journal_view.xml
+++ b/addons/account/wizard/account_central_journal_view.xml
@@ -15,7 +15,7 @@
 				<separator colspan="4"/>
 			    <group col="2" colspan="4">
 	            		<button special="cancel"  string="Cancel" icon='gtk-cancel'/>
-						<button name="check_data" string="Print" colspan="1" type="object" icon="gtk-ok"/>
+						<button name="check_data" string="Print" colspan="1" type="object" icon="gtk-print"/>
 				</group>
 			</form>
             </field>
diff --git a/addons/account/wizard/account_change_currency_view.xml b/addons/account/wizard/account_change_currency_view.xml
index 5dca78673c5..3eae57dfe61 100644
--- a/addons/account/wizard/account_change_currency_view.xml
+++ b/addons/account/wizard/account_change_currency_view.xml
@@ -13,7 +13,7 @@
 				    <separator colspan="4"/>
               		<group colspan="2" col="4">
             			<button special="cancel" string="Cancel"  icon="gtk-cancel"/>
-            			<button name="change_currency" string="Change Currency" type="object" icon="gtk-go-forward"/>
+            			<button name="change_currency" string="Change Currency" type="object" icon="terp-stock_effects-object-colorize"/>
                 	</group>
 			</form>
             </field>
diff --git a/addons/account/wizard/account_chart_view.xml b/addons/account/wizard/account_chart_view.xml
index 66da81d24f6..24a1effb689 100644
--- a/addons/account/wizard/account_chart_view.xml
+++ b/addons/account/wizard/account_chart_view.xml
@@ -17,7 +17,7 @@
                     <group colspan="4" col="6">
                        	<label string ="" colspan="2"/>
                     	<button icon="gtk-cancel" special="cancel" string="Cancel" />
-                    	<button icon="gtk-open" string="Open Charts"
+                    	<button icon="terp-gtk-go-back-rtl" string="Open Charts"
                     		name="account_chart_open_window" type="object" />
                     </group>
                 </form>
diff --git a/addons/account/wizard/account_invoice_state_view.xml b/addons/account/wizard/account_invoice_state_view.xml
index e0c22a0007f..8bdfb4ba8e2 100644
--- a/addons/account/wizard/account_invoice_state_view.xml
+++ b/addons/account/wizard/account_invoice_state_view.xml
@@ -10,7 +10,7 @@
                 <separator string="Confirm Draft Invoices" colspan="4"/>
                     <group colspan="4" col="6">
                         <button icon="gtk-cancel" special="cancel" string="Close"/>
-                        <button icon="gtk-execute" string="Confirm Invoices" name="invoice_confirm" type="object" default_focus="1"/>
+                        <button icon="terp-camera_test" string="Confirm Invoices" name="invoice_confirm" type="object" default_focus="1"/>
                    </group>
                </form>
             </field>
@@ -43,8 +43,8 @@
             <form string="Cancel Selected Invoices">
                 <separator string="Cancel Selected Invoices" colspan="4"/>
                     <group colspan="4" col="6">
-                        <button icon="gtk-cancel" special="cancel" string="Close"/>
-                        <button icon="gtk-execute" string="Cancel Invoices" name="invoice_cancel" type="object" default_focus="1"/>
+                        <button icon="terp-dialog-close" special="cancel" string="Close"/>
+                        <button icon="terp-gtk-stop" string="Cancel Invoices" name="invoice_cancel" type="object" default_focus="1"/>
                    </group>
                </form>
             </field>
diff --git a/addons/account/wizard/account_journal_select_view.xml b/addons/account/wizard/account_journal_select_view.xml
index 71a0d591768..d2cfc95a77f 100644
--- a/addons/account/wizard/account_journal_select_view.xml
+++ b/addons/account/wizard/account_journal_select_view.xml
@@ -11,8 +11,8 @@
                 		<label string="Are you sure you want to open Journal Entries!" colspan="4"/>
                        	<separator string="" colspan="4" />
                     <group colspan="4" col="6">
-                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button icon="gtk-open" string="Open Entries" name="action_open_window" type="object"/>
+                    	<button icon="terp-gtk-stop" special="cancel" string="Cancel"/>
+                    	<button icon="terp-gtk-go-back-rtl" string="Open Entries" name="action_open_window" type="object"/>
                    </group>
                </form>
             </field>
diff --git a/addons/account/wizard/account_move_bank_reconcile_view.xml b/addons/account/wizard/account_move_bank_reconcile_view.xml
index 89342803aaf..f17c2396255 100644
--- a/addons/account/wizard/account_move_bank_reconcile_view.xml
+++ b/addons/account/wizard/account_move_bank_reconcile_view.xml
@@ -13,8 +13,8 @@
                        	<separator string="" colspan="4" />
                     <group colspan="4" col="6">
                        	<label string ="" colspan="2"/>
-                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button icon="gtk-open" string="Open for bank reconciliation" name="action_open_window" type="object"/>
+                    	<button icon="terp-gtk-stop" special="cancel" string="Cancel"/>
+                    	<button icon="terp-gtk-go-back-rtl" string="Open for bank reconciliation" name="action_open_window" type="object"/>
                    </group>
                 </form>
             </field>
diff --git a/addons/account/wizard/account_move_journal_view.xml b/addons/account/wizard/account_move_journal_view.xml
index 7a25932bb98..c423a79e77c 100644
--- a/addons/account/wizard/account_move_journal_view.xml
+++ b/addons/account/wizard/account_move_journal_view.xml
@@ -16,8 +16,8 @@
                        	<separator string="" colspan="4" />
                     <group colspan="4" col="6">
                        	<label string ="" colspan="2"/>
-                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button icon="gtk-open" string="Open Journal" name="action_open_window" type="object"/>
+                    	<button icon="terp-gtk-stop" special="cancel" string="Cancel"/>
+                    	<button icon="terp-gtk-go-back-rtl" string="Open Journal" name="action_open_window" type="object"/>
                    	</group>
                </form>
             </field>
diff --git a/addons/account/wizard/account_move_line_reconcile_select_view.xml b/addons/account/wizard/account_move_line_reconcile_select_view.xml
index dbd25408fe1..08a44a33639 100644
--- a/addons/account/wizard/account_move_line_reconcile_select_view.xml
+++ b/addons/account/wizard/account_move_line_reconcile_select_view.xml
@@ -13,8 +13,8 @@
                        	<separator string="" colspan="4" />
                     <group colspan="4" col="6">
                        	<label string ="" colspan="2"/>
-                    	<button icon="gtk-cancel" special="cancel" string="Cancel" />
-						<button icon="gtk-open"
+                    	<button icon="terp-gtk-stop" special="cancel" string="Cancel" />
+						<button icon="terp-gtk-go-back-rtl"
 							string="Open for Reconciliation" name="action_open_window"
 							type="object" />
                    </group>
diff --git a/addons/account/wizard/account_move_line_select_view.xml b/addons/account/wizard/account_move_line_select_view.xml
index d0b6a2f709a..bf3831baea0 100644
--- a/addons/account/wizard/account_move_line_select_view.xml
+++ b/addons/account/wizard/account_move_line_select_view.xml
@@ -11,8 +11,8 @@
                 		<label string="Are you sure you want to open Account move line entries!" colspan="4"/>
                        	<separator string="" colspan="4" />
                     <group colspan="4" col="6">
-                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button icon="gtk-open" string="Open Entries" name="open_window" type="object" default_focus="1"/>
+                    	<button icon="terp-gtk-stop" special="cancel" string="Cancel"/>
+                    	<button icon="terp-gtk-go-back-rtl" string="Open Entries" name="open_window" type="object" default_focus="1"/>
                    </group>
                </form>
             </field>
diff --git a/addons/account/wizard/account_move_line_unreconcile_select_view.xml b/addons/account/wizard/account_move_line_unreconcile_select_view.xml
index 7d10c02f010..86681106845 100644
--- a/addons/account/wizard/account_move_line_unreconcile_select_view.xml
+++ b/addons/account/wizard/account_move_line_unreconcile_select_view.xml
@@ -13,8 +13,8 @@
                        	<separator string="" colspan="4" />
                     <group colspan="4" col="6">
                        	<label string ="" colspan="2"/>
-                    	<button icon="gtk-cancel" special="cancel" string="Cancel" />
-						<button icon="gtk-open"
+                    	<button icon="terp-gtk-stop" special="cancel" string="Cancel" />
+						<button icon="terp-gtk-go-back-rtl"
 							string="Open For Unreconciliation" name="action_open_window"
 							type="object" />
                    </group>
diff --git a/addons/account/wizard/account_open_closed_fiscalyear_view.xml b/addons/account/wizard/account_open_closed_fiscalyear_view.xml
index c5269939e0c..b8c914cd737 100644
--- a/addons/account/wizard/account_open_closed_fiscalyear_view.xml
+++ b/addons/account/wizard/account_open_closed_fiscalyear_view.xml
@@ -13,8 +13,8 @@
                        	<separator string="" colspan="4" />
                     <group colspan="4" col="6">
                        	<label string ="" colspan="2"/>
-                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button icon="gtk-open" string="Open" name="remove_entries" type="object"/>
+                    	<button icon="terp-gtk-stop" special="cancel" string="Cancel"/>
+                    	<button icon="terp-gtk-go-back-rtl" string="Open" name="remove_entries" type="object"/>
                     </group>
                 </form>
             </field>
diff --git a/addons/account/wizard/account_partner_balance_report_view.xml b/addons/account/wizard/account_partner_balance_report_view.xml
index 55fb71553d7..35a2556982d 100644
--- a/addons/account/wizard/account_partner_balance_report_view.xml
+++ b/addons/account/wizard/account_partner_balance_report_view.xml
@@ -31,7 +31,7 @@
      				<newline/>
      				<group colspan="4" col="6">
                        	<label string ="" colspan="2"/>
-     					<button special="cancel" string="Cancel" icon="gtk-cancel"/>
+     					<button special="cancel" string="Cancel" icon="terp-gtk-stop"/>
                			<button name="check_state" string="Print" type="object" icon="gtk-print"/>
  					</group>
  				</form>
diff --git a/addons/account/wizard/account_period_close_view.xml b/addons/account/wizard/account_period_close_view.xml
index 0866e64bdb6..82e7f8b3f3a 100644
--- a/addons/account/wizard/account_period_close_view.xml
+++ b/addons/account/wizard/account_period_close_view.xml
@@ -16,7 +16,7 @@
                     <group colspan="4" col="6">
                        	<label string ="" colspan="2"/>
                     	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button  icon="gtk-close" string="Close Period" name="data_save" type="object"/>
+                    	<button  icon="terp-gtk-go-back-rtl" string="Close Period" name="data_save" type="object"/>
                    </group>
                </form>
             </field>
diff --git a/addons/account/wizard/account_reconcile_view.xml b/addons/account/wizard/account_reconcile_view.xml
index 0f92376e045..1bed69d45fe 100644
--- a/addons/account/wizard/account_reconcile_view.xml
+++ b/addons/account/wizard/account_reconcile_view.xml
@@ -54,7 +54,7 @@
 				    <group colspan="4" col="6">
                        	<label string ="" colspan="2"/>
                     	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button icon="gtk-ok" string="Reconcile" name="trans_rec_reconcile_full" type="object" default_focus="1"/>
+                    	<button icon="terp-stock_effects-object-colorize" string="Reconcile" name="trans_rec_reconcile_full" type="object" default_focus="1"/>
                    </group>
                </form>
             </field>
@@ -99,7 +99,7 @@
 				    <group colspan="4" col="6">
                        	<label string ="" colspan="2"/>
                     	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button icon="gtk-ok" string="Reconcile" name="trans_rec_reconcile" type="object" default_focus="1"/>
+                    	<button icon="gtk-stock_effects-object-colorize" string="Reconcile" name="trans_rec_reconcile" type="object" default_focus="1"/>
                    </group>
                </form>
             </field>
diff --git a/addons/account/wizard/account_statement_from_invoice_view.xml b/addons/account/wizard/account_statement_from_invoice_view.xml
index 6f17279888c..05b77a1d570 100644
--- a/addons/account/wizard/account_statement_from_invoice_view.xml
+++ b/addons/account/wizard/account_statement_from_invoice_view.xml
@@ -15,7 +15,7 @@
                     <group colspan="4" col="6">
                        	<label string ="" colspan="2"/>
                     	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button icon="gtk-execute" string="Go" name="search_invoices" type="object"/>
+                    	<button icon="terp-gtk-go-back-rtl" string="Go" name="search_invoices" type="object"/>
                    </group>
                </form>
             </field>
diff --git a/addons/account/wizard/account_use_model_view.xml b/addons/account/wizard/account_use_model_view.xml
index fec632c2e59..ccd8b594296 100644
--- a/addons/account/wizard/account_use_model_view.xml
+++ b/addons/account/wizard/account_use_model_view.xml
@@ -52,7 +52,7 @@
                        	<label string = "Entry Lines Created." colspan="2"/>
                        	<newline/>
                     	<button icon="gtk-ok" special="cancel" string="Ok"/>
-                    	<button icon="gtk-execute" string="Open" name="open_moves" type="object" default_focus='1'/>
+                    	<button icon="terp-gtk-go-back-rtl" string="Open" name="open_moves" type="object" default_focus='1'/>
                    </group>
                </form>
             </field>
@@ -67,7 +67,7 @@
                 	<group colspan="4" col="6">
                        	<label string = "Are you sure you want to create entries?" colspan="2"/>
                        	<newline/>
-                    	<button icon="gtk-ok" special="cancel" string="Cancel"/>
+                    	<button icon="terp-gtk-stop" special="cancel" string="Cancel"/>
                     	<button icon="gtk-execute" string="Ok" name="create_entries" type="object" default_focus='1'/>
                    </group>
                </form>
diff --git a/addons/account/wizard/account_validate_move_view.xml b/addons/account/wizard/account_validate_move_view.xml
index 27ca48662bc..d0fd808dd3a 100644
--- a/addons/account/wizard/account_validate_move_view.xml
+++ b/addons/account/wizard/account_validate_move_view.xml
@@ -17,7 +17,7 @@
 				    <label string="All draft account entries in this journal and period will be validated. It means you won't be able to modify their accouting fields." colspan="4"/>
                     <group colspan="4" col="6">
                     	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button icon="gtk-open" string="Validate" name="validate_move" type="object"/>
+                    	<button icon="terp-camera_test" string="Validate" name="validate_move" type="object"/>
                    </group>
                </form>
             </field>
diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index 0601cd47c71..1eb4a2928a3 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -126,7 +126,7 @@
                         	domain="[]"
                         	context="{'group_by':'company_id'}" />
                         <separator orientation="vertical" />
-                        <filter string="Day" icon="terp-go-month"
+                        <filter string="Day" icon="terp-go-today"
                         	domain="[]" context="{'group_by':'day'}"/>
                         <filter string="Month" icon="terp-go-month"
                         	domain="[]" context="{'group_by':'month'}" />
diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index f1f5eb4a490..58136ea7a43 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -136,7 +136,7 @@
                             domain="[]"
                             context="{'group_by':'company_id'}" />
                         <separator orientation="vertical" />
-                        <filter string="Day" icon="terp-go-month"
+                        <filter string="Day" icon="terp-go-today"
                             domain="[]" context="{'group_by':'day'}"/>
                         <filter string="Month" icon="terp-go-month"
                             domain="[]" context="{'group_by':'month'}" />
diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml
index 7892039436c..0664295b83d 100644
--- a/addons/crm_claim/report/crm_claim_report_view.xml
+++ b/addons/crm_claim/report/crm_claim_report_view.xml
@@ -152,7 +152,7 @@
                              context="{'group_by':'type_id'}" />
 
                         <separator orientation="vertical" />
-                        <filter string="Day" icon="terp-go-month"
+                        <filter string="Day" icon="terp-go-today"
                             domain="[]" context="{'group_by':'day'}"/>
 
                         <filter string="Month" icon="terp-go-month"
diff --git a/addons/crm_fundraising/report/crm_fundraising_report_view.xml b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
index 6e27fc8390d..ecd442d238f 100644
--- a/addons/crm_fundraising/report/crm_fundraising_report_view.xml
+++ b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
@@ -142,7 +142,7 @@
                             domain="[]" context="{'group_by':'categ_id'}" />
 
                         <separator orientation="vertical" />
-                        <filter string="Day" icon="terp-go-month"
+                        <filter string="Day" icon="terp-go-today"
                             domain="[]" context="{'group_by':'day'}"/>
 
                         <filter string="Month" icon="terp-go-month"
diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index e3db974ebb5..cc7802f612b 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -57,7 +57,7 @@
                     <newline/>
                     <group expand="0" string="Group By...">
                         <filter name="employee" string="Employee" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/>
-                        <filter string="Day" icon="terp-go-month" domain="[]" context="{'group_by':'day'}"/>
+                        <filter string="Day" icon="terp-go-today" domain="[]" context="{'group_by':'day'}"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/hr_evaluation/report/hr_evaluation_report_view.xml b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
index 5406a7a3fbd..2a5cbe21ad9 100644
--- a/addons/hr_evaluation/report/hr_evaluation_report_view.xml
+++ b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
@@ -82,7 +82,7 @@
                     <filter string="Plan" icon="terp-stock_align_left_24" context="{'group_by':'plan_id'}"/>
                     <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Day" icon="terp-go-month" context="{'group_by':'day'}"/>
+                    <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
                     <filter string="Month" icon="terp-go-month" context="{'group_by':'create_date'}"/>
                     <filter string="Year" icon="terp-go-month" context="{'group_by':'year'}"/>
                 </group>
diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml
index bcc560573ab..b25ba45dd60 100644
--- a/addons/hr_expense/report/hr_expense_report_view.xml
+++ b/addons/hr_expense/report/hr_expense_report_view.xml
@@ -99,7 +99,7 @@
                     <separator orientation="vertical"/>
                     <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                     <separator orientation="vertical"/>
-                    <filter string="Day" icon="terp-go-month" context="{'group_by':'day'}"/>
+                    <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
                     <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
                     <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
                 </group>
diff --git a/addons/hr_holidays/report/available_holidays_view.xml b/addons/hr_holidays/report/available_holidays_view.xml
index 5fd9a9c0199..327cdab032b 100644
--- a/addons/hr_holidays/report/available_holidays_view.xml
+++ b/addons/hr_holidays/report/available_holidays_view.xml
@@ -88,7 +88,7 @@
 	                    <filter string="Type" icon="terp-stock_symbol-selection" context="{'group_by':'holiday_status_id'}"/>
 	                    <filter string="Department" icon="terp-personal+" context="{'group_by':'department_id'}"/>
 	                    <separator orientation="vertical"/>
-	                    <filter string="Day" icon="terp-go-month" context="{'group_by':'day'}"/>
+	                    <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
 	                    <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
 	                    <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
 	                </group>
diff --git a/addons/hr_holidays/report/hr_holidays_report_view.xml b/addons/hr_holidays/report/hr_holidays_report_view.xml
index 24ea6745270..7f42982eaad 100644
--- a/addons/hr_holidays/report/hr_holidays_report_view.xml
+++ b/addons/hr_holidays/report/hr_holidays_report_view.xml
@@ -90,7 +90,7 @@
                     <filter string="Department" icon="terp-personal+" context="{'group_by':'department_id'}"/>
                     <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Day" icon="terp-go-month" context="{'group_by':'day'}"/>
+                    <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
                     <filter string="Month" icon="terp-go-month" context="{'group_by':'date'}"/>
                     <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
                 </group>
diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
index 4fca4a8b239..93a63ca6e49 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml
+++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
@@ -95,7 +95,7 @@
                    <filter string="Department" name="department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
                    <filter string="Degree" name="degree" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'type_id'}"/>
             	   <separator orientation="vertical"/>
-            	   <filter string="Day" name = "day" icon="terp-go-month" domain="[]" context="{'group_by':'day'}"/>
+            	   <filter string="Day" name = "day" icon="terp-go-today" domain="[]" context="{'group_by':'day'}"/>
             	   <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'month'}"/>
             	   <filter string="Year" icon="terp-go-year" domain="[]" context="{'group_by':'year'}"/>
                 </group>
diff --git a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
index b3f81e5fbb1..882edfeee5a 100644
--- a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
+++ b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
@@ -76,7 +76,7 @@
                         <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
                         <filter string="Invoice" icon="terp-dolar" context="{'group_by':'invoice_id'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="Day" icon="terp-go-month" context="{'group_by':'day'}"/>
+                        <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
                         <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
                         <filter string="Year" icon="terp-go-year" context="{'group_by':'name'}"/>
                     </group>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 51edeea837b..cbaf4cd802f 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -105,12 +105,12 @@
                     <notebook colspan="4">
                         <page string="Daily View">
                             <group col="6" colspan="4">
-                                <button name="button_dummy" string="Go to:" type="object" icon="gtk-redo"/>
+                                <button name="button_dummy" string="Go to:" type="object" icon="terp-gtk-jump-to-ltr"/>
                                 <field name="date_current" nolabel="1"/>
                                 <label string=""/>
-                                <button icon="gtk-media-previous" name="date_previous" string="" type="object"/>
-                                <button name="date_today" string="Today" type="object" icon="gtk-home"/>
-                                <button icon="gtk-media-next" name="date_next" string="" type="object"/>
+                                <button icon="terp-gtk-go-back-ltr" name="date_previous" string="" type="object"/>
+                                <button name="date_today" string="Today" type="object" icon="terp-go-today"/>
+                                <button icon="terp-gtk-go-back-rtl" name="date_next" string="" type="object"/>
                             </group>
 
                             <field colspan="3" context="name=date_current,user_id=user_id" height="100" name="attendances_ids" nolabel="1" groups="hr_attendance.group_hr_attendance">
@@ -121,8 +121,8 @@
                                 </tree>
                             </field>
                             <group col="1" colspan="1" groups="hr_attendance.group_hr_attendance">
-                                <button name="sign_in" string="Sign In" type="object" icon="gtk-go-back"/>
-                                <button name="sign_out" string="Sign Out" type="object" icon="gtk-go-forward"/>
+                                <button name="sign_in" string="Sign In" type="object" icon="terp-gtk-jump-to-ltr"/>
+                                <button name="sign_out" string="Sign Out" type="object" icon="terp-gtk-jump-to-rtl"/>
                             </group>
 
                             <field name="state_attendance" groups="hr_attendance.group_hr_attendance"/>
@@ -176,10 +176,10 @@
                     </notebook>
                     <field name="state"/>
                     <group col="4" colspan="2">
-                        <button name="button_confirm" states="draft" string="Confirm" type="object" icon="gtk-execute"/>
-                        <button name="action_set_to_draft" states="done" string="Set to Draft" type="object" icon="gtk-convert"/>
-                        <button name="cancel" states="confirm" string="Refuse" type="workflow" icon="gtk-stop"/>
-                        <button name="done" states="confirm" string="Accept" type="workflow" icon="gtk-apply"/>
+                        <button name="button_confirm" states="draft" string="Confirm" type="object" icon="terp-gtk-jump-to-rtl"/>
+                        <button name="action_set_to_draft" states="done" string="Set to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
+                        <button name="cancel" states="confirm" string="Refuse" type="workflow" icon="terp-gtk-stop"/>
+                        <button name="done" states="confirm" string="Accept" type="workflow" icon="terp-camera_test"/>
                     </group>
                 </form>
             </field>
diff --git a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
index 51e6b5d295c..4a6e486dac3 100644
--- a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
+++ b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
@@ -91,7 +91,7 @@
 	                    <separator orientation="vertical"/>
 	                    <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
 	                    <separator orientation="vertical"/>
-	                    <filter string="Day" icon="terp-go-month" context="{'group_by':'day'}"/>
+	                    <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
 	                    <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
 	                    <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
                     </group>
diff --git a/addons/mrp/report/mrp_production_order_view.xml b/addons/mrp/report/mrp_production_order_view.xml
index 61aff34bf91..9c4d4924924 100644
--- a/addons/mrp/report/mrp_production_order_view.xml
+++ b/addons/mrp/report/mrp_production_order_view.xml
@@ -81,7 +81,7 @@
                     	<separator orientation="vertical"/>
                     	<filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}"/>
                     	<separator orientation="vertical"/>
-                        <filter string="Day" icon="terp-go-month" context="{'group_by':'day'}"/>
+                        <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
                     	<filter string="Month" name="terp-go-month" icon="terp-go-month" context="{'group_by':'month'}"/>
                     	<filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
                    </group>
diff --git a/addons/point_of_sale/report/report_pos_order_view.xml b/addons/point_of_sale/report/report_pos_order_view.xml
index ecd3d431a3a..3efe9548c70 100644
--- a/addons/point_of_sale/report/report_pos_order_view.xml
+++ b/addons/point_of_sale/report/report_pos_order_view.xml
@@ -38,7 +38,6 @@
 	                        domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
 	                        help="POS ordered created last 365 days"/>
 	                    <filter icon="terp-go-month" string="   30 Days   "
-	                        name="month"
 	                        domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
 	                        help="POS ordered created in last 30 days"/>
 	                    <filter icon="terp-go-week"
@@ -46,6 +45,12 @@
 	                         separator="1"
 	                         domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
 	                         help="POS ordered created last 7 days"/>
+	                    <filter icon="terp-go-today"
+                             string="    Today    "
+                             name="today"
+                             separator="1"
+                             domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d'))]"
+                             help="POS ordered created by today"/>
 	                    <separator orientation="vertical"/>
 	                    <filter icon="terp-document-new"
 	                        string="Draft"
@@ -59,7 +64,7 @@
                     <separator orientation="vertical"/>
                     <field name="partner_id"/>
                     <field name="user_id" widget="selection">
-                        <filter icon="terp-dolar"
+                        <filter icon="terp-personal"
                             string="My Sales"
                             help="My Sales"
                             domain="[('user_id','=',uid)]"/>
@@ -76,7 +81,7 @@
 	                    <filter string="Shop" icon="terp-go-home" context="{'group_by':'shop_id'}"/>
                         <filter string="Company" icon="terp-go-home" groups="base.group_multi_company" context="{'group_by':'company_id'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="Day" icon="terp-go-month" context="{'group_by':'day'}"/>
+                        <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
                         <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
                         <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
 	                </group>
@@ -90,7 +95,7 @@
 	        <field name="view_type">form</field>
 	        <field name="view_mode">tree,graph</field>
 	        <field name="search_view_id" ref="view_report_pos_order_search"/>
-	        <field name="context">{'search_default_month':1,'search_default_User':1}</field>
+	        <field name="context">{'search_default_today':1,'search_default_User':1}</field>
 	    </record>
 
 	    <menuitem action="action_report_pos_order_all" id="menu_report_pos_order_all" parent="menu_point_rep" sequence="1"/>
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index 9b685001664..92edbc78d77 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -117,7 +117,7 @@
                         <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}"  groups="base.group_multi_company"/>
                         <filter string="Stage" icon="terp-stage" context="{'group_by':'type'}" />
                         <separator orientation="vertical"/>
-                        <filter string="Day" icon="terp-go-month" context="{'group_by':'day'}"/>
+                        <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
                         <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
                         <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
                     </group>
diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml
index b4d0af02185..c422d987db5 100644
--- a/addons/project_issue/report/project_issue_report_view.xml
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@ -93,7 +93,7 @@
                         <filter string="Project"  name="project" icon="terp-folder-blue" context="{'group_by':'project_id'}" />
                         <filter string="Task"  icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'task_id'}"/>
                         <separator orientation="vertical" />
-                        <filter name="User" string="Responsible" icon="terp-personal" 
+                        <filter name="User" string="Responsible" icon="terp-personal"
                         domain="[]" context="{'group_by':'user_id'}" />
                         <filter string="Assigned to" name="Responsible" icon="terp-personal"
                         domain="[]" context="{'group_by':'assigned_to'}" />
@@ -118,7 +118,7 @@
                         	context="{'group_by':'company_id'}" />
 
                         <separator orientation="vertical" />
-                        <filter string="Day" icon="terp-sale"
+                        <filter string="Day" icon="terp-go-today"
                         	domain="[]" context="{'group_by':'day'}"/>
 
                         <filter string="Month" icon="terp-go-month"
diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml
index 2d18ae18b36..6b27a0ec6df 100644
--- a/addons/purchase/report/purchase_report_view.xml
+++ b/addons/purchase/report/purchase_report_view.xml
@@ -52,24 +52,24 @@
         <field name="arch" type="xml">
             <search string="Purchase Orders">
             <group colspan="10" col="12">
-                <filter icon="terp-purchase" string="This Year"
+                <filter icon="terp-go-year" string="This Year"
                                 domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
                                 help="Tasks performed in this year"/>
-                <filter icon="terp-purchase" string="This Month"
+                <filter icon="terp-go-month" string="This Month"
                         name="month"
                         domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
                         help="Tasks performed in this month"/>
-                <filter icon="gtk-media-rewind"
+                <filter icon="terp-go-week"
                         string="7 Days"
                         separator="1"
                         domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
                         help="Tasks during last 7 days"/>
                 <separator orientation="vertical"/>
-                <filter icon="terp-purchase"
+                <filter icon="terp-document-new"
                         string="Quotations"
                         name="quotes"
                         domain="[('state','=','draft')]"/>
-                <filter icon="terp-purchase"
+                <filter icon="terp-accessories-archiver"
                         string="Orders"
                         name="orders"
                         domain="[('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]"/>
@@ -80,21 +80,21 @@
                 <field name="company_id" groups="base.group_multi_company"/>
                 </group>
                 <newline/>
-                <group expand="1" string="Group By..." colspan="10" col="12">
-                    <filter string="Supplier" name="group_partner_id" icon="terp-purchase" context="{'group_by':'partner_id'}"/>
-                    <filter string="Product" name="group_product_id" icon="terp-purchase" context="{'group_by':'product_id'}"/>
+                <group expand="0" string="Group By..." colspan="10" col="12">
+                    <filter string="Supplier" name="group_partner_id" icon="terp-personal" context="{'group_by':'partner_id'}"/>
+                    <filter string="Product" name="group_product_id" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Responsible" name="Responsible" icon="terp-purchase" context="{'group_by':'user_id'}"/>
-                    <filter string="Validated by" icon="terp-purchase" context="{'group_by':'validator'}"/>
+                    <filter string="Responsible" name="Responsible" icon="terp-personal" context="{'group_by':'user_id'}"/>
+                    <filter string="Validated by" icon="terp-personal" context="{'group_by':'validator'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Company" icon="terp-purchase" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                    <filter string="Warehouse" icon="terp-purchase" context="{'group_by':'warehouse_id'}"/>
-                    <filter string="Destination" icon="terp-purchase" context="{'group_by':'location_id'}"/>
+                    <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                    <filter string="Warehouse" icon="terp-go-home" context="{'group_by':'warehouse_id'}"/>
+                    <filter string="Destination" icon="terp-gtk-jump-to-ltr" context="{'group_by':'location_id'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="State" icon="terp-purchase" context="{'group_by':'state'}"/>
-                    <filter string="Day" icon="terp-purchase" context="{'group_by':'day'}"/>
-                    <filter string="Month" icon="terp-purchase" context="{'group_by':'month'}"/>
-                    <filter string="Year" icon="terp-purchase" context="{'group_by':'name'}"/>
+                    <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+                    <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
+                    <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
+                    <filter string="Year" icon="terp-go-year" context="{'group_by':'name'}"/>
                 </group>
                 <newline/>
                 <group expand="0" string="Extended filters..." colspan="10" col="12" groups="base.group_extended">
diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index 4e6d75694fe..41ebc1de088 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -78,7 +78,7 @@
 	                <field name="partner_id"/>
                     <field name="product_id"/>
 	                <field name="user_id" widget="selection">
-	                    <filter icon="terp-dolar"
+	                    <filter icon="terp-personal"
                             string="My Sales"
                             help="My Sales"
                             domain="[('user_id','=',uid)]"/>
@@ -99,7 +99,7 @@
                     <filter string="Shop" icon="terp-go-home" context="{'group_by':'shop_id'}"/>
                     <filter string="Company" icon="terp-go-home" groups="base.group_multi_company" context="{'group_by':'company_id'}"/>
                     <separator orientation="vertical"/>
-                   <filter string="Day" icon="terp-go-month" context="{'group_by':'day'}"/>
+                   <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
                    <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
                     <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
                 </group>
diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index e8ec9ed2983..0f41c0e4b3b 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -98,7 +98,7 @@
                     <separator orientation="vertical"/>
                     <filter string="Company" name="group_state" icon="terp-stock_effects-object-colorize" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                     <separator orientation="vertical"/>
-                    <filter string="Day" icon="terp-go-month" context="{'group_by':'day'}"/>
+                    <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
                     <filter string="Month" icon="terp-go-month" context="{'group_by':'date_planned'}"/>
                     <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
                 </group>
diff --git a/addons/stock/report/report_stock_picking_view.xml b/addons/stock/report/report_stock_picking_view.xml
index a14298ff771..83405f2c1bf 100644
--- a/addons/stock/report/report_stock_picking_view.xml
+++ b/addons/stock/report/report_stock_picking_view.xml
@@ -83,7 +83,7 @@
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="Invoice Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'invoice_state'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="Day" icon="terp-go-month" domain="[]" context="{'group_by':'day'}"/>
+                        <filter string="Day" icon="terp-go-today" domain="[]" context="{'group_by':'day'}"/>
                         <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'month'}"/>
                         <filter string="Year" icon="terp-go-year" domain="[]" context="{'group_by':'year'}"/>
                     </group>

From 2bfffa9e1a005db7353d3bb1c2a679a4c1cc542e Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.com>
Date: Wed, 16 Jun 2010 17:13:59 +0530
Subject: [PATCH 28/39] [IMP] mrp, purchase, stock, hr, project: Re-organized
 menus.

bzr revid: uco@tinyerp.com-20100616114359-5l1fa5ht1k59wvlr
---
 .../account_analytic_analysis_menu.xml        |  6 ++--
 addons/base_contact/base_contact_view.xml     | 12 +++++++
 addons/hr/hr_view.xml                         | 10 ++++--
 addons/hr_attendance/hr_attendance_view.xml   |  4 +--
 .../wizard/hr_attendance_sign_in_out_view.xml |  2 +-
 addons/hr_contract/hr_contract_view.xml       |  2 +-
 addons/hr_evaluation/hr_evaluation_view.xml   |  2 +-
 addons/hr_expense/hr_expense_view.xml         |  2 +-
 .../report/hr_expense_report_view.xml         |  2 +-
 addons/hr_holidays/hr_holidays_view.xml       |  4 +--
 addons/hr_recruitment/hr_recruitment_view.xml | 14 ++++----
 .../report/hr_recruitment_report_view.xml     |  2 +-
 .../hr_timesheet_print_employee_view.xml      |  4 +--
 .../wizard/hr_timesheet_print_users_view.xml  |  2 +-
 .../wizard/hr_timesheet_sign_in_out_view.xml  |  2 +-
 .../hr_timesheet_invoice_report.xml           | 10 +++---
 .../hr_timesheet_invoice_report_view.xml      |  2 +-
 .../hr_timesheet_analytic_profit_view.xml     |  2 +-
 .../hr_timesheet_sheet_view.xml               |  4 +--
 .../report/timesheet_report_view.xml          |  3 +-
 addons/mrp/mrp_view.xml                       | 19 +++++-----
 addons/mrp_operations/mrp_operations_view.xml |  2 +-
 addons/project/project_view.xml               |  7 ++--
 addons/project_gtd/project_gtd_view.xml       |  7 ++--
 addons/project_issue/project_issue_menu.xml   |  3 +-
 addons/project_issue/project_issue_view.xml   |  2 +-
 .../project_long_term_view.xml                | 12 +++----
 .../project_planning_view.xml                 |  8 ++---
 addons/purchase/purchase_view.xml             | 35 +++++++++++++++----
 addons/sale_journal/sale_journal_view.xml     |  2 +-
 addons/scrum/scrum_view.xml                   |  8 ++---
 addons/stock/stock_view.xml                   | 25 ++++++-------
 addons/stock_planning/stock_planning_view.xml |  2 +-
 33 files changed, 134 insertions(+), 89 deletions(-)

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
index b83ce33596d..821f7180e2e 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
@@ -1,8 +1,8 @@
 <openerp>
     <data>
         <menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management" sequence="1"/>
-        <menuitem id="next_id_71" name="Financial Project Management" parent="base.menu_main_pm" groups="account.group_account_invoice" sequence="20"/>
-        <menuitem id="menu_invoicing" name="Billing" parent="next_id_71" sequence="20"/>
+<!--        <menuitem id="next_id_71" name="Financial Project Management" parent="base.menu_main_pm" groups="account.group_account_invoice" sequence="20"/>-->
+        <menuitem id="menu_invoicing" name="Billing" parent="base.menu_main_pm" sequence="4"/>
 
         <record id="action_hr_tree_invoiced_all" model="ir.actions.act_window">
             <field name="name">All Uninvoiced Entries</field>
@@ -23,7 +23,7 @@
             <field name="search_view_id" ref="account.view_account_analytic_account_search"/>
             <field name="domain">[]</field>
         </record>
-        <menuitem name="Analytic Accounts" action="action_account_analytic_all" id="menu_action_account_analytic_all" parent="next_id_71"/>
+<!--        <menuitem name="Analytic Accounts" action="action_account_analytic_all" id="menu_action_account_analytic_all" parent="next_id_71"/>-->
 
         <record id="action_account_analytic_managed_overpassed" model="ir.actions.act_window">
             <field name="name">Overpassed Accounts</field>
diff --git a/addons/base_contact/base_contact_view.xml b/addons/base_contact/base_contact_view.xml
index 04429a94186..2145123599c 100644
--- a/addons/base_contact/base_contact_view.xml
+++ b/addons/base_contact/base_contact_view.xml
@@ -122,6 +122,18 @@
         <field name="search_view_id" ref="view_partner_contact_search"/>
     </record>
     <menuitem name="Contacts" id="menu_partner_contact_form" action="action_partner_contact_form" parent = "base.menu_address_book" sequence="2"/>
+    
+    <!--    
+    Contacts for Suppliers
+    -->
+    <menuitem icon="terp-purchase" id="base.menu_purchase_root" name="Purchases"
+             sequence="7"/>
+    <menuitem id="base.menu_procurement_management_supplier" name="Address Book"
+            parent="base.menu_purchase_root" sequence="3"/>
+    <menuitem id="base.menu_procurement_management_supplier_name" name="Suppliers"
+            parent="base.menu_procurement_management_supplier" action="base.action_partner_supplier_form" sequence="1"/>
+    <menuitem name="Contacts" id="menu_partner_contact_form" action="action_partner_contact_form" 
+            parent = "base.menu_procurement_management_supplier" sequence="2"/>
 
     <!-- Views for Partners Form View -->
 
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index f6a03030a6f..4adb8c3488b 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -9,7 +9,7 @@
         <menuitem
             id="menu_hr_main"
             parent="menu_hr_root"
-            name="Human Resources"
+            name="Human Resources Management"
             sequence="0"/>
         <menuitem
             id="menu_hr_configuration"
@@ -18,8 +18,14 @@
             groups="group_hr_manager"
             sequence="50" />
         <menuitem
-            id="menu_view_employee_category_configuration_form"
+            id="menu_hr_management"
+            name="Human Resources Management"
             parent="hr.menu_hr_configuration"
+            groups="group_hr_manager"
+            sequence="1" />
+        <menuitem
+            id="menu_view_employee_category_configuration_form"
+            parent="hr.menu_hr_management"
             name="Employees"
             sequence="1"/>
 
diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index e3db974ebb5..091723d7604 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -77,9 +77,9 @@
         <menuitem
            id="menu_hr_time_tracking"
            name="Time Tracking"
-           parent="hr.menu_hr_root" sequence="7"/>
+           parent="hr.menu_hr_root" sequence="3"/>
         <menuitem action="open_view_attendance" id="menu_open_view_attendance"
-            parent="menu_hr_time_tracking" groups="hr.group_hr_manager"/>
+            parent="menu_hr_time_tracking" groups="hr.group_hr_manager" sequence="3"/>
 
         <record id="edit_attendance_reason" model="ir.ui.view">
             <field name="name">hr.action.reason.form</field>
diff --git a/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml b/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
index 443983dffe7..a7a39312aff 100644
--- a/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
+++ b/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
@@ -46,7 +46,7 @@
 
         <menuitem action="action_hr_attendance_sigh_in_out"
             id="menu_hr_attendance_sigh_in_out"
-            parent="menu_hr_time_tracking"/>
+            parent="menu_hr_time_tracking" sequence="4"/>
 
        <record id="view_hr_attendance_so_ask" model="ir.ui.view">
             <field name="name">hr.sign.in.out.ask.form</field>
diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index 0b92bcc986a..e1135a9f058 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -48,7 +48,7 @@
             <field name="domain">[]</field>
         </record>
 
-        <menuitem id="next_id_56" name="Contract" parent="hr.menu_hr_configuration" sequence="5"/>
+        <menuitem id="next_id_56" name="Contract" parent="hr.menu_hr_management" sequence="5"/>
 
         <menuitem action="action_hr_contract_wage_type" id="hr_menu_contract_wage_type" parent="next_id_56"/>
 
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index cbb4c796c90..5784bb4d868 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -64,7 +64,7 @@
         <menuitem name="Evaluations" parent="hr.menu_hr_root" id="menu_eval_hr" sequence="6"/>
 
        <menuitem
-            name="Periodic Evaluations" parent="hr.menu_hr_configuration" id="menu_eval_hr_config" sequence="3"/>
+            name="Periodic Evaluations" parent="hr.menu_hr_configuration" id="menu_eval_hr_config" sequence="4"/>
         <menuitem
             parent="menu_eval_hr_config"
             id="menu_open_view_hr_evaluation_plan_tree"
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index cafe42fcffa..9c5ebf49953 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -171,7 +171,7 @@
             <field name="search_view_id" ref="view_hr_expense_filter"/>
         </record>
 
-        <menuitem id="next_id_49" name="Expenses" sequence="8"
+        <menuitem id="next_id_49" name="Expenses" sequence="4"
            parent="hr.menu_hr_root"/>
 
         <menuitem action="expense_all" id="menu_expense_all" name="Expenses"
diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml
index bcc560573ab..1322b5a241d 100644
--- a/addons/hr_expense/report/hr_expense_report_view.xml
+++ b/addons/hr_expense/report/hr_expense_report_view.xml
@@ -134,7 +134,7 @@
     </record>
 
     <menuitem id="hr.menu_hr_reporting" name="Reporting" parent="hr.menu_hr_root" sequence="10"/>
-    <menuitem action="action_hr_expense_report_all" id="menu_hr_expense_report_all" parent="hr.menu_hr_reporting" sequence="1"/>
+    <menuitem action="action_hr_expense_report_all" id="menu_hr_expense_report_all" parent="hr.menu_hr_reporting" sequence="2"/>
 
 </data>
 </openerp>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 1a310a55100..98c8d558f3a 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -245,7 +245,7 @@
             name="Holidays Management"
             parent="hr.menu_hr_root"
             id="menu_open_ask_holidays"
-            sequence="9"/>
+            sequence="5"/>
 
         <record model="ir.actions.act_window" id="open_ask_holidays">
             <field name="name">Leave Requests</field>
@@ -362,7 +362,7 @@
             <field name="view_mode">tree,form</field>
         </record>
 
-        <menuitem sequence="9" id="hr.menu_open_view_attendance_reason_config" parent="hr.menu_hr_configuration" name="Leaves"/>
+        <menuitem sequence="3" id="hr.menu_open_view_attendance_reason_config" parent="hr.menu_hr_configuration" name="Leaves"/>
         <menuitem name="Leave Status"
             action="open_view_holiday_status"
             id="menu_open_view_holiday_status"
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index ef5fcd3387f..09f8cee6314 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -2,12 +2,6 @@
 <openerp>
     <data>
 
-       <menuitem
-        id="menu_hr_config_applicant"
-        name="Applicant"
-        parent="hr.menu_hr_configuration"
-        />
-
     # ------------------------------------------------------
     # Job Categories
     # ------------------------------------------------------
@@ -323,8 +317,12 @@
         id="menu_hr_recruitment_recruitment"
         name="Recruitment"
         parent="hr.menu_hr_configuration"
-        />
-
+        sequence="2"/>
+    <menuitem
+        id="menu_hr_config_applicant"
+        name="Applicant"
+        parent="menu_hr_recruitment_recruitment"
+        sequence="2"/>
     <menuitem
         id="menu_hr_recruitment_stage"
         name="Stages"
diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
index 4fca4a8b239..fb000d68aa3 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml
+++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
@@ -129,7 +129,7 @@
         <field name="search_view_id" ref="view_hr_recruitment_report_search"/>
     </record>
 	<menuitem id="hr.menu_hr_reporting" name="Reporting" parent="hr.menu_hr_root" sequence="10"/>
-    <menuitem action="action_hr_recruitment_report_all" id="menu_hr_recruitment_report_all" parent="hr.menu_hr_reporting" sequence="2"/>
+    <menuitem action="action_hr_recruitment_report_all" id="menu_hr_recruitment_report_all" parent="hr.menu_hr_reporting" sequence="1"/>
 
 </data>
 </openerp>
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
index 9b37db8b0c6..a3723d2adba 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
@@ -34,7 +34,7 @@
         <menuitem action="action_hr_timesheet_employee"
         	id="menu_hr_timesheet_employee"
         	parent="menu_hr_reporting_timesheet"
-        	groups="base.group_extended"/>
+        	groups="base.group_extended" sequence="2" icon="STOCK_PRINT"/>
 
 
       <!-- Print My Timesheet -->
@@ -68,7 +68,7 @@
         <menuitem action="action_hr_timesheet_my"
         	id="menu_hr_timesheet_my"
         	parent="menu_hr_reporting_timesheet"
-        	groups="hr.group_hr_user" />
+        	groups="hr.group_hr_user" sequence="4" icon="STOCK_PRINT"/>
 
     </data>
 </openerp>
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
index de834621c23..2d2af2a4769 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
@@ -34,7 +34,7 @@
         <menuitem action="action_hr_timesheet_users"
         	id="menu_hr_timesheet_users"
         	parent="menu_hr_reporting_timesheet"
-        	groups="hr.group_hr_manager" />
+        	groups="hr.group_hr_manager" sequence="3" icon="STOCK_PRINT"/>
 
 
      </data>
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml
index 6f6ce56b091..099eb0d4642 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml
@@ -54,7 +54,7 @@
         	id="menu_hr_timesheet_sign_in"
         	groups="base.group_extended"
         	parent="hr_attendance.menu_hr_time_tracking"
-        	/>
+        	sequence="5" />
 
     	<record id="view_hr_timesheet_sign_out" model="ir.ui.view">
             <field name="name">hr.sign.out.project.form</field>
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_report.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_report.xml
index a801e21082b..b1a6cc0dc51 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_report.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_report.xml
@@ -6,11 +6,11 @@
             name="Reporting"
             parent="hr.menu_hr_root"
             sequence="10" />
-        <menuitem
-            id="menu_hr_reporting_timesheet_invoice"
-            name="Timesheet Invoice"
-            parent="hr.menu_hr_reporting"
-            sequence="5" />
+<!--        <menuitem-->
+<!--            id="menu_hr_reporting_timesheet_invoice"-->
+<!--            name="Timesheet Invoice"-->
+<!--            parent="hr.menu_hr_reporting"-->
+<!--            sequence="5" />-->
         <report auto="False" id="account_analytic_account_cost_ledger" menu="False" model="account.analytic.account" name="hr.timesheet.invoice.account.analytic.account.cost_ledger" rml="account/project/report/cost_ledger.rml" string="Cost Ledger"/>
 
         <!--<wizard id="account_analytic_account_cost_ledger_report" keyword="client_print_multi" model="account.analytic.account" name="hr.timesheet.invoice.account.analytic.account.cost_ledger.report" string="Cost Ledger"/>-->
diff --git a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
index b3f81e5fbb1..516d624d050 100644
--- a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
+++ b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
@@ -512,6 +512,6 @@
                 id="menu_hr_action_random_timesheet_lines_board"
                 name="Working Hours"
                 parent="hr_attendance.menu_hr_time_tracking"
-                groups="hr.group_hr_manager"/>
+                groups="hr.group_hr_manager" sequence="2"/>
     </data>
 </openerp>
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml
index b68112a5a38..16cf8cf8e8a 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml
@@ -34,7 +34,7 @@
 
        	<menuitem action="action_hr_timesheet_analytic_profit"
         	id="menu_hr_timesheet_analytic_profit"
-        	parent="menu_hr_reporting_timesheet_invoice" groups="base.group_extended"/>
+        	parent="hr_timesheet.menu_hr_reporting_timesheet" groups="base.group_extended" icon="STOCK_PRINT"/>
 
 	</data>
 </openerp>
\ No newline at end of file
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 51edeea837b..be60d24dc4a 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -227,12 +227,12 @@
           <menuitem
              id="base.menu_project_management_time_tracking"
              name="Time Tracking"
-             parent="base.menu_main_pm" sequence="3"/>
+             parent="base.menu_main_pm" sequence="5"/>
          <menuitem action="hr_timesheet_sheet.act_hr_timesheet_sheet_form" id="menu_act_project_management_timesheet_sheet_form" parent="base.menu_project_management_time_tracking"
              groups="hr.group_hr_manager" sequence="5"/>
         <!--<menuitem id="next_id_60" name="Timesheets" parent="hr.menu_hr_root"/>-->
         <menuitem action="act_hr_timesheet_sheet_form" id="menu_act_hr_timesheet_sheet_form" parent="hr_attendance.menu_hr_time_tracking"
-            groups="hr.group_hr_manager"/>
+            groups="hr.group_hr_manager" sequence="1"/>
 
         <!--
             Company inheritancy
diff --git a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
index 51e6b5d295c..7336a3a2049 100644
--- a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
+++ b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
@@ -121,6 +121,7 @@
             <field name="context">{'search_default_month':1,'search_default_User_id':1,'group_by_no_leaf':1,'group_by':[]}</field>
             <field name="search_view_id" ref="view_timesheet_report_search"/>
         </record>
-        <menuitem action="action_timesheet_report_stat_all" id="menu_timesheet_report_all" parent="hr.menu_hr_reporting"/>
+        <menuitem action="action_timesheet_report_stat_all" id="menu_timesheet_report_all" 
+                parent="hr_timesheet.menu_hr_reporting_timesheet" sequence="1"/>
     </data>
 </openerp>
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index b3004fffb2f..ef0b9a1adc7 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -4,7 +4,7 @@
 
         <menuitem icon="terp-mrp" id="base.menu_mrp_root" name="Manufacturing"
             groups="group_mrp_user,group_mrp_manager" sequence="3"/>
-        <menuitem id="menu_mrp_reordering" name="Automatic Procurements" parent="stock.menu_stock_root" sequence="4"/>
+        <menuitem id="menu_mrp_reordering" name="Automatic Procurements" parent="stock.menu_stock_root" sequence="5"/>
         <menuitem id="menu_mrp_manufacturing" name="Manufacturing" parent="base.menu_mrp_root" sequence="1"/>
 
 <!--        <menuitem name="Control" id="menu_mrp_control" parent="base.menu_mrp_root"  sequence="3" />-->
@@ -78,7 +78,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem name="Properties"
+        <menuitem name="Master Bill of Materials"
             id="menu_mrp_property"
             parent="menu_mrp_configuration"
             groups="base.group_extended"
@@ -230,8 +230,8 @@
         </record>
  <!--       <menuitem name="Routings" id="menu_mrp_routing_and_workcenters" parent="mrp.menu_mrp_bom" groups="base.group_extended"
                   sequence="100" />-->
-        <menuitem action="mrp_workcenter_action" id="menu_mrp_workcenter_action" parent="mrp.menu_mrp_bom" groups="base.group_extended" sequence="40" />
-        <menuitem action="mrp_routing_action" id="menu_mrp_routing_action" parent="mrp.menu_mrp_bom" groups="base.group_extended" sequence="30"/>
+        <menuitem action="mrp_workcenter_action" id="menu_mrp_workcenter_action" parent="mrp.menu_mrp_property" groups="base.group_extended" sequence="40" />
+        <menuitem action="mrp_routing_action" id="menu_mrp_routing_action" parent="mrp.menu_mrp_property" groups="base.group_extended" sequence="30"/>
 
         <!--
           Bill of Materials
@@ -415,11 +415,11 @@
         -->
 
         <menuitem action="procurement.procurement_action" id="menu_mrp_procurement_action"
-                  parent="mrp.menu_mrp_manufacturing" sequence="2" />
+                  parent="mrp.menu_mrp_manufacturing" sequence="3" />
 <!--        <menuitem action="procurement.procurement_action5" id="menu_mrp_procurement_exception_action"-->
 <!--                  parent="mrp.menu_mrp_control" sequence="1" />-->
 
-         <menuitem id="menu_mrp_scheduler" name="Schedulers" parent="base.menu_mrp_root" sequence="4"/>
+         <menuitem id="menu_mrp_scheduler" name="Schedulers" parent="base.menu_mrp_root" sequence="3"/>
         <menuitem action="procurement.action_compute_schedulers" id="mrp_Sched_all" parent="mrp.menu_mrp_scheduler" sequence="90"/>
 
         <!--
@@ -851,10 +851,11 @@
 
         <menuitem id="menu_pm_resources_mrp" name="Resources" parent="base.menu_mrp_root"
             groups="base.group_extended"
-            sequence="2"/>
+            sequence="4"/>
+        <menuitem id="menu_pm_resources_config" name="Resources" parent="menu_mrp_configuration"/>
         <menuitem action="resource.action_resource_resource_tree" id="menu_view_resource_search_mrp" parent="menu_pm_resources_mrp" sequence="1"/>
-        <menuitem action="resource.action_resource_calendar_form" id="menu_view_resource_calendar_search_mrp" parent="menu_mrp_configuration" sequence="1"/>
-        <menuitem action="resource.action_resource_calendar_leave_tree" id="menu_view_resource_calendar_leaves_search_mrp" parent="menu_pm_resources_mrp" sequence="1"/>
+        <menuitem action="resource.action_resource_calendar_form" id="menu_view_resource_calendar_search_mrp" parent="menu_pm_resources_config" sequence="1"/>
+        <menuitem action="resource.action_resource_calendar_leave_tree" id="menu_view_resource_calendar_leaves_search_mrp" parent="menu_pm_resources_config" sequence="1"/>
 
     </data>
 </openerp>
diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index a5c6564644e..bd3574d2608 100644
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -206,7 +206,7 @@
     <menuitem name="Work Orders" parent="mrp.menu_mrp_manufacturing"
         id="menu_mrp_production_wc_order"
         action="mrp_production_wc_action_form"
-        groups="base.group_extended"/>
+        groups="base.group_extended" sequence="2"/>
     <menuitem name="Work Orders" parent="menu_mrp_planning"
         id="menu_mrp_production_wc_action_planning"
         action="mrp_production_wc_action_planning"
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 004ed9ba429..04ee0b42df0 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -507,13 +507,14 @@
         </record>
 
         <record id="open_task_type_form" model="ir.actions.act_window">
-            <field name="name">Task Types</field>
+            <field name="name">Types</field>
             <field name="res_model">project.task.type</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="task_type_tree"/>
         </record>
-        <menuitem action="open_task_type_form" id="menu_task_types" parent="project.menu_definitions"/>
-
+        <menuitem id="menu_tasks_config" name="Tasks" parent="project.menu_definitions" sequence="1"/>
+        <menuitem action="open_task_type_form" id="menu_task_types_view" parent="menu_tasks_config" sequence="1"/>
+        
         <act_window domain="[('user_id', '=', active_id)]" id="act_res_users_2_project_project" name="User's projects" res_model="project.project" src_model="res.users" view_mode="tree,form" view_type="form"/>
 
         <act_window
diff --git a/addons/project_gtd/project_gtd_view.xml b/addons/project_gtd/project_gtd_view.xml
index 64f6bcdfbd1..f5639ea5629 100644
--- a/addons/project_gtd/project_gtd_view.xml
+++ b/addons/project_gtd/project_gtd_view.xml
@@ -30,8 +30,9 @@
         <field name="res_model">project.gtd.context</field>
     </record>
 
-    <menuitem name="Time Management" id="menu_open_gtd_time" parent="project.menu_definitions" groups="group_project_getting"/>
-    <menuitem name="Contexts" id="menu_open_gtd_time_contexts" groups="group_project_getting" parent="menu_open_gtd_time" action="open_gtd_context_tree"/>
+<!--    <menuitem name="Time Management" id="menu_open_gtd_time" parent="project.menu_definitions" groups="group_project_getting"/>-->
+    <menuitem name="Contexts" id="menu_open_gtd_time_contexts" groups="group_project_getting" 
+                parent="project.menu_tasks_config" action="open_gtd_context_tree"/>
 
     <record model="ir.ui.view" id="view_gtd_timebox_tree">
         <field name="name">project.gtd.timebox.tree</field>
@@ -68,7 +69,7 @@
         <field name="view_id" ref="view_gtd_timebox_tree"/>
     </record>
 
-    <menuitem name="Timeboxes" id="menu_open_gtd_time_timeboxes" parent="menu_open_gtd_time" action="open_gtd_timebox_tree"/>
+    <menuitem name="Timeboxes" id="menu_open_gtd_time_timeboxes" parent="project.menu_tasks_config" action="open_gtd_timebox_tree"/>
     <record model="ir.ui.view" id="project_task_tree">
         <field name="name">project.task.tree.timebox</field>
         <field name="model">project.task</field>
diff --git a/addons/project_issue/project_issue_menu.xml b/addons/project_issue/project_issue_menu.xml
index c9bb771a2ac..ea902ea599f 100644
--- a/addons/project_issue/project_issue_menu.xml
+++ b/addons/project_issue/project_issue_menu.xml
@@ -46,6 +46,7 @@
             view_type="form"/>
 
     <!--<menuitem id="menu_aftertask" name="Bug" parent="project.menu_main" visible="False"/>-->
-    <menuitem name="Issues" id="menu_project_issue_track"  parent="project.menu_project_management" action="project_issue_categ_act0"/>
+    <menuitem name="Issues" id="menu_project_issue_track"  parent="project.menu_project_management" 
+            action="project_issue_categ_act0" sequence="3"/>
 </data>
 </openerp>
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 673f4239971..973e0a1a20c 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-       <menuitem  id="menu_project_confi" name="Project Issue" parent="project.menu_definitions" sequence="1"/>
+       <menuitem  id="menu_project_confi" name="Project Issue" parent="project.menu_definitions" sequence="2"/>
 
         <record id="project_issue_categ_action" model="ir.actions.act_window">
             <field name="name">Issue Categories</field>
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index cafaefa9633..a63449abf85 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-    <menuitem id="menu_project_long_term" name="Long Term Planning" parent="base.menu_main_pm" sequence="1"/>
+    <menuitem id="base.menu_project_long_term" name="Long Term Planning" parent="base.menu_main_pm" sequence="1"/>
 
     # ------------------------------------------------------
     # Project Resource Allocation
@@ -292,18 +292,18 @@
 
         <menuitem action="act_project_phase"
             groups="base.group_extended"
-            id="menu_project_phase" parent="menu_project_long_term" sequence="4"/>
+            id="menu_project_phase" parent="base.menu_project_long_term" sequence="1"/>
 
         <menuitem id="menu_resouce_allocation" action="act_resouce_allocation"
-            name="Resource Allocations" parent="menu_project_long_term" />
+            name="Resource Allocations" parent="base.menu_project_long_term" sequence="2"/>
 
         <!--<menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management" sequence="1"/>-->
         <menuitem id="menu_pm_resources_project1"
             groups="base.group_extended"
-            name="Resources" parent="base.menu_main_pm" sequence="2"/>
+            name="Resources" parent="project.menu_definitions" sequence="3"/>
 
-        <menuitem id="menu_phase_schedule" name="Scheduling" parent="menu_project_long_term"/>
-        <menuitem action="resource.action_resource_resource_tree" id="menu_view_resource" parent="menu_pm_resources_project1" sequence="1"/>
+        <menuitem id="menu_phase_schedule" name="Scheduling" parent="base.menu_project_long_term" sequence="4"/>
+        <menuitem action="resource.action_resource_resource_tree" id="menu_view_resource" parent="project.menu_project_management" sequence="4"/>
         <menuitem action="resource.action_resource_calendar_form" id="menu_view_resource_calendar" parent="menu_pm_resources_project1" sequence="1"/>
         <menuitem action="resource.action_resource_calendar_leave_tree" id="menu_view_resource_calendar_leaves" parent="menu_pm_resources_project1" sequence="1"/>
 
diff --git a/addons/project_planning/project_planning_view.xml b/addons/project_planning/project_planning_view.xml
index 1d55d9db6c4..fff11703de5 100644
--- a/addons/project_planning/project_planning_view.xml
+++ b/addons/project_planning/project_planning_view.xml
@@ -217,12 +217,12 @@
             <field name="context">{"search_default_user_id":uid}</field>
             <field name="search_view_id" ref="account_analytic_planning_view_search"/>
         </record>
-        <menuitem id="base.menu_pm_planning" name="Planning" parent="base.menu_main_pm" sequence="5"/>
-        <menuitem id="planning_main" name="Long Term Planning"
-            parent="base.menu_pm_planning" />
+<!--        <menuitem id="base.menu_pm_planning" name="Planning" parent="base.menu_main_pm" sequence="5"/>-->
+        <menuitem id="base.menu_project_long_term" name="Long Term Planning"
+            parent="base.menu_main_pm" />
 
         <menuitem action="action_account_analytic_planning_form"
-            id="menu_report_account_analytic_planning" parent="planning_main" />
+            id="menu_report_account_analytic_planning" parent="base.menu_project_long_term" sequence="3"/>
 
         <!--
             Planning statistics
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 3a7277a4766..6a8f5eb6f55 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -7,14 +7,36 @@
             groups="group_purchase_user" sequence="7"/>
        <menuitem id="menu_procurement_management" name="Purchase Management"
             parent="base.menu_purchase_root" sequence="1"/>
+        
+        <!--supplier addresses action-->
+        <record id="action_supplier_address_form" model="ir.actions.act_window">
+            <field name="name">Addresses</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">res.partner.address</field>
+            <field name="view_type">form</field>
+            <field name="context">{"search_default_supplier":1}</field>
+            <field name="search_view_id" ref="base.view_res_partner_address_filter"/>
+        </record>
+        <record id="action_supplier_address_form_view1" model="ir.actions.act_window.view">
+            <field eval="10" name="sequence"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="base.view_partner_address_tree"/>
+            <field name="act_window_id" ref="action_supplier_address_form"/>
+        </record>
+        <record id="action_supplier_address_form_view2" model="ir.actions.act_window.view">
+            <field eval="20" name="sequence"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="base.view_partner_address_form1"/>
+            <field name="act_window_id" ref="action_supplier_address_form"/>
+        </record>
 
      <!--supplier menu-->
-     <menuitem id="base.menu_procurement_management_supplier" name="Suppliers"
+     <menuitem id="base.menu_procurement_management_supplier" name="Address Book"
             parent="base.menu_purchase_root" sequence="3"/>
-     <menuitem id="menu_procurement_management_supplier_name" name="Suppliers"
+     <menuitem id="base.menu_procurement_management_supplier_name" name="Suppliers"
             parent="base.menu_procurement_management_supplier" action="base.action_partner_supplier_form" sequence="1"/>
-
-
+     <menuitem action="action_supplier_address_form" id="menu_purchases_partner_address_form"
+            parent="base.menu_procurement_management_supplier" sequence="3"/>
 
           <!--Inventory control-->
       <menuitem id="menu_procurement_management_inventory" name="Inventory Control"
@@ -27,7 +49,7 @@
       <menuitem id="menu_procurement_management_invoice" name="Invoice Control"
             parent="base.menu_purchase_root" sequence="6"/>
      <menuitem name="Pending Invoices" id="menu_procurement_management_pending_invoice" action="account.action_invoice_tree_pending_invoice"
-      parent="menu_procurement_management_invoice"/>
+      parent="menu_procurement_management_invoice" sequence="13"/>
 
       <!--product menu-->
       <menuitem id="menu_procurement_management_product" name="Product"
@@ -346,7 +368,8 @@
             <field name="view_id" ref="purchase_order_line_form"/>
             <field name="act_window_id" ref="purchase_line_form_action2"/>
         </record>
-        <menuitem action="purchase_line_form_action2" id="menu_purchase_line_order_draft" parent="menu_procurement_management_invoice"/>
+        <menuitem action="purchase_line_form_action2" id="menu_purchase_line_order_draft" 
+                    parent="menu_procurement_management_invoice" sequence="12"/>
 
         <!--
             Procurements
diff --git a/addons/sale_journal/sale_journal_view.xml b/addons/sale_journal/sale_journal_view.xml
index 5b3d2de5652..86299968f4b 100644
--- a/addons/sale_journal/sale_journal_view.xml
+++ b/addons/sale_journal/sale_journal_view.xml
@@ -439,7 +439,7 @@
             <field name="search_view_id" ref="view_picking_journal_search"/>
         </record>
 
-        <menuitem name="Picking Journals" id="menu_definition_journal_picking" parent="stock.menu_stock_configuration" action="action_definition_picking_journal"/>
+        <menuitem name="Picking Journals" id="menu_definition_journal_picking" parent="stock.menu_warehouse_config" action="action_definition_picking_journal"/>
 
         <record model="ir.actions.act_window" id="action_invoice_type_tree">
             <field name="name">Picking by invoice_method</field>
diff --git a/addons/scrum/scrum_view.xml b/addons/scrum/scrum_view.xml
index 70c3e82ee56..46ce72c2f0a 100644
--- a/addons/scrum/scrum_view.xml
+++ b/addons/scrum/scrum_view.xml
@@ -4,7 +4,7 @@
 
         <menuitem id="menu_scrum"
             name="Scrum"
-            parent="base.menu_main_pm"/>
+            parent="base.menu_main_pm" sequence="3"/>
 
         <!-- Scrum Project -->
 
@@ -172,7 +172,7 @@
         <menuitem
             action="action_product_backlog_form"
             id="menu_action_product_backlog_form"
-            sequence="20"
+            sequence="10"
             parent="menu_scrum"/>
 
         <!--
@@ -293,7 +293,7 @@
             <field name="search_view_id" ref="view_scrum_sprint_search"/>
         </record>
         <menuitem
-            sequence="10"
+            sequence="30"
             action="action_sprint_all_tree" id="menu_action_sprint_all_tree" parent="menu_scrum"/>
 
         <!--
@@ -375,7 +375,7 @@
             <field name="context">{'search_default_scrum_daily':1}</field>
             <field name="search_view_id" ref="view_scrum_meeting_search"/>
         </record>
-        <menuitem sequence="30"
+        <menuitem sequence="20"
             action="action_meeting_form" id="menu_action_meeting_form" parent="menu_scrum"/>
 
         <!--
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 3fdfda9e057..1011f88f577 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -3,11 +3,12 @@
     <data>
         <menuitem icon="terp-stock" id="menu_stock_root" name="Warehouse" sequence="2"/>
         <menuitem id="menu_stock_warehouse_mgmt" name="Warehouse Management" parent="menu_stock_root" sequence="1"/>
-        <menuitem id="menu_stock_products_moves" name="Products Moves" parent="menu_stock_root" sequence="5"/>
-        <menuitem id="menu_stock_product" name="Product" parent="menu_stock_root" sequence="4"/>
+        <menuitem id="menu_stock_products_moves" name="Products Moves" parent="menu_stock_root" sequence="7"/>
+        <menuitem id="menu_stock_product" name="Product" parent="menu_stock_root" sequence="6"/>
         <menuitem action="product.product_normal_action" id="menu_stock_products_menu" parent="menu_stock_product" sequence="1"/>
         <menuitem id="menu_stock_configuration" name="Configuration" parent="menu_stock_root" sequence="15"/>
-        <menuitem id="menu_stock_inventory_control" name="Inventory Control" parent="menu_stock_root" sequence="3"/>
+        <menuitem id="menu_warehouse_config" name="Warehouse mangement" parent="menu_stock_configuration" sequence="1"/>
+        <menuitem id="menu_stock_inventory_control" name="Inventory Control" parent="menu_stock_root" sequence="4"/>
 
         <record id="stock_inventory_line_tree" model="ir.ui.view">
             <field name="name">stock.inventory.line.tree</field>
@@ -181,7 +182,7 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="view_tracking_tree"/>
         </record>
-        <menuitem id="menu_traceability" name="Traceability" parent="menu_stock_root" sequence="2"/>
+        <menuitem id="menu_traceability" name="Traceability" parent="menu_stock_root" sequence="3"/>
         <menuitem action="action_tracking_form" id="menu_action_tracking_form"
             groups="base.group_extended"
             parent="menu_traceability"/>
@@ -481,7 +482,7 @@
             <field name="view_id" ref="view_location_tree2"/>
             <field name="context">{'full':1, 'search_default_in_location':1}</field>
         </record>
-        <menuitem action="action_location_form" id="menu_action_location_form" parent="menu_stock_configuration" />
+        <menuitem action="action_location_form" id="menu_action_location_form" parent="menu_warehouse_config" />
 
         <record id="view_location_tree" model="ir.ui.view">
             <field name="name">stock.location.tree</field>
@@ -541,7 +542,7 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="view_warehouse_tree"/>
         </record>
-        <menuitem action="action_warehouse_form" id="menu_action_warehouse_form" parent="menu_stock_configuration"/>
+        <menuitem action="action_warehouse_form" id="menu_action_warehouse_form" parent="menu_warehouse_config"/>
 
         <record id="stock_picking_move_wizard_form" model="ir.ui.view">
             <field name="name">stock.picking.move.wizard.form</field>
@@ -933,7 +934,7 @@
             <field name="view_mode">calendar</field>
             <field name="act_window_id" ref="action_picking_tree_delivery"/>
         </record>
-        <menuitem action="action_picking_tree_delivery" id="menu_action_picking_tree_delivery" parent="menu_stock_warehouse_mgmt" sequence="20"/>
+        <menuitem action="action_picking_tree_delivery" id="menu_action_picking_tree_delivery" parent="menu_stock_warehouse_mgmt" sequence="1"/>
 
         #
         # Sending Products
@@ -1126,7 +1127,7 @@
             <field name="view_mode">calendar</field>
             <field name="act_window_id" ref="action_picking_tree"/>
         </record>
-        <menuitem action="action_picking_tree" id="menu_action_picking_tree" parent="menu_stock_warehouse_mgmt" sequence="5"/>
+        <menuitem action="action_picking_tree" id="menu_action_picking_tree" parent="menu_stock_warehouse_mgmt" sequence="3"/>
 
         <record id="view_picking_in_tree" model="ir.ui.view">
             <field name="name">stock.picking.in.tree</field>
@@ -1308,7 +1309,7 @@
             <field name="view_mode">calendar</field>
             <field name="act_window_id" ref="action_picking_tree4"/>
         </record>
-        <menuitem action="action_picking_tree4" id="menu_action_picking_tree4" parent="menu_stock_warehouse_mgmt" sequence="1"/>
+        <menuitem action="action_picking_tree4" id="menu_action_picking_tree4" parent="menu_stock_warehouse_mgmt" sequence="2"/>
 
         <record id="view_picking_internal_search" model="ir.ui.view">
             <field name="name">stock.picking.internal.search</field>
@@ -1347,7 +1348,7 @@
             <field name="context">{'contact_display': 'partner',"search_default_confirmed":1}</field>
             <field name="search_view_id" ref="view_picking_internal_search"/>
         </record>
-        <menuitem action="action_picking_tree6" id="menu_action_picking_tree6" parent="menu_stock_warehouse_mgmt" sequence="2"/>
+        <menuitem action="action_picking_tree6" id="menu_action_picking_tree6" parent="menu_stock_warehouse_mgmt" sequence="4"/>
 
         <record id="view_move_tree" model="ir.ui.view">
             <field name="name">stock.move.tree</field>
@@ -1699,7 +1700,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-<!--        <menuitem action="action_incoterms_tree" id="menu_action_incoterms_tree" parent="menu_stock_configuration"/>-->
+<!--        <menuitem action="action_incoterms_tree" id="menu_action_incoterms_tree" parent="menu_warehouse_config"/>-->
 
         <act_window
             context="{'location': active_id}"
@@ -1923,7 +1924,7 @@
             action="action_stock_journal_form"
             id="menu_action_stock_journal_form"
             groups="base.group_extended"
-            parent="menu_stock_configuration" />
+            parent="menu_warehouse_config" />
 
     </data>
 </openerp>
diff --git a/addons/stock_planning/stock_planning_view.xml b/addons/stock_planning/stock_planning_view.xml
index 7eb19f8863c..027ba285193 100644
--- a/addons/stock_planning/stock_planning_view.xml
+++ b/addons/stock_planning/stock_planning_view.xml
@@ -267,7 +267,7 @@
 
 <!-- Create Planning section -->
 
-        <menuitem id="menu_stock_planning_main" name="Stock Planning" parent="stock.menu_stock_root"/>
+        <menuitem id="menu_stock_planning_main" name="Stock Planning" parent="stock.menu_stock_root" sequence="2"/>
 
        <record id="view_stock_planning_createlines_form" model="ir.ui.view">
             <field name="name">stock.planning.createlines.form</field>

From b0a2103e5973b73ff5bb752a7939777df6e03110 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 16 Jun 2010 14:25:03 +0200
Subject: [PATCH 29/39] removed not clean module

bzr revid: fp@tinyerp.com-20100616122503-swfhu1nwxwzsmctk
---
 addons/stock_avg_consommation/__init__.py     |  25 -----
 addons/stock_avg_consommation/__openerp__.py  |  35 ------
 .../stock_avg_consommation.py                 | 100 ------------------
 .../stock_avg_consommation_view.xml           |  18 ----
 .../stock_avg_consommation/wizard/__init__.py |  24 -----
 .../wizard/stock_avg_consommation_wizard.py   |  57 ----------
 6 files changed, 259 deletions(-)
 delete mode 100644 addons/stock_avg_consommation/__init__.py
 delete mode 100644 addons/stock_avg_consommation/__openerp__.py
 delete mode 100644 addons/stock_avg_consommation/stock_avg_consommation.py
 delete mode 100644 addons/stock_avg_consommation/stock_avg_consommation_view.xml
 delete mode 100644 addons/stock_avg_consommation/wizard/__init__.py
 delete mode 100644 addons/stock_avg_consommation/wizard/stock_avg_consommation_wizard.py

diff --git a/addons/stock_avg_consommation/__init__.py b/addons/stock_avg_consommation/__init__.py
deleted file mode 100644
index c4d17a90d9a..00000000000
--- a/addons/stock_avg_consommation/__init__.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- 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 stock_avg_consommation
-import wizard
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock_avg_consommation/__openerp__.py b/addons/stock_avg_consommation/__openerp__.py
deleted file mode 100644
index 37008770cae..00000000000
--- a/addons/stock_avg_consommation/__openerp__.py
+++ /dev/null
@@ -1,35 +0,0 @@
-# -*- 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/>.
-#
-##############################################################################
-
-
-{
-    'name': 'Stock Average consommation',
-    'version': '1.0',
-    'category': 'Generic Modules/Inventory Control',
-    'author': 'Tiny',
-    'depends': ['stock'],
-    'init_xml': [],
-    'update_xml': ['stock_avg_consommation_view.xml'],
-    'demo_xml': [],
-    'installable': True,
-    'active': False,
-}
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock_avg_consommation/stock_avg_consommation.py b/addons/stock_avg_consommation/stock_avg_consommation.py
deleted file mode 100644
index b9dab63d18b..00000000000
--- a/addons/stock_avg_consommation/stock_avg_consommation.py
+++ /dev/null
@@ -1,100 +0,0 @@
-# -*- 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/>.
-#
-##############################################################################
-
-from osv import fields,osv
-import tools
-import ir
-import pooler
-from mx import DateTime
-from datetime import datetime
-import time
-from dateutil.relativedelta import relativedelta
-
-class stock_avg_consommation(osv.osv):
-    _name = "stock.avg.consommation"
-    _inherit="product.product"
-
-    def _compute_avg_consommation(self, cr, uid, ids, fields, args, context={}):
-        print  ids, fields, args, context
-        date_str=False
-        from_date=context.get('from_date',False)
-        to_date=context.get('to_date',False)
-
-        if from_date and to_date:
-            date_str="date_planned>='%s' and date_planned<='%s'"%(from_date,to_date)
-        elif from_date:
-            date_str="date_planned>='%s'"%(from_date)
-        elif to_date:
-            date_str="date_planned<='%s'"%(to_date)
-
-        date_object_to = to_date and  datetime.strptime(to_date, '%Y-%m-%d %H:%M:%S') or datetime.now()
-        date_object_from = from_date and datetime.strptime(from_date, '%Y-%m-%d %H:%M:%S')  or (datetime.now() + relativedelta(days=-30))
-        dd = date_object_to - date_object_from
-        total_days=dd.days+1
-        if not from_date and not to_date:
-            date_str="date_planned>='%s' and date_planned<='%s'"%(date_object_from.strftime('%Y-%m-%d 00:00:00'), date_object_to.strftime('%Y-%m-%d 23:59:59'))
-        elif not from_date:
-            date_str="date_planned>='%s'"%(date_object_from.strftime('%Y-%m-%d 00:00:00'))
-        elif not to_date:
-            date_str="date_planned<='%s'"%(date_object_to.strftime('%Y-%m-%d 23:59:59'))
-        res={}
-        for line_id in ids:
-            res[line_id] = False
-        location_ids = []
-
-        if context.get('location', False):
-            if type(context['location']) == type(1):
-                location_ids = [context['location']]
-            elif type(context['location']) in (type(''), type(u'')):
-                location_ids = self.pool.get('stock.location').search(cr, uid, [('name','ilike',context['location'])], context=context)
-            else:
-                location_ids = context['location']
-        else:
-            location_ids = []
-            wids = self.pool.get('stock.warehouse').search(cr, uid, [], context=context)
-            for w in self.pool.get('stock.warehouse').browse(cr, uid, wids, context=context):
-                location_ids.append(w.lot_stock_id.id)
-
-        # build the list of ids of children of the location given by id
-        if context.get('compute_child',True):
-            child_location_ids = self.pool.get('stock.location').search(cr, uid, [('location_id', 'child_of', location_ids)])
-            location_ids = child_location_ids or location_ids
-        else:
-            location_ids = location_ids
-
-
-
-        #sql = """select product_id,sum(product_qty) from stock_move sm,stock_picking sp where sm.picking_id=sp.id and sp.type in ('out','delivery') and %s and  location_id <> ANY(%s) and location_dest_id =ANY(%s) group by product_id""" % (date_str, location_ids, location_ids)
-        sql = """select product_id,sum(product_qty) from stock_move sm,stock_picking sp where sm.picking_id=sp.id and sp.type in ('out','delivery') and """+date_str+""" and  sm.location_id not in %s and sm.location_dest_id in %s group by product_id"""
-        cr.execute(sql, [tuple(location_ids), tuple(location_ids)])
-        product_ids = []
-        res_sum = cr.fetchall()
-        for line_id, avg in res_sum:
-            res[line_id] = avg/total_days
-            product_ids.append(avg)
-        return res
-
-    _columns = {
-        'avg_consommation':fields.function(_compute_avg_consommation,method=True, type='float', string="Average Consommation"),
-    }
-stock_avg_consommation()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock_avg_consommation/stock_avg_consommation_view.xml b/addons/stock_avg_consommation/stock_avg_consommation_view.xml
deleted file mode 100644
index d9afed69af3..00000000000
--- a/addons/stock_avg_consommation/stock_avg_consommation_view.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data>
-       <record id="stock_avg_consommation_tree" model="ir.ui.view">
-            <field name="name">stock.avg.consommation.tree</field>
-            <field name="model">stock.avg.consommation</field>
-            <field name="type">tree</field>
-            <field name="inherit_id" ref="product.product_product_tree_view"/>
-            <field name="arch" type="xml">
-   				<field name="state" position="after">
-                        <field name="avg_consommation" />
-                </field>
-            </field>
-        </record>
-	</data>
-</openerp>
-
-
diff --git a/addons/stock_avg_consommation/wizard/__init__.py b/addons/stock_avg_consommation/wizard/__init__.py
deleted file mode 100644
index a7d7cfed3dc..00000000000
--- a/addons/stock_avg_consommation/wizard/__init__.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# -*- 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 stock_avg_consommation_wizard
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock_avg_consommation/wizard/stock_avg_consommation_wizard.py b/addons/stock_avg_consommation/wizard/stock_avg_consommation_wizard.py
deleted file mode 100644
index 7d5d8657aa2..00000000000
--- a/addons/stock_avg_consommation/wizard/stock_avg_consommation_wizard.py
+++ /dev/null
@@ -1,57 +0,0 @@
-# -*- 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/>.
-#
-##############################################################################
-
-from osv import fields, osv
-
-class stock_location_product(osv.osv_memory):
-    _inherit = "stock.location.product"
-
-    def action_open_window(self, cr, uid, ids, context):
-        """ To open location wise product information specific to given duration
-         @param self: The object pointer.
-         @param cr: A database cursor
-         @param uid: ID of the user currently logged in
-         @param ids: An ID or list of IDs if we want more than one
-         @param context: A standard dictionary
-         @return: Invoice type
-        """
-
-        mod_obj = self.pool.get('ir.model.data')
-        view = mod_obj._get_id(cr, uid, 'stock_avg_consommation', 'stock_avg_consommation_tree')
-        id = mod_obj.read(cr, uid, view, ['res_id'])
-
-        for location_obj in self.read(cr, uid, ids, ['from_date', 'to_date']):
-            return {
-                'name': False,
-                'view_id':[id['res_id']],
-                'view_type': 'form',
-                'view_mode': 'tree,form',
-                'res_model': 'stock.avg.consommation',
-                'type': 'ir.actions.act_window',
-                'context': {'location': context['active_id'],
-                       'from_date': location_obj['from_date'],
-                       'to_date': location_obj['to_date']},
-                'domain': [('type', '<>', 'service')],
-            }
-
-stock_location_product()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

From 953e7dc67d047be05e71300ddf4f16ba28c4b351 Mon Sep 17 00:00:00 2001
From: "nel@tinyerp.com" <>
Date: Wed, 16 Jun 2010 15:26:09 +0200
Subject: [PATCH 30/39] [IMP] stock views

bzr revid: nel@tinyerp.com-20100616132609-abqesd6tm8axcokx
---
 addons/purchase/security/ir.model.access.csv |  2 +
 addons/stock/stock_view.xml                  | 51 +++++++++++++++-----
 addons/stock/wizard/stock_move_view.xml      |  4 +-
 addons/stock/wizard/stock_splitinto.py       |  8 +--
 4 files changed, 48 insertions(+), 17 deletions(-)

diff --git a/addons/purchase/security/ir.model.access.csv b/addons/purchase/security/ir.model.access.csv
index c6a09d5d728..d1ccce7b15f 100644
--- a/addons/purchase/security/ir.model.access.csv
+++ b/addons/purchase/security/ir.model.access.csv
@@ -24,3 +24,5 @@
 "access_account_sequence_fiscalyear_purchase_user","account.sequence.fiscalyear purchase","account.model_account_sequence_fiscalyear","group_purchase_user",1,1,1,1
 "access_res_partner_purchase_user","res.partner purchase","base.model_res_partner","group_purchase_user",1,0,0,0
 "access_res_partner_address_purchase_user","res.partner.address purchase","base.model_res_partner_address","group_purchase_user",1,0,0,0
+"access_account_journal","account.journal","account.model_account_journal","purchase.group_purchase_user",1,1,1,0
+"access_account_journal_manager","account.journal","account.model_account_journal","purchase.group_purchase_manager",1,1,1,1
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 3fdfda9e057..bf07fe15058 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -631,15 +631,18 @@
                                     <button
                                         name="%(stock.track_line)d"
                                         string="Split in production lots"
-                                           type="action" icon="terp-stock_effects-object-colorize"
-                                           states="draft,waiting,confirmed,assigned" />
+                                        groups="base.group_extended" 
+                                        type="action" icon="terp-stock_effects-object-colorize"
+                                        states="draft,waiting,confirmed,assigned" />
                                     <field groups="base.group_extended" name="tracking_id"/>
                                     <button name="%(split_into)d" string="Split Stock Moves" type="action"
+                                            groups="base.group_extended" 
                                             icon="terp-stock_effects-object-colorize" 
                                             states="draft,assigned,confirmed,done"/>
                                     <button name="setlast_tracking" string="Set Last Tracking" type="object"
                                         attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}" 
                                         icon="terp-stock_effects-object-colorize" 
+                                        groups="base.group_extended" 
                                         states="draft,assigned,confirmed,done"/>
                                     <field name="location_id"/>
                                     <field name="location_dest_id"/>
@@ -677,9 +680,11 @@
 
                                             <newline/>
                                             <label/>
-                                            <button name="%(track_line)d" string="Split in production lots" type="action" icon="terp-stock_effects-object-colorize"/>
+                                            <button name="%(track_line)d" string="Split in production lots" type="action" icon="terp-stock_effects-object-colorize"
+                                              groups="base.group_extended" />
                                             <button name="%(move_scrap)d" string="Scrap Move Line" type="action" icon="gtk-justify-fill"/>
                                             <button name="%(split_into)d" string="Split Stock Moves" type="action"
+                                                groups="base.group_extended" 
                                                 icon="terp-stock_effects-object-colorize" />
                                             <separator colspan="4" string="Move State"/>
                                             <field name="state"/>
@@ -792,9 +797,11 @@
                                     <field groups="base.group_extended" name="tracking_id"/>
                                     <button name="%(split_into)d" string="Split Stock Moves" type="action"
                                         icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
+                                        groups="base.group_extended" 
                                         states="draft,assigned,confirmed,done"/>
                                     <button name="setlast_tracking" string="Set Last Tracking" type="object"
                                         attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}" 
+                                        groups="base.group_extended" 
                                         icon="terp-stock_effects-object-colorize" 
                                         states="draft,assigned,confirmed,done"/>
                                     <field name="location_id"/>
@@ -837,9 +844,12 @@
                                             <field groups="base.group_extended" name="tracking_id"/>
 
                                             <label/>
-                                            <button name="%(track_line)d" string="Split in production lots" type="action" icon="terp-stock_effects-object-colorize"/>
+                                            <button name="%(track_line)d" string="Split in production lots" 
+                                            groups="base.group_extended" 
+                                            type="action" icon="terp-stock_effects-object-colorize"/>
                                             <label/>
                                             <button name="%(split_into)d" string="Split Stock Moves" type="action"
+                                              groups="base.group_extended" 
                                                 icon="terp-stock_effects-object-colorize"
                                                 states="draft,assigned,confirmed,done"/>
                                             <separator colspan="4" string="Move State"/>
@@ -993,9 +1003,11 @@
                                     <field name="tracking_id" groups="base.group_extended"/>
                                   <button name="%(split_into)d" string="Split Stock Moves" type="action"
                                       icon="terp-stock_effects-object-colorize"
+                                      groups="base.group_extended" 
                                       states="draft,assigned,confirmed,done"/>
                                 <button name="setlast_tracking" string="Set Last Tracking" type="object"
                                     attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}" 
+                                    groups="base.group_extended" 
                                     icon="terp-stock_effects-object-colorize" 
                                     states="draft,assigned,confirmed,done"/>
                                     <field name="location_id"/>
@@ -1027,9 +1039,12 @@
                                                 on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"/>
                                             <field groups="base.group_extended" name="tracking_id"/>
                                             <label/>
-                                            <button name="%(track_line)d" string="Split in production lots" type="action" icon="terp-stock_effects-object-colorize"/>
+                                            <button name="%(track_line)d" string="Split in production lots" type="action" icon="terp-stock_effects-object-colorize"
+                                                groups="base.group_extended" 
+                                             />
                                             <label/>
                                             <button name="%(split_into)d" string="Split Stock Moves" type="action"
+                                                groups="base.group_extended" 
                                                 icon="terp-stock_effects-object-colorize" 
                                                 states="draft,assigned,confirmed,done"/>
                                             <label/>
@@ -1178,13 +1193,16 @@
                                       <button
                                            name="%(stock.track_line)d"
                                            string="Split in production lots"
+                                            groups="base.group_extended" 
                                            type="action" icon="terp-stock_effects-object-colorize"
                                            states="draft,waiting,confirmed,assigned" />
                                     <field name="tracking_id" groups="base.group_extended"/>
                                     <button name="%(split_into)d" string="Split Stock Moves" type="action"
+                                        groups="base.group_extended" 
                                         icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
                                         states="draft,assigned,confirmed,done"/>
                                     <button name="setlast_tracking" string="Set Last Tracking" type="object"
+                                        groups="base.group_extended" 
                                         icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
                                         states="draft,assigned,confirmed,done"/>
                                     <field name="state"/>
@@ -1216,7 +1234,9 @@
                                             <label/>
                                           	<button groups="base.group_extended" name="267" string="Split in production lots" type="action" icon="terp-stock_effects-object-colorize"/>
                                             <label/>
-                                            <button name="275" string="Split Stock Moves" type="action" icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}" states="draft,assigned,confirmed,done"/>
+                                            <button name="275" string="Split Stock Moves" type="action"
+                                              groups="base.group_extended" 
+                                              icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}" states="draft,assigned,confirmed,done"/>
                                             <separator colspan="4" string="Move State"/>
                                             <field name="state"/>
                                             <group colspan="2">
@@ -1371,11 +1391,12 @@
                         groups="base.group_extended"/>
                     <field groups="base.group_extended" name="tracking_id"/>
                     <button name="%(split_into)d" string="Split Stock Moves" type="action"
+                        groups="base.group_extended" 
                         icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
                         states="draft,assigned,confirmed,done"/>
                     <button name="setlast_tracking" string="Set Last Tracking" type="object"
-                        icon="terp-stock_effects-object-colorize" 
-                        attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}" 
+                        groups="base.group_extended" 
+                        icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
                         states="draft,assigned,confirmed,done"/>
                     <field name="location_id"/>
                     <field name="location_dest_id"/>
@@ -1435,9 +1456,12 @@
                                 <newline/>
                                 <group colspan="4" col="4">
                                   <label/>
-                                	<button name="%(track_line)d" string="Split in production lots" type="action" icon="terp-stock_effects-object-colorize" colspan="2" />
+                                	<button name="%(track_line)d"
+                                    groups="base.group_extended" 
+                                   string="Split in production lots" type="action" icon="terp-stock_effects-object-colorize" colspan="2" />
                                   <label/>
-                                	<button name="%(split_into)d" string="Split Stock Moves" type="action"
+                                    <button name="%(split_into)d" string="Split Stock Moves" type="action"
+                                        groups="base.group_extended" 
                                 		icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
                                 		states="draft,assigned,confirmed,done"/>
                                 </group>
@@ -1530,10 +1554,12 @@
                         groups="base.group_extended"/>
                     <field name="tracking_id" groups="base.group_extended"/>
                     <button name="%(split_into)d" string="Split Stock Moves" type="action"
+                        groups="base.group_extended" 
                         icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
                         states="draft,assigned,confirmed,done"/>
                     <button name="setlast_tracking" string="Set Last Tracking" type="object"
                         attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}" 
+                        groups="base.group_extended" 
                         icon="terp-stock_effects-object-colorize" 
                         states="draft,assigned,confirmed,done"/>
                     <field name="date_planned"/>
@@ -1582,10 +1608,13 @@
                             <group col="2" colspan="2">
                               <label/>
 	                            <button name="%(split_into)d" string="Split Stock Moves" type="action"
+                                groups="base.group_extended" 
 	                            	icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
 	                            	states="draft,assigned,confirmed,done"/>
                               <label/>
-	                            <button name="%(track_line)d" string="Split in production lots" type="action" icon="terp-stock_effects-object-colorize"/>
+	                            <button name="%(track_line)d" string="Split in production lots" 
+                              groups="base.group_extended" 
+                              type="action" icon="terp-stock_effects-object-colorize"/>
                         	</group>
                             <separator colspan="4" string="Move State"/>
                             <field name="state"/>
diff --git a/addons/stock/wizard/stock_move_view.xml b/addons/stock/wizard/stock_move_view.xml
index 05c35d5a830..71626e7d161 100644
--- a/addons/stock/wizard/stock_move_view.xml
+++ b/addons/stock/wizard/stock_move_view.xml
@@ -120,7 +120,7 @@
 
                   <group colspan="4" attrs="{'invisible':[('use_exist','=',True)]}">
 	                	<field name="line_ids" colspan="4" nolabel="1">
-	                		<tree string="Lots Number" editable="top">
+	                		<tree string="Lots Number" editable="bottom">
 	                			<field name="name" string="Lots"/>
 	                			<field name="quantity" />
 	                		</tree>
@@ -132,7 +132,7 @@
                     </group>
                   <group colspan="4" attrs="{'invisible':[('use_exist','!=',True)]}">
 	                	<field name="line_exist_ids" colspan="4" nolabel="1">
-	                		<tree string="Lots Number" editable="top">
+	                		<tree string="Lots Number" editable="bottom">
 	                			<field name="prodlot_id" string="Lots" domain="[('product_id','=',parent.product_id)]"/>
 	                			<field name="quantity" />
 	                		</tree>
diff --git a/addons/stock/wizard/stock_splitinto.py b/addons/stock/wizard/stock_splitinto.py
index dcc97d6379d..ff4cd588c47 100644
--- a/addons/stock/wizard/stock_splitinto.py
+++ b/addons/stock/wizard/stock_splitinto.py
@@ -57,15 +57,15 @@ class stock_split_into(osv.osv_memory):
         value_to_split = self.browse(cr, uid, data[0], context)
         quantity =  value_to_split.quantity or 0.0
         ir_sequence_obj = self.pool.get('ir.sequence')
-        prodlot_obj = self.pool.get('stock.production.lot')
+        track_obj = self.pool.get('stock.tracking')
         for move in move_obj.browse(cr, uid, rec_id):
             move_qty = move.product_qty
             uos_qty_rest = move.product_uos_qty
             quantity_rest = move_qty - quantity
             if quantity_rest == 0:
                 continue
-            sequence = ir_sequence_obj.get(cr, uid, 'stock.lot.serial')
-            prodlot_id = prodlot_obj.create(cr, uid, {'name': sequence}, {'product_id': move.product_id.id})
+            sequence = ir_sequence_obj.get(cr, uid, 'stock.lot.tracking')
+            tracking_id = track_obj.create(cr, uid, {'name': sequence}, {'product_id': move.product_id.id})
             uos_qty = quantity / move_qty * move.product_uos_qty
             uos_qty_rest = quantity_rest / move_qty * move.product_uos_qty
             default_val = {
@@ -76,7 +76,7 @@ class stock_split_into(osv.osv_memory):
             current_move = move_obj.copy(cr, uid, move.id, default_val)
             new_move.append(current_move)
             update_val['product_qty'] = quantity_rest
-            update_val['prodlot_id'] = prodlot_id
+            update_val['tracking_id'] = tracking_id
             update_val['product_uos_qty'] = uos_qty_rest
             move_obj.write(cr, uid, [move.id], update_val)
         return {}

From 606c842f0d7f0cd6948a556a400b8e20daa8a54e Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.com>
Date: Wed, 16 Jun 2010 19:04:52 +0530
Subject: [PATCH 31/39] [IMP]: Re-organized Sales menu.

bzr revid: uco@tinyerp.com-20100616133452-qrpiy2r0crxe0d2z
---
 addons/base_calendar/base_calendar_view.xml                   | 2 +-
 addons/crm/crm_phonecall_menu.xml                             | 2 +-
 addons/crm/crm_view.xml                                       | 2 +-
 addons/crm_claim/crm_claim_menu.xml                           | 2 +-
 addons/crm_claim/crm_claim_view.xml                           | 2 +-
 addons/crm_fundraising/crm_fundraising_menu.xml               | 2 +-
 addons/crm_fundraising/crm_fundraising_view.xml               | 2 +-
 addons/crm_fundraising/report/crm_fundraising_report_view.xml | 2 +-
 addons/crm_helpdesk/crm_helpdesk_menu.xml                     | 2 +-
 addons/crm_helpdesk/crm_helpdesk_view.xml                     | 2 +-
 addons/html_view/html_view.xml                                | 2 +-
 addons/product/product_view.xml                               | 4 ++--
 addons/report_intrastat/report_intrastat_view.xml             | 2 +-
 addons/sale/report/sale_report_view.xml                       | 2 +-
 addons/sale/sale_view.xml                                     | 4 ++--
 addons/sale_journal/report/sale_journal_report_view.xml       | 3 ++-
 addons/stock_planning/stock_planning_view.xml                 | 4 ++--
 addons/wiki_sale_faq/wiki_sale_faq_view.xml                   | 2 +-
 18 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index 56e45c9ccf9..21b16443e0a 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -138,7 +138,7 @@
 
         <!-- Calenadar's menu -->
           <menuitem id="base.menu_calendar_configuration" name="Calendar"
-            parent="base.menu_base_config" sequence="15" />
+            parent="base.menu_config_address_book" sequence="15" />
 
         <!-- Invitation menu -->
 
diff --git a/addons/crm/crm_phonecall_menu.xml b/addons/crm/crm_phonecall_menu.xml
index a5caf10b673..74bba86be04 100644
--- a/addons/crm/crm_phonecall_menu.xml
+++ b/addons/crm/crm_phonecall_menu.xml
@@ -48,7 +48,7 @@
 
     <menuitem name="Phone Calls" id="menu_crm_case_phone"
         groups="base.group_extended"
-        parent="base.menu_base_partner" sequence="5" />
+        parent="base.menu_base_partner" sequence="4" />
 
     <record model="ir.actions.act_window" id="crm_case_categ_phone_incoming0">
         <field name="name">Inbound</field>
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 19e3f731606..a402be2c85b 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -17,7 +17,7 @@
             parent="base.menu_base_config" sequence="5" groups="base.group_extended"/>
 
         <menuitem id="base.next_id_64" name="Reporting"
-            parent="base.menu_base_partner" sequence="8" />
+            parent="base.menu_base_partner" sequence="11" />
 
         <!-- Case Sections Form View -->
 
diff --git a/addons/crm_claim/crm_claim_menu.xml b/addons/crm_claim/crm_claim_menu.xml
index 7fb1c08f84b..e6ccdbe5bea 100644
--- a/addons/crm_claim/crm_claim_menu.xml
+++ b/addons/crm_claim/crm_claim_menu.xml
@@ -4,7 +4,7 @@
 
         <menuitem id="base.menu_aftersale" name="After-Sale Services"
             groups="base.group_extended"
-            parent="base.menu_base_partner" sequence="6" />
+            parent="base.menu_base_partner" sequence="7" />
 
         <!-- Claims Menu -->
 
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index b25009c2339..487a116ca1d 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -4,7 +4,7 @@
 
     <menuitem id="menu_config_claim" name="Claim"
         groups="base.group_extended"
-        parent="base.menu_base_config" sequence="8" />
+        parent="base.menu_base_config" sequence="6" />
 
     <!-- Claims categories  -->
 
diff --git a/addons/crm_fundraising/crm_fundraising_menu.xml b/addons/crm_fundraising/crm_fundraising_menu.xml
index e681594045b..440f1cd29b8 100644
--- a/addons/crm_fundraising/crm_fundraising_menu.xml
+++ b/addons/crm_fundraising/crm_fundraising_menu.xml
@@ -6,7 +6,7 @@
 
     <menuitem id="base.menu_fundrising" name="Fund Raising"
         groups="base.group_extended"
-        parent="base.menu_base_partner" sequence="7" />
+        parent="base.menu_base_partner" sequence="8" />
 
     <record model="ir.actions.act_window" id="crm_case_category_act_fund_all1">
         <field name="name">Funds</field>
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index 9ef1c936be4..4824cc8b3a3 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -4,7 +4,7 @@
            <!-- Fund Raising Configuration Menu -->
         <menuitem id="menu_config_fundrising" name="Fund Raising"
         groups="base.group_extended"
-        parent="base.menu_base_config" sequence="7" />
+        parent="base.menu_base_config" sequence="8" />
 
         <!-- Fund Raising Categories Form View -->
 
diff --git a/addons/crm_fundraising/report/crm_fundraising_report_view.xml b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
index ecd442d238f..4a5e05b28e1 100644
--- a/addons/crm_fundraising/report/crm_fundraising_report_view.xml
+++ b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
@@ -201,7 +201,7 @@
         <menuitem name="Fundraising"
             action="action_report_crm_fundraising"
             groups="base.group_extended"
-            id="menu_report_crm_fundraising_tree" parent="base.next_id_64" />
+            id="menu_report_crm_fundraising_tree" parent="base.next_id_64" sequence="20"/>
 
     </data>
 </openerp>
diff --git a/addons/crm_helpdesk/crm_helpdesk_menu.xml b/addons/crm_helpdesk/crm_helpdesk_menu.xml
index f671e3b77e0..3d93f17e218 100644
--- a/addons/crm_helpdesk/crm_helpdesk_menu.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_menu.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data noupdate="1">
     <menuitem id="base.menu_aftersale" name="After-Sale Services"
-    	parent="base.menu_base_partner" sequence="6" />
+    	parent="base.menu_base_partner" sequence="7" />
 
 <!-- Help Desk (menu) -->
 
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index 57e7bba0199..f91650a315a 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -4,7 +4,7 @@
        <!-- Helpdesk Support Categories Configuration Menu-->
        <menuitem id="menu_config_helpdesk" name="Helpdesk"
         groups="base.group_extended"
-        parent="base.menu_base_config" sequence="8" />
+        parent="base.menu_base_config" sequence="7" />
 
         <!-- Helpdesk Support Categories Form View -->
 
diff --git a/addons/html_view/html_view.xml b/addons/html_view/html_view.xml
index d26909586b5..7babda37c46 100644
--- a/addons/html_view/html_view.xml
+++ b/addons/html_view/html_view.xml
@@ -36,6 +36,6 @@
             <field name="res_model">html.view</field>
             <field name="view_type">form</field>
         </record>
-        <menuitem action="action_html_view_form" id="html_form" parent="base.menu_address_book" sequence="20"/>
+        <menuitem action="action_html_view_form" id="html_form" parent="base.menu_address_book" sequence="40"/>
 	</data>
 </openerp>
\ No newline at end of file
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 09a287f0a38..69f04e079f2 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem groups="base.group_extended" id="prod_config_main" name="Product" parent="base.menu_base_config" sequence="40"/>
+        <menuitem groups="base.group_extended" id="prod_config_main" name="Product" parent="base.menu_base_config" sequence="9"/>
 
         <record id="product_search_form_view" model="ir.ui.view">
             <field name="name">product.search.form</field>
@@ -194,7 +194,7 @@
             <field name="search_view_id" ref="product_search_form_view"/>
         </record>
 
-        <menuitem id="base.menu_product" name="Products" parent="base.menu_base_partner" sequence="7"/>
+        <menuitem id="base.menu_product" name="Products" parent="base.menu_base_partner" sequence="9"/>
         <menuitem action="product.product_normal_action" id="product.menu_products" parent="base.menu_product" sequence="1"/>
 
         <record id="product_normal_action_puchased" model="ir.actions.act_window">
diff --git a/addons/report_intrastat/report_intrastat_view.xml b/addons/report_intrastat/report_intrastat_view.xml
index 0449b097ec4..4c949174714 100644
--- a/addons/report_intrastat/report_intrastat_view.xml
+++ b/addons/report_intrastat/report_intrastat_view.xml
@@ -67,7 +67,7 @@
             <field name="view_mode">tree,form</field>
         </record>
 
-        <menuitem action="action_report_intrastat_code_tree" id="menu_report_intrastat_code" parent="base.menu_product"/>
+        <menuitem action="action_report_intrastat_code_tree" id="menu_report_intrastat_code" parent="product.prod_config_main"/>
 
 
         <record id="view_report_intrastat_tree" model="ir.ui.view">
diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index 41ebc1de088..b7dfd117ed0 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -125,7 +125,7 @@
         <field name="context">{'search_default_month':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[]}</field>
     </record>
 
-    <menuitem id="base.next_id_64" name="Reporting" parent="base.menu_base_partner" sequence="8"/>
+    <menuitem id="base.next_id_64" name="Reporting" parent="base.menu_base_partner" sequence="11"/>
     <menuitem action="action_order_report_all" id="menu_report_product_all" parent="base.next_id_64" sequence="3"/>
 
     <record id="action_stock_move_report_so" model="ir.actions.act_window">
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 0d28969c816..b924ade18af 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -3,7 +3,7 @@
     <data>
         <menuitem id="base.menu_sales" name="Sales" parent="base.menu_base_partner" sequence="1"/>
 
-        <menuitem id="base.menu_product" name="Products" parent="base.menu_base_partner" sequence="4"/>
+        <menuitem id="base.menu_product" name="Products" parent="base.menu_base_partner" sequence="9"/>
         <menuitem action="product.product_normal_action" id="product.menu_products" parent="base.menu_product" sequence="1"/>
 
         <record id="view_shop_form" model="ir.ui.view">
@@ -505,7 +505,7 @@
 
         <act_window domain="[('product_id','=',active_id)]" id="action_order_line_product_tree" name="Product sales" res_model="sale.order.line" src_model="product.product" groups="base.group_extended"/>
 
-        <menuitem id="menu_invoiced" name="Billing" parent="base.menu_base_partner" sequence="6"/>
+        <menuitem id="menu_invoiced" name="Billing" parent="base.menu_base_partner" sequence="5"/>
         <menuitem action="action_order_line_tree2" id="menu_invoicing_sales_order_lines" parent="menu_invoiced" sequence="2"/>
         <!-- configartion view -->
 
diff --git a/addons/sale_journal/report/sale_journal_report_view.xml b/addons/sale_journal/report/sale_journal_report_view.xml
index aa0a9cf06fe..19e93f58eb3 100644
--- a/addons/sale_journal/report/sale_journal_report_view.xml
+++ b/addons/sale_journal/report/sale_journal_report_view.xml
@@ -81,7 +81,8 @@
 	        <field name="context">{'search_default_journal': 1,'group_by_no_leaf':1,'group_by':[]}</field>
 	    </record>
 
-	    <menuitem name="Sales by Journal" id="menu_sale_journal_report_open_all" parent="base.next_id_64" action="action_sale_journal_report_open_menu_all"/>
+	    <menuitem name="Sales by Journal" id="menu_sale_journal_report_open_all" 
+	              parent="base.next_id_64" action="action_sale_journal_report_open_menu_all" sequence="2"/>
 
 	 <!-- picking by journal and invoice's tree view-->
 
diff --git a/addons/stock_planning/stock_planning_view.xml b/addons/stock_planning/stock_planning_view.xml
index 027ba285193..d95f49cbd70 100644
--- a/addons/stock_planning/stock_planning_view.xml
+++ b/addons/stock_planning/stock_planning_view.xml
@@ -121,8 +121,8 @@
             <field name="target">new</field>
         </record>
 
-        <menuitem id="menu_stock_sale_forecast" name="Stock and Sales Forecasts" parent="base.menu_base_partner"/>
-
+        <menuitem id="menu_stock_sale_forecast" name="Stock and Sales Forecasts" 
+                parent="base.menu_base_partner" sequence="6"/>
         <menuitem id="menu_stock_sale_forecast_createlines" name="Create Stock and Sales Forecasts" parent="menu_stock_sale_forecast" action="action_stock_sale_forecast_createlines_form" sequence = "5"/>
 
         <record id="view_stock_sale_forecast_form" model="ir.ui.view">
diff --git a/addons/wiki_sale_faq/wiki_sale_faq_view.xml b/addons/wiki_sale_faq/wiki_sale_faq_view.xml
index c3643bdf049..a97ba15db0e 100644
--- a/addons/wiki_sale_faq/wiki_sale_faq_view.xml
+++ b/addons/wiki_sale_faq/wiki_sale_faq_view.xml
@@ -4,7 +4,7 @@
         <menuitem id="base.menu_sales" name="Sales" parent="base.menu_base_partner" sequence="1"/>
 
         <menuitem name="Documents"
-           id="menu_sales" sequence="6"
+           id="menu_sales" sequence="10"
            parent="base.menu_base_partner"/>
 
        <record model="ir.actions.act_window" id="action_document_form">

From a0606d8a036b975de45a9ce17b2e36f58ebe87dc Mon Sep 17 00:00:00 2001
From: "nel@tinyerp.com" <>
Date: Wed, 16 Jun 2010 15:39:24 +0200
Subject: [PATCH 32/39] [IMP] set group user to sales menu

bzr revid: nel@tinyerp.com-20100616133924-j705xw200wlcvm9j
---
 addons/sale/sale_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 0d28969c816..5e73d76056f 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+        <menuitem icon="terp-partner" id="base.menu_base_partner" name="Sales" sequence="0" groups="sale.group_sale_user"/> 
         <menuitem id="base.menu_sales" name="Sales" parent="base.menu_base_partner" sequence="1"/>
 
         <menuitem id="base.menu_product" name="Products" parent="base.menu_base_partner" sequence="4"/>

From eae27319ebc94021447519247765e2ec6b3de694 Mon Sep 17 00:00:00 2001
From: "nel@tinyerp.com" <>
Date: Wed, 16 Jun 2010 22:02:39 +0200
Subject: [PATCH 33/39] [IMP] stock: rules and view

bzr revid: nel@tinyerp.com-20100616200239-kznn7jkpgxggiprj
---
 addons/stock/security/ir.model.access.csv |  4 +++-
 addons/stock/stock_view.xml               | 22 +++++++++-------------
 addons/stock/wizard/stock_splitinto.py    |  4 ++--
 3 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/addons/stock/security/ir.model.access.csv b/addons/stock/security/ir.model.access.csv
index f7bbc7ea3b9..7ecb0b833e9 100644
--- a/addons/stock/security/ir.model.access.csv
+++ b/addons/stock/security/ir.model.access.csv
@@ -50,4 +50,6 @@
 "access_stock_replacement_result","stock.replacement.result","model_stock_replacement_result","stock.group_stock_user",1,1,1,1
 "access_stock_ups","stock.ups","model_stock_ups","stock.group_stock_user",1,1,1,1
 "access_stock_ups_final","stock.ups.final","model_stock_ups_final","stock.group_stock_user",1,1,1,1
-"access_stock_ups_upload","stock.ups.upload","model_stock_ups_upload","stock.group_stock_user",1,1,1,1
\ No newline at end of file
+"access_stock_ups_upload","stock.ups.upload","model_stock_ups_upload","stock.group_stock_user",1,1,1,1
+"access_stock_split_into","stock.split.into","model_stock_split_into","stock.group_stock_user",1,1,1,0
+"access_stock_split_into_manager","stock.split.into","model_stock_split_into","stock.group_stock_manager",1,1,1,1
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index bf07fe15058..d824cefe2c7 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1192,8 +1192,8 @@
                                     <field name="prodlot_id" groups="base.group_extended"/>
                                       <button
                                            name="%(stock.track_line)d"
-                                           string="Split in production lots"
-                                            groups="base.group_extended" 
+                                           string="Split in production ii lots"
+                                            groups="base.group_extended"
                                            type="action" icon="terp-stock_effects-object-colorize"
                                            states="draft,waiting,confirmed,assigned" />
                                     <field name="tracking_id" groups="base.group_extended"/>
@@ -1385,8 +1385,8 @@
                         icon="gtk-convert" context="{'scrap': True}"
                         states="draft,waiting,confirmed,assigned" />
                     <field name="prodlot_id" groups="base.group_extended"/>
-                    <button name="%(track_line)d" string="Split" type="action"
-                        icon="gtk-justify-fill" attrs="{'invisible': [('prodlot_id','&lt;&gt;',False)]}"
+                    <button name="%(track_line)d" string="Split in Production Lots" type="action"
+                        icon="gtk-justify-fill" 
                         states="assigned,confirmed"
                         groups="base.group_extended"/>
                     <field groups="base.group_extended" name="tracking_id"/>
@@ -1595,27 +1595,23 @@
                             <field name="date_expected"/>
                             <field name="priority"/>
                             <field name="address_id" context="{'contact_display':'partner'}"/>
-                            <newline/>
+                            <field name="picking_id"/>
                             <newline/>
                             <field name="prodlot_id" groups="base.group_extended"
                                 context="{'location_id':location_id, 'product_id':product_id}"
                                 domain="[('product_id','=?',product_id)]"
                                 on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"/>
                             <field groups="base.group_extended" name="tracking_id"/>
-
                             <newline/>
-                            <field name="picking_id"/>
-                            <group col="2" colspan="2">
+                              <label/>
+	                            <button name="%(track_line)d" string="Split in production lots" 
+                              groups="base.group_extended" 
+                              type="action" icon="terp-stock_effects-object-colorize"/>
                               <label/>
 	                            <button name="%(split_into)d" string="Split Stock Moves" type="action"
                                 groups="base.group_extended" 
 	                            	icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
 	                            	states="draft,assigned,confirmed,done"/>
-                              <label/>
-	                            <button name="%(track_line)d" string="Split in production lots" 
-                              groups="base.group_extended" 
-                              type="action" icon="terp-stock_effects-object-colorize"/>
-                        	</group>
                             <separator colspan="4" string="Move State"/>
                             <field name="state"/>
                             <group col="5" colspan="2">
diff --git a/addons/stock/wizard/stock_splitinto.py b/addons/stock/wizard/stock_splitinto.py
index ff4cd588c47..d0f46e45658 100644
--- a/addons/stock/wizard/stock_splitinto.py
+++ b/addons/stock/wizard/stock_splitinto.py
@@ -69,13 +69,13 @@ class stock_split_into(osv.osv_memory):
             uos_qty = quantity / move_qty * move.product_uos_qty
             uos_qty_rest = quantity_rest / move_qty * move.product_uos_qty
             default_val = {
-                'product_qty': quantity,
+                'product_qty': quantity_rest,
                 'product_uos_qty': uos_qty,
                 'state': move.state
             }
             current_move = move_obj.copy(cr, uid, move.id, default_val)
             new_move.append(current_move)
-            update_val['product_qty'] = quantity_rest
+            update_val['product_qty'] = quantity
             update_val['tracking_id'] = tracking_id
             update_val['product_uos_qty'] = uos_qty_rest
             move_obj.write(cr, uid, [move.id], update_val)

From d2d3ab1a6d0c0efc876e7d449f5db08ea9a9fe67 Mon Sep 17 00:00:00 2001
From: Launchpad Code Hosting <codehost@crowberry>
Date: Thu, 17 Jun 2010 04:33:45 +0100
Subject: [PATCH 34/39] Launchpad automatic translations update.

bzr revid: codehost@crowberry-20100617033345-dxafwr55ev6k3x9j
---
 addons/account/i18n/it.po             | 2 +-
 addons/base_module_quality/i18n/it.po | 2 +-
 addons/board/i18n/nl_BE.po            | 2 +-
 addons/google_map/i18n/ru.po          | 2 +-
 addons/mrp_operations/i18n/hi.po      | 2 +-
 addons/mrp_repair/i18n/hi.po          | 2 +-
 addons/multi_company/i18n/it.po       | 2 +-
 addons/product/i18n/vi.po             | 2 +-
 addons/stock/i18n/nl.po               | 2 +-
 addons/stock/i18n/pl.po               | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/addons/account/i18n/it.po b/addons/account/i18n/it.po
index 499700a8777..d2a543a0a3e 100644
--- a/addons/account/i18n/it.po
+++ b/addons/account/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-16 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-06-17 03:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/base_module_quality/i18n/it.po b/addons/base_module_quality/i18n/it.po
index 565dd1e0f4d..3c18c0ec32e 100644
--- a/addons/base_module_quality/i18n/it.po
+++ b/addons/base_module_quality/i18n/it.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-16 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-06-17 03:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/board/i18n/nl_BE.po b/addons/board/i18n/nl_BE.po
index 2754b34b4bd..b36d1a918a6 100644
--- a/addons/board/i18n/nl_BE.po
+++ b/addons/board/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-16 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-06-17 03:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
diff --git a/addons/google_map/i18n/ru.po b/addons/google_map/i18n/ru.po
index c4f6acceef1..04619e44885 100644
--- a/addons/google_map/i18n/ru.po
+++ b/addons/google_map/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-16 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-06-17 03:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/mrp_operations/i18n/hi.po b/addons/mrp_operations/i18n/hi.po
index fa9b4ac9ef8..657860cae37 100644
--- a/addons/mrp_operations/i18n/hi.po
+++ b/addons/mrp_operations/i18n/hi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-16 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-06-17 03:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
diff --git a/addons/mrp_repair/i18n/hi.po b/addons/mrp_repair/i18n/hi.po
index 902b7bbf5bd..6136b1e992a 100644
--- a/addons/mrp_repair/i18n/hi.po
+++ b/addons/mrp_repair/i18n/hi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-16 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-06-17 03:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
diff --git a/addons/multi_company/i18n/it.po b/addons/multi_company/i18n/it.po
index aa820150b5a..1899d197277 100644
--- a/addons/multi_company/i18n/it.po
+++ b/addons/multi_company/i18n/it.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-16 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-06-17 03:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: multi_company
diff --git a/addons/product/i18n/vi.po b/addons/product/i18n/vi.po
index 35d5e643150..93bb2e12631 100644
--- a/addons/product/i18n/vi.po
+++ b/addons/product/i18n/vi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-16 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-06-17 03:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/stock/i18n/nl.po b/addons/stock/i18n/nl.po
index 25a0c9e5358..bc826ef796d 100644
--- a/addons/stock/i18n/nl.po
+++ b/addons/stock/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-16 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-06-17 03:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/pl.po b/addons/stock/i18n/pl.po
index aade911d099..95d22fcaa6c 100644
--- a/addons/stock/i18n/pl.po
+++ b/addons/stock/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-16 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-06-17 03:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock

From 24d7b1bcfc16d96626f3df5a8b541a63411744c6 Mon Sep 17 00:00:00 2001
From: "nel@tinyerp.com" <>
Date: Thu, 17 Jun 2010 10:11:22 +0200
Subject: [PATCH 35/39] [IMP] stock: set use exist to true when outgoing

bzr revid: nel@tinyerp.com-20100617081122-rfnwk4e5jh5sw7g1
---
 addons/stock/wizard/stock_move.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/stock/wizard/stock_move.py b/addons/stock/wizard/stock_move.py
index 5f930361dfe..d66972fd36b 100644
--- a/addons/stock/wizard/stock_move.py
+++ b/addons/stock/wizard/stock_move.py
@@ -183,6 +183,8 @@ class split_in_production_lot(osv.osv_memory):
             res.update({'product_uom': move.product_uom.id})
         if 'qty' in fields:
             res.update({'qty': move.product_qty})
+        if 'use_exist' in fields:
+            res.update({'use_exist': (move.picking_id and move.picking_id.type=='out' and True) or False})
         return res
 
     _columns = {

From 8c1ef52f0788b1652c43c53d8edc40ebb75d299d Mon Sep 17 00:00:00 2001
From: "nel@tinyerp.com" <>
Date: Thu, 17 Jun 2010 11:55:52 +0200
Subject: [PATCH 36/39] [IMP] stock split into add condition qty <=0

bzr revid: nel@tinyerp.com-20100617095552-teeaeyd2yuwb46y0
---
 addons/stock/wizard/stock_splitinto.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/wizard/stock_splitinto.py b/addons/stock/wizard/stock_splitinto.py
index d0f46e45658..9c01f380247 100644
--- a/addons/stock/wizard/stock_splitinto.py
+++ b/addons/stock/wizard/stock_splitinto.py
@@ -62,7 +62,7 @@ class stock_split_into(osv.osv_memory):
             move_qty = move.product_qty
             uos_qty_rest = move.product_uos_qty
             quantity_rest = move_qty - quantity
-            if quantity_rest == 0:
+            if (quantity_rest == 0) or (quantity <= 0) :
                 continue
             sequence = ir_sequence_obj.get(cr, uid, 'stock.lot.tracking')
             tracking_id = track_obj.create(cr, uid, {'name': sequence}, {'product_id': move.product_id.id})

From 42443c892d5b958f4b0460664547482af11a37cb Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.com>
Date: Thu, 17 Jun 2010 15:34:51 +0530
Subject: [PATCH 37/39] [IMP] crm, hr, project, stock, sale: Menu
 Re-organization.

bzr revid: uco@tinyerp.com-20100617100451-75hoxnbpjoo1clie
---
 addons/base_contact/base_contact_view.xml     |  2 +-
 addons/crm/crm_opportunity_view.xml           |  6 +++---
 addons/crm/crm_view.xml                       |  4 ++--
 addons/crm/report/crm_lead_report_view.xml    |  4 ++--
 .../crm/report/crm_phonecall_report_view.xml  |  2 +-
 addons/crm_claim/crm_claim_menu.xml           |  2 +-
 .../report/crm_claim_report_view.xml          |  2 +-
 addons/crm_helpdesk/crm_helpdesk_menu.xml     |  2 +-
 .../report/crm_helpdesk_report_view.xml       |  2 +-
 addons/hr_recruitment/hr_recruitment_view.xml | 20 +++++++++----------
 addons/hr_timesheet/hr_timesheet_report.xml   |  2 +-
 .../hr_timesheet_print_employee_view.xml      |  4 ++--
 .../wizard/hr_timesheet_print_users_view.xml  |  2 +-
 .../hr_timesheet_analytic_profit_view.xml     |  2 +-
 ...heet_invoice_analytic_cost_ledger_view.xml |  2 +-
 addons/mail_gateway/mail_gateway_view.xml     |  5 +++--
 .../report/task_report_view.xml               |  3 ++-
 .../report_intrastat_view.xml                 |  6 ++++--
 addons/sale/report/sale_report_view.xml       |  4 ++--
 .../report/sale_journal_report_view.xml       |  3 ++-
 addons/sale_journal/sale_journal_view.xml     |  2 +-
 addons/stock/__openerp__.py                   |  1 +
 addons/stock/report/__init__.py               |  1 +
 .../stock/report/report_stock_move_view.xml   |  4 ++--
 .../report/report_stock_picking_view.xml      |  3 ++-
 addons/stock_planning/stock_planning_view.xml |  4 ++--
 addons/thunderbird/thunderbird_installer.xml  |  3 ++-
 27 files changed, 53 insertions(+), 44 deletions(-)

diff --git a/addons/base_contact/base_contact_view.xml b/addons/base_contact/base_contact_view.xml
index 2145123599c..352e8cf62d3 100644
--- a/addons/base_contact/base_contact_view.xml
+++ b/addons/base_contact/base_contact_view.xml
@@ -132,7 +132,7 @@
             parent="base.menu_purchase_root" sequence="3"/>
     <menuitem id="base.menu_procurement_management_supplier_name" name="Suppliers"
             parent="base.menu_procurement_management_supplier" action="base.action_partner_supplier_form" sequence="1"/>
-    <menuitem name="Contacts" id="menu_partner_contact_form" action="action_partner_contact_form" 
+    <menuitem name="Contacts" id="menu_purchases_partner_contact_form" action="action_partner_contact_form" 
             parent = "base.menu_procurement_management_supplier" sequence="2"/>
 
     <!-- Views for Partners Form View -->
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 08530fcae27..550d82f86ac 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -15,7 +15,7 @@
 
         <menuitem action="crm_opportunity_categ_action"
             id="menu_crm_case_opportunity-act" name="Categories"
-            parent="menu_crm_config_opportunity" />
+            parent="menu_crm_config_opportunity" sequence="1"/>
 
         <!-- Opportunity Stages Form View-->
 
@@ -30,7 +30,7 @@
 
         <menuitem action="crm_opportunity_stage_act"
             id="menu_crm_opportunity_stage_act" name="Stages"
-            parent="menu_crm_config_opportunity" />
+            parent="menu_crm_config_opportunity" sequence="2"/>
 
         <!-- Opportunity Resource Type Form View -->
 
@@ -45,7 +45,7 @@
 
         <menuitem action="crm_opportunity_resource_act"
             id="menu_crm_opportunity_resource_act" name="Resource"
-            parent="menu_crm_config_opportunity" />
+            parent="menu_crm_config_opportunity" sequence="3"/>
 
         <!-- Opportunities Form View -->
 
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index a402be2c85b..b196d9cb4ca 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -169,7 +169,7 @@
 
         <menuitem action="crm_case_section_act"
             id="menu_crm_case_section_act" sequence="4"
-            parent="base.menu_crm_config_sales" />
+            parent="menu_crm_config_opportunity" />
 
 
 
@@ -354,7 +354,7 @@
        <menuitem action="crm_segmentation_tree-act"
             id="menu_crm_segmentation-act"
             groups="base.group_extended" sequence="5"
-            parent="base.menu_crm_config_sales" />
+            parent="menu_crm_config_opportunity" />
 
         <record model="ir.ui.view" id="view_users_form_simple_modif_inherited1">
             <field name="name">view.users.form.crm.modif.inherited1</field>
diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index 1eb4a2928a3..b9119325c52 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -232,10 +232,10 @@
        </record>
 
        <menuitem name="Leads Analysis" id="menu_report_crm_leads_tree"
-           parent="base.next_id_64" action="action_report_crm_lead" />
+           parent="base.next_id_64" action="action_report_crm_lead" sequence="3"/>
 
        <menuitem name="Opportunities Analysis" id="menu_report_crm_opportunities_tree"
-           parent="base.next_id_64" action="action_report_crm_opportunity" />
+           parent="base.next_id_64" action="action_report_crm_opportunity" sequence="4"/>
 
     </data>
 </openerp>
diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index 58136ea7a43..ccc6cd677f4 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -189,7 +189,7 @@
 
         <menuitem name="Phone Calls Analysis"
             action="action_report_crm_phonecall"
-            id="menu_report_crm_phonecalls_tree" parent="base.next_id_64" />
+            id="menu_report_crm_phonecalls_tree" parent="base.next_id_64" sequence="5"/>
 
     </data>
 </openerp>
diff --git a/addons/crm_claim/crm_claim_menu.xml b/addons/crm_claim/crm_claim_menu.xml
index e6ccdbe5bea..40f077d49f0 100644
--- a/addons/crm_claim/crm_claim_menu.xml
+++ b/addons/crm_claim/crm_claim_menu.xml
@@ -47,7 +47,7 @@
         </record>
 
         <menuitem name="Claims" id="menu_crm_case_claims"
-            parent="base.menu_aftersale" action="crm_case_categ_claim0" />
+            parent="base.menu_aftersale" action="crm_case_categ_claim0" sequence="1"/>
 
     </data>
 </openerp>
diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml
index 0664295b83d..f10f403c034 100644
--- a/addons/crm_claim/report/crm_claim_report_view.xml
+++ b/addons/crm_claim/report/crm_claim_report_view.xml
@@ -213,7 +213,7 @@
 
        <menuitem name="Claims" id="menu_report_crm_claim_tree"
            groups="base.group_extended"
-           action="action_report_crm_claim" parent="base.next_id_64" />
+           action="action_report_crm_claim" parent="base.next_id_64" sequence="6"/>
 
 
     </data>
diff --git a/addons/crm_helpdesk/crm_helpdesk_menu.xml b/addons/crm_helpdesk/crm_helpdesk_menu.xml
index 3d93f17e218..8ac1cb7df4b 100644
--- a/addons/crm_helpdesk/crm_helpdesk_menu.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_menu.xml
@@ -37,7 +37,7 @@
     </record>
 
     <menuitem name="Helpdesk and Support" id="menu_help_support_main"
-    	parent="base.menu_aftersale" action="crm_case_helpdesk_act111" />
+    	parent="base.menu_aftersale" action="crm_case_helpdesk_act111" sequence="2"/>
 
     </data>
 </openerp>
diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
index c6875e21a4a..1ebdb041a9a 100644
--- a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
+++ b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
@@ -181,7 +181,7 @@
 
         <menuitem name="Helpdesk" action="action_report_crm_helpdesk"
             groups="base.group_extended"
-            id="menu_report_crm_helpdesks_tree" parent="base.next_id_64" />
+            id="menu_report_crm_helpdesks_tree" parent="base.next_id_64" sequence="7"/>
 
     </data>
 </openerp>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 09f8cee6314..cb8e4e196d7 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -1,6 +1,16 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
+	    <menuitem
+	        id="menu_hr_recruitment_recruitment"
+	        name="Recruitment"
+	        parent="hr.menu_hr_configuration"
+	        sequence="2"/>
+	    <menuitem
+	        id="menu_hr_config_applicant"
+	        name="Applicant"
+	        parent="menu_hr_recruitment_recruitment"
+	        sequence="2"/>
 
     # ------------------------------------------------------
     # Job Categories
@@ -313,16 +323,6 @@
         <field name="view_id" ref="hr_recruitment_stage_tree"/>
     </record>
 
-    <menuitem
-        id="menu_hr_recruitment_recruitment"
-        name="Recruitment"
-        parent="hr.menu_hr_configuration"
-        sequence="2"/>
-    <menuitem
-        id="menu_hr_config_applicant"
-        name="Applicant"
-        parent="menu_hr_recruitment_recruitment"
-        sequence="2"/>
     <menuitem
         id="menu_hr_recruitment_stage"
         name="Stages"
diff --git a/addons/hr_timesheet/hr_timesheet_report.xml b/addons/hr_timesheet/hr_timesheet_report.xml
index f161c8c07f9..1354788f77b 100644
--- a/addons/hr_timesheet/hr_timesheet_report.xml
+++ b/addons/hr_timesheet/hr_timesheet_report.xml
@@ -10,7 +10,7 @@
             id="menu_hr_reporting_timesheet"
             name="Timesheet"
             parent="hr.menu_hr_reporting"
-            sequence="4" />
+            sequence="5" />
         <report auto="False" id="report_user_timesheet" menu="False" model="hr.employee" name="hr.analytical.timesheet" string="Employee timesheet" xsl="hr_timesheet/report/user_timesheet.xsl"/>
 
         <!--<wizard id="wizard_hr_timesheet" menu="False" model="hr.employee" name="hr.analytical.timesheet" string="Employee Timesheet"/>
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
index a3723d2adba..4c5ed013e1d 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
@@ -16,7 +16,7 @@
                 	</group>
                     <group colspan="4" col="6">
                     	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button icon="gtk-yes" string="Print" name="print_report" type="object"/>
+                    	<button icon="STOCK_PRINT" string="Print" name="print_report" type="object"/>
                    </group>
                </form>
             </field>
@@ -50,7 +50,7 @@
                 	</group>
                     <group colspan="4" col="6">
                     	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button icon="gtk-yes" string="Print" name="print_report" type="object"/>
+                    	<button icon="STOCK_PRINT" string="Print" name="print_report" type="object"/>
                    </group>
                </form>
             </field>
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
index 2d2af2a4769..fa1f4a80c9a 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
@@ -16,7 +16,7 @@
                 	</group>
                     <group colspan="4" col="6">
                     	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button icon="gtk-yes" string="Print" name="print_report" type="object"/>
+                    	<button icon="STOCK_PRINT" string="Print" name="print_report" type="object"/>
                    </group>
                </form>
             </field>
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml
index 16cf8cf8e8a..651edf9b2b1 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml
@@ -17,7 +17,7 @@
 				<separator colspan="4"/>
 			    <group col="2" colspan="4">
             		<button special="cancel"  string="Cancel" icon='gtk-cancel'/>
-					<button name="print_report" string="Print" colspan="1" type="object" icon="gtk-yes"/>
+					<button name="print_report" string="Print" colspan="1" type="object" icon="STOCK_PRINT"/>
 				</group>
 			</form>
             </field>
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_analytic_cost_ledger_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_analytic_cost_ledger_view.xml
index ea14e52ed52..bab9e1ff8e5 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_analytic_cost_ledger_view.xml
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_analytic_cost_ledger_view.xml
@@ -15,7 +15,7 @@
 				<separator colspan="4"/>
 			    <group col="2" colspan="4">
             		<button special="cancel"  string="Cancel" icon='gtk-cancel'/>
-					<button name="print_report" string="Print" colspan="1" type="object" icon="gtk-yes"/>
+					<button name="print_report" string="Print" colspan="1" type="object" icon="STOCK_PRINT"/>
 				</group>
 			</form>
             </field>
diff --git a/addons/mail_gateway/mail_gateway_view.xml b/addons/mail_gateway/mail_gateway_view.xml
index e5b7b426fe9..7b8ce52cbec 100644
--- a/addons/mail_gateway/mail_gateway_view.xml
+++ b/addons/mail_gateway/mail_gateway_view.xml
@@ -165,8 +165,9 @@
             <field name="act_window_id" ref="action_view_mailgate_thread"/>
         </record>
 
-            <menuitem id="menu_mailgate_thread" name="Mailgateway Threads" action="action_view_mailgate_thread"
-           parent="base.menu_base_config"  sequence="100"/>
+        <menuitem id="base.menu_base_config_mail" name="Mail" parent="base.menu_base_config" sequence="10"/>
+        <menuitem id="menu_mailgate_thread" name="Mailgateway Threads" action="action_view_mailgate_thread"
+           parent="base.menu_base_config_mail" sequence="5"/>
 
         <act_window domain="[('partner_id', '=', active_id), ('history', '=', True)]"
             id="act_res_partner_emails" name="Emails"
diff --git a/addons/project_timesheet/report/task_report_view.xml b/addons/project_timesheet/report/task_report_view.xml
index 5a653985a20..5886d5351dd 100644
--- a/addons/project_timesheet/report/task_report_view.xml
+++ b/addons/project_timesheet/report/task_report_view.xml
@@ -170,7 +170,8 @@
             <field name="context">{"search_default_user_id":uid}</field>
             <field name="search_view_id" ref="view_report_timesheet_task_user_search"/>
         </record>
-        <menuitem id="menu_timesheet_task_user" parent="hr.menu_hr_reporting" action="action_report_timesheet_task_user"/>
+        <menuitem id="menu_timesheet_task_user" parent="hr.menu_hr_reporting" 
+                    action="action_report_timesheet_task_user" sequence="4"/>
 
     </data>
 </openerp>
diff --git a/addons/report_intrastat/report_intrastat_view.xml b/addons/report_intrastat/report_intrastat_view.xml
index 4c949174714..f9a894efbe8 100644
--- a/addons/report_intrastat/report_intrastat_view.xml
+++ b/addons/report_intrastat/report_intrastat_view.xml
@@ -67,7 +67,8 @@
             <field name="view_mode">tree,form</field>
         </record>
 
-        <menuitem action="action_report_intrastat_code_tree" id="menu_report_intrastat_code" parent="product.prod_config_main"/>
+        <menuitem action="action_report_intrastat_code_tree" id="menu_report_intrastat_code" 
+                parent="base.menu_config_address_book" sequence="2"/>
 
 
         <record id="view_report_intrastat_tree" model="ir.ui.view">
@@ -119,6 +120,7 @@
             <field name="search_view_id" ref="view_report_intrastat_search"/>
         </record>
 
-        <menuitem action="action_report_intrastat_tree_all" id="menu_report_intrastat_all" parent="stock.next_id_61"/>
+        <menuitem action="action_report_intrastat_tree_all" id="menu_report_intrastat_all" 
+                parent="stock.next_id_61" sequence="6"/>
     </data>
 </openerp>
diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index b7dfd117ed0..de0cfaa95e2 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -126,7 +126,7 @@
     </record>
 
     <menuitem id="base.next_id_64" name="Reporting" parent="base.menu_base_partner" sequence="11"/>
-    <menuitem action="action_order_report_all" id="menu_report_product_all" parent="base.next_id_64" sequence="3"/>
+    <menuitem action="action_order_report_all" id="menu_report_product_all" parent="base.next_id_64" sequence="1"/>
 
     <record id="action_stock_move_report_so" model="ir.actions.act_window">
         <field name="name">Shipments Analysis</field>
@@ -135,7 +135,7 @@
         <field name="view_mode">tree,graph</field>
         <field name="context">{'search_default_month':1, 'search_default_group_product':1, 'search_default_group_partner':1, 'search_default_done':1, 'search_default_out': 1, 'group_by':[], 'group_by_no_leaf':1}</field>
     </record>
-    <menuitem action="action_stock_move_report_so" id="menu_action_stock_move_report_so" parent="base.next_id_64" sequence="8"/>
+    <menuitem action="action_stock_move_report_so" id="menu_action_stock_move_report_so" parent="base.next_id_64" sequence="25"/>
 
 
     <!--This views used in board_sale module -->
diff --git a/addons/sale_journal/report/sale_journal_report_view.xml b/addons/sale_journal/report/sale_journal_report_view.xml
index 19e93f58eb3..ae454f7674b 100644
--- a/addons/sale_journal/report/sale_journal_report_view.xml
+++ b/addons/sale_journal/report/sale_journal_report_view.xml
@@ -182,7 +182,8 @@
 			<field name="context">{'search_default_month':1, 'group_by_no_leaf':1,'group_by':[]}</field>
 		</record>
 
-		<menuitem name="Picking journal" id="menu_invoice_type_picking_stats_open_all" parent="stock.next_id_61" action="action_sale_journal_picking_report_open_menu_all"/>
+		<menuitem name="Picking journal" id="menu_invoice_type_picking_stats_open_all" parent="stock.next_id_61" 
+		          action="action_sale_journal_picking_report_open_menu_all" sequence="8"/>
 
 	</data>
 </openerp>
diff --git a/addons/sale_journal/sale_journal_view.xml b/addons/sale_journal/sale_journal_view.xml
index 86299968f4b..70b12997c54 100644
--- a/addons/sale_journal/sale_journal_view.xml
+++ b/addons/sale_journal/sale_journal_view.xml
@@ -134,7 +134,7 @@
             <field name="search_view_id" ref="view_sale_journal_search"/>
         </record>
 
-        <menuitem id="menu_definition_journal" name="Sales Journals" parent="base.menu_base_config"  action="action_definition_journal" sequence="60" />
+        <menuitem id="menu_definition_journal" name="Sales Journals" parent="product.prod_config_main"  action="action_definition_journal" sequence="70" />
 
     <!-- Inherit sales order form view -->
 
diff --git a/addons/stock/__openerp__.py b/addons/stock/__openerp__.py
index f0a03f9f2a5..74e069ac810 100644
--- a/addons/stock/__openerp__.py
+++ b/addons/stock/__openerp__.py
@@ -64,6 +64,7 @@ Thanks to the double entry management, the inventory controlling is powerful and
         "product_view.xml",
         "partner_view.xml",
         "report/report_stock_move_view.xml",
+        "report/report_stock_picking_view.xml",
         "report/report_stock_view.xml",
         "security/stock_security.xml",
         "security/ir.model.access.csv",
diff --git a/addons/stock/report/__init__.py b/addons/stock/report/__init__.py
index 381644fcd32..ab4b2e16599 100644
--- a/addons/stock/report/__init__.py
+++ b/addons/stock/report/__init__.py
@@ -26,5 +26,6 @@ import picking
 import lot_overview
 import lot_overview_all
 import report_stock
+import report_stock_picking
 import report_stock_move
 
diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index 0f41c0e4b3b..a8ca0df98dc 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -124,7 +124,7 @@
         <field name="search_view_id"  ref="view_stock_search"/>
         <field name="context">{'contact_display': 'partner', 'search_default_month':1, 'search_default_group_product':1,'search_default_done':1,'group_by':[], 'group_by_no_leaf':1}</field>
     </record>
-    <menuitem action="action_stock_move_report" id="menu_action_stock_move_report" parent="next_id_61" sequence="5"/>
+    <menuitem action="action_stock_move_report" id="menu_action_stock_move_report" parent="next_id_61" sequence="3"/>
 
     <!-- Inventory Control -->
 
@@ -219,7 +219,7 @@
         <field name="search_view_id"  eval="False"/>
         <field name="context">{'contact_display': 'partner', 'search_default_real':1, 'search_default_location_type_internal':1,'search_default_group_product':1,'search_default_group_location':1,'group_by':[], 'group_by_no_leaf':1}</field>
     </record>
-    <menuitem action="action_stock_inventory_report" id="menu_action_stock_inventory_report" parent="next_id_61" sequence="5"/>
+    <menuitem action="action_stock_inventory_report" id="menu_action_stock_inventory_report" parent="next_id_61" sequence="4"/>
 
 
 </data>
diff --git a/addons/stock/report/report_stock_picking_view.xml b/addons/stock/report/report_stock_picking_view.xml
index 83405f2c1bf..b8e5d4ff868 100644
--- a/addons/stock/report/report_stock_picking_view.xml
+++ b/addons/stock/report/report_stock_picking_view.xml
@@ -129,7 +129,8 @@
 	        <field name="act_window_id" ref="action_report_report_stock_picking"/>
 	    </record>
 
-        <menuitem name="Picking" action="action_report_report_stock_picking" id="menu_report_report_stock_pickings_tree" parent="next_id_61"/>
+        <menuitem name="Picking" action="action_report_report_stock_picking" 
+                id="menu_report_report_stock_pickings_tree" parent="stock.next_id_61" sequence="5"/>
 
   </data>
 </openerp>
diff --git a/addons/stock_planning/stock_planning_view.xml b/addons/stock_planning/stock_planning_view.xml
index d95f49cbd70..4306c6216eb 100644
--- a/addons/stock_planning/stock_planning_view.xml
+++ b/addons/stock_planning/stock_planning_view.xml
@@ -3,9 +3,9 @@
 <data>
         <menuitem id="menu_stock_period_main"
                   name="Stock and Sales Periods"
-                  parent="base.menu_base_config"/>
+                  parent="base.menu_base_config" sequence="20"/>
 
-<!-- Creating periods section -->
+    <!-- Creating periods section -->
 
     <record id="view_stock_period_createlines_form" model="ir.ui.view">
             <field name="name">stock.period.createlines.form</field>
diff --git a/addons/thunderbird/thunderbird_installer.xml b/addons/thunderbird/thunderbird_installer.xml
index 34812a38cee..17b7db6f71d 100644
--- a/addons/thunderbird/thunderbird_installer.xml
+++ b/addons/thunderbird/thunderbird_installer.xml
@@ -105,7 +105,8 @@
       <field name="target">new</field>
     </record>
 
-	<menuitem id="menu_base_config_plugins" name="Plugins" parent="base.menu_base_config" sequence="10" />
+    <menuitem id="base.menu_base_config_mail" name="Mail" parent="base.menu_base_config" sequence="10"/>
+	<menuitem id="menu_base_config_plugins" name="Plugins" parent="base.menu_base_config_mail" sequence="10" />
 	<menuitem id="menu_base_config_plugins_thunderbird" action="action_thunderbird_wizard" name="Thunderbird" parent="menu_base_config_plugins" sequence="10" />
 
   </data>

From 6fd4f9e65da53119f5fb15fc05a8e75faa130c2f Mon Sep 17 00:00:00 2001
From: "nel@tinyerp.com" <>
Date: Thu, 17 Jun 2010 13:42:24 +0200
Subject: [PATCH 38/39] [IMP] stock views

bzr revid: nel@tinyerp.com-20100617114224-fdegrmygwfefxcpg
---
 addons/stock/stock_view.xml | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 6f5ef15f900..e2c79a6499a 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -681,10 +681,13 @@
 
                                             <newline/>
                                             <label/>
-                                            <button name="%(track_line)d" string="Split in production lots" type="action" icon="terp-stock_effects-object-colorize"
+                                            <button name="%(track_line)d" string="Split in production lots" 
+                                             states="draft,waiting,confirmed,assigned"
+                                            type="action" icon="terp-stock_effects-object-colorize"
                                               groups="base.group_extended" />
                                             <button name="%(move_scrap)d" string="Scrap Move Line" type="action" icon="gtk-justify-fill"/>
                                             <button name="%(split_into)d" string="Split Stock Moves" type="action"
+                                                states="draft,assigned,confirmed,done"
                                                 groups="base.group_extended" 
                                                 icon="terp-stock_effects-object-colorize" />
                                             <separator colspan="4" string="Move State"/>
@@ -798,8 +801,8 @@
                                     <field groups="base.group_extended" name="tracking_id"/>
                                     <button name="%(split_into)d" string="Split Stock Moves" type="action"
                                         icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
-                                        groups="base.group_extended" 
-                                        states="draft,assigned,confirmed,done"/>
+                                        states="draft,assigned,confirmed,done"
+                                        groups="base.group_extended"/>
                                     <button name="setlast_tracking" string="Set Last Tracking" type="object"
                                         attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}" 
                                         groups="base.group_extended" 
@@ -847,6 +850,7 @@
                                             <label/>
                                             <button name="%(track_line)d" string="Split in production lots" 
                                             groups="base.group_extended" 
+                                            states="draft,waiting,confirmed,assigned"
                                             type="action" icon="terp-stock_effects-object-colorize"/>
                                             <label/>
                                             <button name="%(split_into)d" string="Split Stock Moves" type="action"
@@ -999,7 +1003,7 @@
                                     <field name="prodlot_id" groups="base.group_extended"/>
                                     <button name="%(track_line)d" string="Split in production lots" type="action"
                                         icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('prodlot_id','&lt;&gt;',False)]}"
-                                        states="assigned,confirmed,done"
+                                        states="draft,assigned,confirmed,done"
                                         groups="base.group_extended"/>
                                     <field name="tracking_id" groups="base.group_extended"/>
                                   <button name="%(split_into)d" string="Split Stock Moves" type="action"
@@ -1041,6 +1045,7 @@
                                             <field groups="base.group_extended" name="tracking_id"/>
                                             <label/>
                                             <button name="%(track_line)d" string="Split in production lots" type="action" icon="terp-stock_effects-object-colorize"
+                                                states="draft,assigned,confirmed,done"
                                                 groups="base.group_extended" 
                                              />
                                             <label/>
@@ -1388,7 +1393,7 @@
                     <field name="prodlot_id" groups="base.group_extended"/>
                     <button name="%(track_line)d" string="Split in Production Lots" type="action"
                         icon="gtk-justify-fill" 
-                        states="assigned,confirmed"
+                       states="draft,waiting,confirmed,assigned"
                         groups="base.group_extended"/>
                     <field groups="base.group_extended" name="tracking_id"/>
                     <button name="%(split_into)d" string="Split Stock Moves" type="action"
@@ -1459,6 +1464,7 @@
                                   <label/>
                                 	<button name="%(track_line)d"
                                     groups="base.group_extended" 
+                                   states="draft,waiting,confirmed,assigned"
                                    string="Split in production lots" type="action" icon="terp-stock_effects-object-colorize" colspan="2" />
                                   <label/>
                                     <button name="%(split_into)d" string="Split Stock Moves" type="action"
@@ -1550,7 +1556,7 @@
                     <field name="prodlot_id" groups="base.group_extended"/>
                     <button name="%(track_line)d" string="Split in production lots" type="action"
                         icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('prodlot_id','&lt;&gt;',False)]}"
-                        states="assigned,confirmed,done"
+                       states="draft,waiting,confirmed,assigned"
                         context="{'default_use_exist': picking_id.type=='in'}"
                         groups="base.group_extended"/>
                     <field name="tracking_id" groups="base.group_extended"/>
@@ -1606,6 +1612,7 @@
                             <newline/>
                               <label/>
 	                            <button name="%(track_line)d" string="Split in production lots" 
+                               states="draft,waiting,confirmed,assigned"
                               groups="base.group_extended" 
                               type="action" icon="terp-stock_effects-object-colorize"/>
                               <label/>

From b8bc3af4d81819234fda1904ead95f121968ad4d Mon Sep 17 00:00:00 2001
From: Launchpad Code Hosting <codehost@crowberry>
Date: Fri, 18 Jun 2010 04:33:08 +0100
Subject: [PATCH 39/39] Launchpad automatic translations update.

bzr revid: codehost@crowberry-20100618033308-7p6kb07l11bx3hgc
---
 addons/account/i18n/it.po             |   2 +-
 addons/base_module_quality/i18n/it.po |   2 +-
 addons/board/i18n/nl_BE.po            |   2 +-
 addons/google_map/i18n/ru.po          |   2 +-
 addons/mrp_operations/i18n/hi.po      |   2 +-
 addons/mrp_repair/i18n/hi.po          |   2 +-
 addons/multi_company/i18n/et.po       |   8 +-
 addons/multi_company/i18n/it.po       |   2 +-
 addons/product/i18n/vi.po             |   2 +-
 addons/stock/i18n/es.po               | 125 ++++++++++----------------
 addons/stock/i18n/nl.po               |   2 +-
 addons/stock/i18n/pl.po               |   2 +-
 12 files changed, 60 insertions(+), 93 deletions(-)

diff --git a/addons/account/i18n/it.po b/addons/account/i18n/it.po
index d2a543a0a3e..6cb23888049 100644
--- a/addons/account/i18n/it.po
+++ b/addons/account/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-17 03:33+0000\n"
+"X-Launchpad-Export-Date: 2010-06-18 03:32+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/base_module_quality/i18n/it.po b/addons/base_module_quality/i18n/it.po
index 3c18c0ec32e..c804964322a 100644
--- a/addons/base_module_quality/i18n/it.po
+++ b/addons/base_module_quality/i18n/it.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-17 03:33+0000\n"
+"X-Launchpad-Export-Date: 2010-06-18 03:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/board/i18n/nl_BE.po b/addons/board/i18n/nl_BE.po
index b36d1a918a6..e2c3c12f7ee 100644
--- a/addons/board/i18n/nl_BE.po
+++ b/addons/board/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-17 03:33+0000\n"
+"X-Launchpad-Export-Date: 2010-06-18 03:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
diff --git a/addons/google_map/i18n/ru.po b/addons/google_map/i18n/ru.po
index 04619e44885..a49640e7293 100644
--- a/addons/google_map/i18n/ru.po
+++ b/addons/google_map/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-17 03:33+0000\n"
+"X-Launchpad-Export-Date: 2010-06-18 03:32+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/mrp_operations/i18n/hi.po b/addons/mrp_operations/i18n/hi.po
index 657860cae37..5deebdc4ed1 100644
--- a/addons/mrp_operations/i18n/hi.po
+++ b/addons/mrp_operations/i18n/hi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-17 03:33+0000\n"
+"X-Launchpad-Export-Date: 2010-06-18 03:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
diff --git a/addons/mrp_repair/i18n/hi.po b/addons/mrp_repair/i18n/hi.po
index 6136b1e992a..db96e91247a 100644
--- a/addons/mrp_repair/i18n/hi.po
+++ b/addons/mrp_repair/i18n/hi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-17 03:33+0000\n"
+"X-Launchpad-Export-Date: 2010-06-18 03:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
diff --git a/addons/multi_company/i18n/et.po b/addons/multi_company/i18n/et.po
index 960a121dbda..207e057f662 100644
--- a/addons/multi_company/i18n/et.po
+++ b/addons/multi_company/i18n/et.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-12-08 11:46+0000\n"
-"PO-Revision-Date: 2010-05-07 15:09+0000\n"
-"Last-Translator: lyyser <logard.1961@gmail.com>\n"
+"PO-Revision-Date: 2010-06-17 16:39+0000\n"
+"Last-Translator: Timo Tambet <Unknown>\n"
 "Language-Team: Estonian <et@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-08 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-06-18 03:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: multi_company
@@ -61,7 +61,7 @@ msgstr ""
 #. module: multi_company
 #: field:multi_company.default,company_dest_id:0
 msgid "Default Company"
-msgstr ""
+msgstr "Vaikimisi kompanii"
 
 #. module: multi_company
 #: field:multi_company.default,object_id:0
diff --git a/addons/multi_company/i18n/it.po b/addons/multi_company/i18n/it.po
index 1899d197277..7bafb4a347e 100644
--- a/addons/multi_company/i18n/it.po
+++ b/addons/multi_company/i18n/it.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-17 03:33+0000\n"
+"X-Launchpad-Export-Date: 2010-06-18 03:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: multi_company
diff --git a/addons/product/i18n/vi.po b/addons/product/i18n/vi.po
index 93bb2e12631..3b8ccf75ba7 100644
--- a/addons/product/i18n/vi.po
+++ b/addons/product/i18n/vi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-17 03:33+0000\n"
+"X-Launchpad-Export-Date: 2010-06-18 03:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/stock/i18n/es.po b/addons/stock/i18n/es.po
index 563a23a48e9..a7e23b3e396 100644
--- a/addons/stock/i18n/es.po
+++ b/addons/stock/i18n/es.po
@@ -7,14 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-05-18 13:11+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2010-06-17 23:43+0000\n"
+"Last-Translator: mikel <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-19 05:11+0000\n"
+"X-Launchpad-Export-Date: 2010-06-18 03:32+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
@@ -30,12 +29,12 @@ msgstr "Ubicación encadenada si fija"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_SAVE"
-msgstr "Guardar existencia"
+msgstr "STOCK_SAVE"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_15
 msgid "Sub Products"
-msgstr "Sub Producto"
+msgstr "Sub productos"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -45,7 +44,7 @@ msgstr "terp-account"
 #. module: stock
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "Nombre de modelo no válido en la definición de acción."
+msgstr "Nombre de modelo no válido en la definición de la acción."
 
 #. module: stock
 #: model:ir.module.module,shortdesc:stock.module_meta_information
@@ -104,7 +103,7 @@ msgstr "Rellenar inventario para una determinada ubicación"
 #: view:stock.picking:0
 #: field:stock.picking.move.wizard,picking_id:0
 msgid "Packing list"
-msgstr "Lista Picking"
+msgstr "Albarán"
 
 #. module: stock
 #: rml:lot.stock.overview:0
@@ -142,7 +141,7 @@ msgstr "Empresa"
 #. module: stock
 #: help:product.product,track_incoming:0
 msgid "Force to use a Production Lot during receptions"
-msgstr "Forzar a usar un lote de producción durante la recepción"
+msgstr "Fuerza a usar un lote de producción durante la recepción"
 
 #. module: stock
 #: field:stock.move,move_history_ids:0
@@ -160,12 +159,12 @@ msgstr "Lote de producción"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_NEW"
-msgstr "Nueva existencia"
+msgstr "STOCK_NEW"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_CANCEL"
-msgstr "Cancelar existencia"
+msgstr "STOCK_CANCEL"
 
 #. module: stock
 #: selection:stock.location,usage:0
@@ -190,7 +189,7 @@ msgstr "Valor stock real"
 #. module: stock
 #: view:stock.move:0
 msgid "UOM"
-msgstr "UOM"
+msgstr "UdM"
 
 #. module: stock
 #: selection:stock.move,state:0
@@ -207,17 +206,17 @@ msgstr "Hacer envíos parciales"
 #. module: stock
 #: wizard_view:stock.partial_picking,end2:0
 msgid "Packing result"
-msgstr "Resultado empaquetado"
+msgstr "Resultado albarán"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_QUIT"
-msgstr "Quitar existencias"
+msgstr "STOCK_QUIT"
 
 #. module: stock
 #: field:stock.warehouse,lot_output_id:0
 msgid "Location Output"
-msgstr "Localizacion de salidas"
+msgstr "Ubicación de salida"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -278,7 +277,7 @@ msgstr "Empaquetado"
 #. module: stock
 #: rml:stock.picking.list:0
 msgid "Order(Origin)"
-msgstr "Orden (origen)"
+msgstr "Pedido (origen)"
 
 #. module: stock
 #: rml:lot.location:0
@@ -291,12 +290,12 @@ msgstr "Gran Total"
 #: view:stock.location:0
 #: field:stock.location,comment:0
 msgid "Additional Information"
-msgstr "Información Adicional"
+msgstr "Información adicional"
 
 #. module: stock
 #: selection:stock.invoice_onshipping,init,type:0
 msgid "Customer Refund"
-msgstr "Reembolso del cliente"
+msgstr "Factura rectificativa (abono) de cliente"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -350,12 +349,12 @@ msgstr "Clientes"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_UNDERLINE"
-msgstr "Existencia bajo lineas"
+msgstr "STOCK_UNDERLINE"
 
 #. module: stock
 #: view:stock.picking.move.wizard:0
 msgid "Move Lines"
-msgstr "Líneas de movimiento"
+msgstr "Líneas movimiento"
 
 #. module: stock
 #: wizard_field:stock.fill_inventory,init,recursive:0
@@ -401,7 +400,7 @@ msgstr "terp-graph"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_PREFERENCES"
-msgstr "Existencias prioritarias"
+msgstr "STOCK_PREFERENCES"
 
 #. module: stock
 #: rml:lot.location:0
@@ -420,7 +419,7 @@ msgstr "Procesar ahora"
 #. module: stock
 #: field:stock.location,address_id:0
 msgid "Location Address"
-msgstr "Dirección de la ubicación"
+msgstr "Dirección ubicación"
 
 #. module: stock
 #: help:stock.move,prodlot_id:0
@@ -451,7 +450,7 @@ msgstr "Propiedades de stock"
 #. module: stock
 #: wizard_button:stock.partial_picking,init,split:0
 msgid "Make Picking"
-msgstr "Empaquetar"
+msgstr "Realizar albarán"
 
 #. module: stock
 #: model:stock.location,name:stock.location_procurement
@@ -477,7 +476,7 @@ msgstr "Id producto"
 #. module: stock
 #: view:res.partner:0
 msgid "Sales & Purchases"
-msgstr "Ventas & Compras"
+msgstr "Ventas y Compras"
 
 #. module: stock
 #: selection:stock.invoice_onshipping,init,type:0
@@ -558,12 +557,12 @@ msgstr "Reporte de inventario por lotes de producción"
 #. module: stock
 #: field:stock.location,stock_virtual:0
 msgid "Virtual Stock"
-msgstr "Existencia virtual"
+msgstr "Stock virtual"
 
 #. module: stock
 #: selection:stock.location,usage:0
 msgid "View"
-msgstr "Ver"
+msgstr "Vista"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -594,7 +593,7 @@ msgstr "STOCK_GOTO_BOTTOM"
 #: model:ir.actions.act_window,name:stock.action_picking_form
 #: model:ir.ui.menu,name:stock.menu_action_picking_form
 msgid "New Reception Packing"
-msgstr "Nueva recepcion de paquete"
+msgstr "Nuevo albarán de entrada"
 
 #. module: stock
 #: wizard_field:stock.move.track,init,quantity:0
@@ -607,7 +606,7 @@ msgstr "Cantidad por lote"
 #: view:stock.move:0
 #: view:stock.picking:0
 msgid "Stock Moves"
-msgstr "Movimientos de existencias"
+msgstr "Movimientos de stock"
 
 #. module: stock
 #: field:product.template,property_stock_production:0
@@ -647,7 +646,7 @@ msgstr "STOCK_DIALOG_QUESTION"
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
 msgid "Manual Operation"
-msgstr "Manual de operación"
+msgstr "Operación manual"
 
 #. module: stock
 #: field:stock.picking,date_done:0
@@ -750,7 +749,7 @@ msgstr "Revisiones de lote de producción"
 #. module: stock
 #: view:stock.picking:0
 msgid "Packing Done"
-msgstr "Paquete realizado"
+msgstr "Albarán realizado"
 
 #. module: stock
 #: selection:stock.move,state:0
@@ -764,7 +763,7 @@ msgstr "En espera"
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree7
 #: model:ir.ui.menu,name:stock.menu_picking_waiting
 msgid "Available Packing"
-msgstr "Empaquetado disponible"
+msgstr "Albarán disponible"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_warehouse
@@ -817,7 +816,7 @@ msgstr "STOCK_CONNECT"
 #: model:ir.ui.menu,name:stock.menu_action_picking_all
 #: wizard_field:stock.picking.make,init,pickings:0
 msgid "Packing"
-msgstr "Empaquetado/Albarán"
+msgstr "Albarán"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -923,7 +922,7 @@ msgstr "Fecha creación"
 #. module: stock
 #: selection:stock.picking,type:0
 msgid "Sending Goods"
-msgstr "Enviar mercancías"
+msgstr "Envío mercancías"
 
 #. module: stock
 #: view:stock.picking:0
@@ -990,7 +989,7 @@ msgstr "STOCK_APPLY"
 #. module: stock
 #: wizard_view:stock.partial_picking,end2:0
 msgid "The packing has been successfully made !"
-msgstr "¡El paquete ha sido realizado correctamente!"
+msgstr "¡El albarán ha sido realizado correctamente!"
 
 #. module: stock
 #: field:stock.move,address_id:0
@@ -1133,7 +1132,7 @@ msgstr "STOCK_HARDDISK"
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_relate_picking
 msgid "Related Picking"
-msgstr "Paquete relacionado"
+msgstr "Albarán relacionado"
 
 #. module: stock
 #: field:stock.incoterms,name:0
@@ -1177,7 +1176,7 @@ msgstr "STOCK_COPY"
 #. module: stock
 #: selection:stock.invoice_onshipping,init,type:0
 msgid "Supplier Refund"
-msgstr "Factura de abono de proveedor"
+msgstr "Factura rectificativa (abono) de proveedor"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move
@@ -1193,7 +1192,7 @@ msgstr "Cuenta salida stock"
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
 msgid "Automatic No Step Added"
-msgstr "Automático paso no añadido"
+msgstr "Mov. automático, paso no añadido"
 
 #. module: stock
 #: wizard_view:stock.location.products,init:0
@@ -1302,7 +1301,7 @@ msgstr "Método entrega"
 #. module: stock
 #: model:ir.actions.wizard,name:stock.partial_picking
 msgid "Partial packing"
-msgstr "Empaquetado parcial"
+msgstr "Albarán parcial"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1589,7 +1588,7 @@ msgstr "Cantidad (UdV)"
 #: model:ir.actions.act_window,name:stock.action_picking_tree5
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree5
 msgid "Packing to Process"
-msgstr "Paquetes a procesar"
+msgstr "Albaranes a procesar"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1599,7 +1598,7 @@ msgstr "STOCK_MEDIA_STOP"
 #. module: stock
 #: view:stock.move:0
 msgid "Set Available"
-msgstr "Fijar disponible"
+msgstr "Cambiar a disponible"
 
 #. module: stock
 #: model:ir.actions.wizard,name:stock.make_picking
@@ -1803,13 +1802,13 @@ msgstr "Altura (Z)"
 #: field:stock.inventory.line,product_uom:0
 #: field:stock.move,product_uom:0
 msgid "Product UOM"
-msgstr "UdM del producto"
+msgstr "UdM producto"
 
 #. module: stock
 #: rml:lot.stock.overview:0
 #: rml:lot.stock.overview_all:0
 msgid "Variants"
-msgstr "Variante"
+msgstr "Variantes"
 
 #. module: stock
 #: field:stock.location,posx:0
@@ -1936,8 +1935,9 @@ msgstr ""
 "Se utiliza sólo si selecciona un tipo de ubicación encadenada.\n"
 "La opción 'Movimiento automático' creará un movimiento de stock después del "
 "actual que se validará automáticamente. Con 'Operación manual', el "
-"movimiento de stock debe ser validado por un trabajador. Con 'Automático "
-"paso no añadido', la ubicación se reemplaza en el movimiento original."
+"movimiento de stock debe ser validado por un trabajador. Con 'Mov. "
+"automático, paso no añadido', la ubicación se reemplaza en el movimiento "
+"original."
 
 #. module: stock
 #: field:stock.location,icon:0
@@ -2190,7 +2190,7 @@ msgstr "STOCK_JUSTIFY_CENTER"
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree3
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree8
 msgid "Confirmed Packing Waiting Availability"
-msgstr "Paquete confirmado esperando disponibilidad"
+msgstr "Albarán confirmado esperando disponibilidad"
 
 #. module: stock
 #: field:stock.location,posy:0
@@ -2309,7 +2309,7 @@ msgstr "Cerrar"
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_move_labels
 msgid "Print Item Labels"
-msgstr "Imprimir etiquetas de elementos"
+msgstr "Imprimir etiquetas"
 
 #. module: stock
 #: view:stock.move:0
@@ -2428,36 +2428,3 @@ msgstr "Estado de movimientos"
 #: model:stock.location,name:stock.stock_location_locations
 msgid "Physical Locations"
 msgstr "Ubicaciones físicas"
-
-#~ msgid ""
-#~ "OpenERP Stock Management module can manage multi-warehouses, multi and "
-#~ "structured stock locations.\n"
-#~ "Thanks to the double entry management, the inventory controlling is powerful "
-#~ "and flexible:\n"
-#~ "* Moves history and planning,\n"
-#~ "* Different inventory methods (FIFO, LIFO, ...)\n"
-#~ "* Stock valuation (standard or average price, ...)\n"
-#~ "* Robustness faced with Inventory differences\n"
-#~ "* Automatic reordering rules (stock level, JIT, ...)\n"
-#~ "* Bar code supported\n"
-#~ "* Rapid detection of mistakes through double entry system\n"
-#~ "* Traceability (upstream/downstream, production lots, serial number, ...)\n"
-#~ "    "
-#~ msgstr ""
-#~ "El módulo de gestión de stocks de OpenERP puede gestionar multi-almacenes y "
-#~ "multi-ubicaciones jerárquicas de stock.\n"
-#~ "Gracias a la gestión de partida doble, el control de inventario es potente y "
-#~ "flexible:\n"
-#~ "* Historial de movimientos y planificación,\n"
-#~ "* Métodos de inventario diferentes (FIFO, LIFO ...)\n"
-#~ "* Valoración de existencias (estándar o precio medio ...)\n"
-#~ "* Robustez frente a las diferencias de inventario\n"
-#~ "* Reglas automáticas de abastecimiento (nivel de stock mínimo, JIT ...)\n"
-#~ "* Soporte a código de barras\n"
-#~ "* Detección rápida de errores a través de sistema de partida doble\n"
-#~ "* Trazabilidad (hacia arriba/abajo, lotes de producción, número de serie "
-#~ "...)\n"
-#~ "    "
-
-#~ msgid "Stock Management"
-#~ msgstr "Gestión de inventario"
diff --git a/addons/stock/i18n/nl.po b/addons/stock/i18n/nl.po
index bc826ef796d..b23167068e2 100644
--- a/addons/stock/i18n/nl.po
+++ b/addons/stock/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-17 03:33+0000\n"
+"X-Launchpad-Export-Date: 2010-06-18 03:32+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/pl.po b/addons/stock/i18n/pl.po
index 95d22fcaa6c..bf7f8757a7b 100644
--- a/addons/stock/i18n/pl.po
+++ b/addons/stock/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-17 03:33+0000\n"
+"X-Launchpad-Export-Date: 2010-06-18 03:32+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock