From 514ab7423adabe8060d74ddb9a33b9eb3665ec95 Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Fri, 23 Apr 2010 19:20:17 +0530
Subject: [PATCH 01/82] [IMP] stock: Task ID-581: Converted stock_ups and
 stock_replacement wizards into osv_memory wizards.

bzr revid: mtr@mtr-20100423135017-bg5iuwdyodj1dbao
---
 addons/stock/wizard/__init__.py               |  4 +-
 addons/stock/wizard/stock_replacement.py      | 68 ++++++++++++++
 .../stock/wizard/stock_replacement_view.xml   | 41 +++++++++
 addons/stock/wizard/stock_ups.py              | 91 +++++++++++++++++++
 addons/stock/wizard/stock_ups_view.xml        | 56 ++++++++++++
 addons/stock/wizard/wizard_replacement.py     | 60 ------------
 addons/stock/wizard/wizard_ups.py             | 85 -----------------
 7 files changed, 258 insertions(+), 147 deletions(-)
 create mode 100644 addons/stock/wizard/stock_replacement.py
 create mode 100644 addons/stock/wizard/stock_replacement_view.xml
 create mode 100644 addons/stock/wizard/stock_ups.py
 create mode 100644 addons/stock/wizard/stock_ups_view.xml
 delete mode 100644 addons/stock/wizard/wizard_replacement.py
 delete mode 100644 addons/stock/wizard/wizard_ups.py

diff --git a/addons/stock/wizard/__init__.py b/addons/stock/wizard/__init__.py
index 8fac3041fb3..82825000eaa 100644
--- a/addons/stock/wizard/__init__.py
+++ b/addons/stock/wizard/__init__.py
@@ -23,8 +23,8 @@ import stock_traceability
 import stock_move
 import stock_partial_picking
 import stock_partial_move
-import wizard_replacement
-import wizard_ups
+import stock_replacement
+import stock_ups
 import stock_inventory_merge
 import stock_inventory_set_stock_zero
 import stock_fill_inventory
diff --git a/addons/stock/wizard/stock_replacement.py b/addons/stock/wizard/stock_replacement.py
new file mode 100644
index 00000000000..e753206ec34
--- /dev/null
+++ b/addons/stock/wizard/stock_replacement.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
+from service import web_services
+from tools.translate import _
+import netsvc
+import pooler
+import time
+import wizard
+
+class stock_replacement(osv.osv_memory):
+    """
+        This class has been defined for replacement wizard
+    """
+    _name = "stock.replacement"
+    _description = "Stock Replacement"
+
+    def get_composant(self, cr, uid, ids, context):
+        return {}
+
+    def replace_composant(self, cr, uid, ids, context):
+        """ 
+           to open a new wizard that acknowledge, a replacement task 
+            
+           @return: it returns the replacement acknowledgement form
+        
+        """                
+        return {
+                    'name': False, 
+                    'view_type': 'form', 
+                    'view_mode': 'form', 
+                    'res_model': 'stock.replacement.result', 
+                    'type': 'ir.actions.act_window', 
+                    'target':'new',
+            }
+
+stock_replacement()
+
+class stock_replacement_result(osv.osv_memory):
+    """
+        This class has been defined for replacement result 
+    """
+    _name = "stock.replacement.result"
+    _description = "Stock Replacement result"
+
+stock_replacement_result()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/stock/wizard/stock_replacement_view.xml b/addons/stock/wizard/stock_replacement_view.xml
new file mode 100644
index 00000000000..ce5f7efbc9f
--- /dev/null
+++ b/addons/stock/wizard/stock_replacement_view.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+	<record id="view_stock_replacement" model="ir.ui.view">
+                <field name="name">Stock Replacement</field>
+                <field name="model">stock.replacement</field>
+                <field name="type">form</field>
+                <field name="arch" type="xml">
+	                <form string="Replace a component">
+	                	<label string="Component" colspan="4"/>
+						<separator string="" colspan="4" />
+	                	<button icon='gtk-cancel' special="cancel" string="Cancel" />
+	                	<button name="replace_composant" string="Replace" type="object" />
+	                </form>
+	            </field>
+	        </record>	        
+     	
+			<act_window name="Stock Replacement"		    
+				res_model="stock.replacement"
+				src_model=""
+				view_mode="form"
+				target="new"        
+				key2="client_action_multi"    
+				id="action_view_stock_replacement"/>
+
+
+            <record id="view_stock_replacement_result" model="ir.ui.view">
+                <field name="name">Stock Replacement result</field>
+                <field name="model">stock.replacement.result</field>
+                <field name="type">form</field>
+                <field name="arch" type="xml">
+	                <form string="Replace result">
+	                	<label string="Replacing successful !" colspan="4"/>
+						<separator string="" colspan="4" />
+	                	<button special="cancel" string="Ok" />
+	                </form>
+	            </field>
+		</record>
+
+  	</data>
+</openerp>
diff --git a/addons/stock/wizard/stock_ups.py b/addons/stock/wizard/stock_ups.py
new file mode 100644
index 00000000000..ad6e15725db
--- /dev/null
+++ b/addons/stock/wizard/stock_ups.py
@@ -0,0 +1,91 @@
+# -*- 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 service import web_services
+from tools.translate import _
+import netsvc
+import pooler
+import time
+import wizard
+
+class stock_ups(osv.osv_memory):
+    _name = "stock.ups"
+    _description = "Stock ups"
+
+    def ups_save(self, cr, uid, ids, context):
+       
+        return {
+                    'name': False, 
+                    'view_type': 'form', 
+                    'view_mode': 'form', 
+                    'res_model': 'stock.ups.final', 
+                    'type': 'ir.actions.act_window', 
+                    'target':'new',
+            }
+    def ups_upload(self, cr, uid, ids, context):
+         
+        return {
+                    'name': False, 
+                    'view_type': 'form', 
+                    'view_mode': 'form', 
+                    'res_model': 'stock.ups.upload', 
+                    'type': 'ir.actions.act_window', 
+                    'target':'new',
+            }
+    _columns = {
+        'weight': fields.float('Lot weight', required=True), 
+    }
+
+    _defaults = {
+        'weight': lambda *a: 3.0,
+    }
+stock_ups()
+
+class stock_ups_final(osv.osv_memory):
+    _name = "stock.ups.final"
+    _description = "Stock ups final"
+
+#    def create_xmlfile(self, cr, uid, ids, context):
+#        report = netsvc._group['report']['report.stock.move.lot.ups_xml']
+#        data['report_type'] = 'raw'
+#        return {'xmlfile' : report.create(uid, context['active_id'], ids, {})}
+
+    _columns = {
+        'xmlfile': fields.binary('XML File'), 
+    }
+
+stock_ups_final()
+
+class stock_ups_upload(osv.osv_memory):
+    _name = "stock.ups.upload"
+    _description = "Stock ups upload"
+
+    def upload_xmlfile(self, cr, uid, ids, context):
+#        report = netsvc._group['report']['report.stock.move.lot.ups_xml']
+#        data['report_type'] = 'raw'
+#FIXME: this seems unfinished   
+#        fp = file('/tmp/test.xml', 'w').write(report.create(uid, context['active_id'], ids, {}))
+        return {}
+
+stock_ups_upload()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/stock/wizard/stock_ups_view.xml b/addons/stock/wizard/stock_ups_view.xml
new file mode 100644
index 00000000000..89b5fe131e8
--- /dev/null
+++ b/addons/stock/wizard/stock_ups_view.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+	<data>
+
+		<record id="view_stock_ups" model="ir.ui.view">
+			<field name="name">Stock ups</field>
+			<field name="model">stock.ups</field>
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+				<form string="UPS XML generator">
+					<separator string="UPS generator" colspan="4"/>
+					<field name="weight" />
+					<separator string="" colspan="4" />
+					<button icon='gtk-cancel' special="cancel" string="Cancel" />
+					<button name="ups_save" string="Get xml file" type="object" />
+					<button name="ups_upload" string="Upload xml file" type="object" />
+				</form>
+			</field>
+		</record>
+
+		<record id="view_stock_ups_final" model="ir.ui.view">
+			<field name="name">Stock ups</field>
+			<field name="model">stock.ups.final</field>
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+				<form string="UPS XML generator">
+        			<separator string="Save the attached file" colspan="4" />
+					<field name="xmlfile" />
+					<button  special="cancel" string="End" />
+					<button name="create_xmlfile" string="create xml file" type="object" />
+				</form>
+			</field>
+		</record>
+	        
+		<record id="view_stock_ups_upload" model="ir.ui.view">
+			<field name="name">Stock ups</field>
+			<field name="model">stock.ups.upload</field>
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+				<form string="UPS XML generator">
+					<separator string="File uploaded" colspan="4" />
+					<button  special="cancel" string="End" />
+					<button name="upload_xmlfile" string="Upload xml file" type="object" />
+				</form>
+			</field>
+		</record>		        
+     	
+		<act_window name="Stock ups"		    
+			res_model="stock.ups"
+			src_model=""
+			view_mode="form"
+			target="new"        
+			key2="client_action_multi"    
+			id="action_view_stock_ups"/>
+</data>
+</openerp>
diff --git a/addons/stock/wizard/wizard_replacement.py b/addons/stock/wizard/wizard_replacement.py
deleted file mode 100644
index 5b066aaab9f..00000000000
--- a/addons/stock/wizard/wizard_replacement.py
+++ /dev/null
@@ -1,60 +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 wizard
-
-class wizard_replacement(wizard.interface):
-
-    def getComposant(self, cr, uid, data, context):
-        return {}
-
-    def replaceComposant(self, cr, uid, data, context):
-        return {}
-
-    comp_form = '''<?xml version="1.0"?><form string="Replace a component"><label string="Component" colspan="4"/></form>'''
-    comp_fields = {}
-
-    replace_form = '''<?xml version="1.0"?><form string="Replace result"><label string="Replacing successful !" colspan="4" /></form>'''
-    replace_fields = {}
-
-    states = {
-            'init' : {
-                'actions' : [getComposant],
-                'result' : {
-                    'type' : 'form',
-                    'arch' : comp_form,
-                    'fields' : comp_fields,
-                    'state' : [('end', 'Cancel'), ('replace', 'Replace')]}
-                },
-            'replace' : {
-                'action' : [replaceComposant],
-                'result' : {
-                    'type' : 'form',
-                    'arch' : replace_form,
-                    'fields' : replace_fields,
-                    'state' : [('end', 'Ok')]}
-                },
-            }
-
-wizard_replacement('stock.move.replace')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/stock/wizard/wizard_ups.py b/addons/stock/wizard/wizard_ups.py
deleted file mode 100644
index f57128c78fc..00000000000
--- a/addons/stock/wizard/wizard_ups.py
+++ /dev/null
@@ -1,85 +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 os
-
-import wizard
-import netsvc
-import time
-
-_ups_form = '''<?xml version="1.0"?>
-<form string="UPS XML generator">
-    <separator string="UPS generator" colspan="4"/>
-    <field name="weight" />
-</form>'''
-
-_ups_fields = {
-    'weight' : { 'string' : 'Lot weight', 'type' : 'float', 'default' : lambda *a: 3.0, 'required' : True },
-}
-
-_ups_finalform = '''<?xml version="1.0"?>
-<form string="UPS XML generator">
-    <separator string="Save the attached file" colspan="4" />
-    <field name="xmlfile" />
-</form>'''
-
-_ups_finalfields = {
-    'xmlfile' : { 'string' : 'XML File', 'type' : 'binary' },
-}
-
-_ups_uploadform = '''<?xml version="1.0"?>
-<form string="UPS XML generator">
-    <separator string="File uploaded" colspan="4" />
-</form>'''
-
-_ups_uploadfields = {}
-
-def create_xmlfile(self, cr, uid, data, context):
-    report = netsvc._group['report']['report.stock.move.lot.ups_xml']
-    data['report_type'] = 'raw'
-    return {'xmlfile' : report.create(uid, data['ids'], data, {})}
-
-def upload_xmlfile(self, cr, uid, data, context):
-    report = netsvc._group['report']['report.stock.move.lot.ups_xml']
-    data['report_type'] = 'raw'
-#FIXME: this seems unfinished   
-    fp = file('/tmp/test.xml', 'w').write(report.create(uid, data['ids'], data, {}))
-    return {}
-
-class wiz_ups(wizard.interface):
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type': 'form', 'arch' : _ups_form, 'fields' : _ups_fields, 'state':[('end','Cancel'),('ups_save','Get xml file'), ('ups_upload', 'Upload xml file')]}
-        },
-        'ups_save': {
-            'actions': [create_xmlfile],
-            'result': {'type': 'form', 'arch' : _ups_finalform, 'fields' : _ups_finalfields, 'state':[('end', 'End')]}
-        },
-        'ups_upload' : {
-            'actions' : [upload_xmlfile],
-            'result' : {'type' : 'form', 'arch' : _ups_uploadform, 'fields' : _ups_uploadfields, 'state' : [('end', 'End')]}
-        },
-    }
-wiz_ups('stock.ups_xml');
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-

From e50af1b1cdebdbebac850df5cee93c33610f0108 Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Tue, 27 Apr 2010 16:22:34 +0530
Subject: [PATCH 02/82] [IMP] mrp: Task ID-580:mrp order report prints Consumed
 Products and Products to Consume

bzr revid: mtr@mtr-20100427105234-ewal7ucch210zb7c
---
 addons/mrp/report/order.rml | 95 +++++++++++++++++++++++++++++++------
 1 file changed, 81 insertions(+), 14 deletions(-)

diff --git a/addons/mrp/report/order.rml b/addons/mrp/report/order.rml
index 7bc2e7e7ee5..af55afce91b 100644
--- a/addons/mrp/report/order.rml
+++ b/addons/mrp/report/order.rml
@@ -135,19 +135,36 @@
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
     </blockTableStyle>
+    <blockTableStyle id="Table7">
+      <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"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table10">
+      <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"/>
+    </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="Standard" fontName="Times-Roman"/>
-    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Standard" fontName="Helvetica"/>
+    <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Table Contents" fontName="Times-Roman"/>
-    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/>
-    <paraStyle name="Caption" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Index" fontName="Times-Roman"/>
-    <paraStyle name="Footer" fontName="Times-Roman"/>
-    <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+    <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Contents" fontName="Helvetica"/>
+    <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER"/>
+    <paraStyle name="Caption" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Helvetica"/>
+    <paraStyle name="Footer" fontName="Helvetica"/>
+    <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
     <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
@@ -172,6 +189,7 @@
   </stylesheet>
   <images/>
   <story>
+   <section>
     <para style="terp_default_8">[[ repeatIn(objects,'o') ]] </para>
     <para style="terp_default_8">
       <font color="white"> </font>
@@ -313,7 +331,10 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
+    <section>
+    <para style="terp_default_Bold_9">Products to Consume</para>
     <blockTable colWidths="235.0,82.0,107.0,104.0" style="Table8">
+	  <para> <font color="white"> [[ o.move_lines ==[] and removeParentNode('section')]]</font></para>    
       <tr>
         <td>
           <para style="terp_tblheader_Details">Product </para>
@@ -329,9 +350,10 @@
         </td>
       </tr>
     </blockTable>
+    </section>
     <section>
-      <para style="terp_default_8">[[ repeatIn(o.move_lines,'line') ]]</para>
       <blockTable colWidths="235.0,47.0,34.0,108.0,104.0" style="Table9">
+       <para style="terp_default_8">[[ repeatIn(o.move_lines,'line') ]]</para>
         <tr>
           <td>
             <para style="terp_default_9">[[ line.product_id.code ]] [[ line.product_id.name ]]</para>
@@ -350,9 +372,54 @@
           </td>
         </tr>
       </blockTable>
-      <para style="terp_default_2">
-        <font color="white"> </font>
-      </para>
+      </section>
+	  <para style="terp_default_space">
+      <font color="white"> </font>
+    </para>
+    <section>
+    <para style="terp_default_Bold_9">Consumed Products</para>
+	   
+      <blockTable colWidths="235.0,82.0,107.0,104.0" style="Table7">
+      <para> <font color="white"> [[ o.move_lines2 ==[] and removeParentNode('section')]]</font></para>
+        <tr>
+          <td>
+            <para style="terp_tblheader_Details">Product </para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Centre">Quantity</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Centre">Source Location</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Centre">Destination Location</para>
+          </td>
+        </tr>
+      </blockTable>
+      </section>
+      <section>
+      <blockTable colWidths="235.0,47.0,34.0,108.0,104.0" style="Table10">
+	  <para style="terp_default_8">[[ repeatIn(o.move_lines2,'line2') ]]</para>      
+        <tr>
+          <td>
+            <para style="terp_default_9">[[ line2.product_id.code ]] [[ line2.product_id.name ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ formatLang( line2.product_qty) ]] </para>
+          </td>
+          <td>
+            <para style="terp_default_9">[[line2.product_uom.name]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Centre_9">[[ line2.location_id.name ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Centre_9">[[ line2.location_dest_id.name ]]</para>
+          </td>
+        </tr>
+      </blockTable>
+    
     </section>
+     </section>
   </story>
-</document>
+</document>
\ No newline at end of file

From 30e926932eea39ccd2c583ac66765616d10854eb Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Wed, 28 Apr 2010 19:01:28 +0530
Subject: [PATCH 03/82] [IMP] mrp: Task ID-582:search view of BoMs-add routing

bzr revid: mtr@mtr-20100428133128-2bcf84kvq8wi6yvg
---
 addons/mrp/mrp_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 5b8b7c41084..b5eb5e66379 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -248,7 +248,7 @@
                         <newline/>
                         <field name="product_uom"/>
                         <field name="product_qty"/>
-                        <field name="routing_id" groups="base.group_extended"/>
+                        <field name="routing_id" groups="base.group_extended" select="1"/>
                         <newline/>
                         <field name="product_uos" groups="product.group_uos"/>
                         <field name="product_uos_qty" groups="product.group_uos"/>

From 00039c9690ed13a7795f5c2df5060ef195acadc3 Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Thu, 29 Apr 2010 13:38:26 +0530
Subject: [PATCH 04/82] [IMP] mrp product purchase purchase_requisition sale
 sale_crm sale_journal  stock stock_planning : Task ID-595:remove select=1
 from all search views and all form view having a search view defined for the
 same object

bzr revid: mtr@mtr-20100429080826-6zrk5ol1f44twscv
---
 addons/mrp/mrp_view.xml                       |  34 +--
 addons/product/product_view.xml               |  20 +-
 addons/purchase/purchase_view.xml             |  12 +-
 .../purchase_requisition_view.xml             |  20 +-
 addons/sale/sale_view.xml                     |  40 ++--
 addons/sale_crm/sale_crm_view.xml             |   2 +-
 addons/sale_journal/picking_journal_view.xml  |  28 +--
 .../picking_journal_view_report.xml           |  32 +--
 addons/sale_journal/sale_journal_view.xml     |  40 ++--
 addons/stock/product_view.xml                 |   4 +-
 addons/stock/report/report_stock_view.xml     |   8 +-
 addons/stock/stock_view.xml                   | 198 +++++++++---------
 addons/stock_planning/stock_planning_view.xml |  36 ++--
 13 files changed, 237 insertions(+), 237 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index b5eb5e66379..202e2dadaf2 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -453,10 +453,10 @@
             <field name="arch" type="xml">
                 <form string="Manufacturing Orders">
                     <group colspan="4" col="6">
-                        <field name="name" select="1" string="Reference"/>
-                        <field name="date_planned" select="1"/>
-                        <field name="origin" select="1"/>
-                        <field name="product_id" on_change="product_id_change(product_id)" select="1"/>
+                        <field name="name" string="Reference"/>
+                        <field name="date_planned"/>
+                        <field name="origin"/>
+                        <field name="product_id" on_change="product_id_change(product_id)"/>
                         <field name="product_qty"/>
                         <group colspan="2" col="3">
                         <field name="product_uom"/>
@@ -475,7 +475,7 @@
                     <notebook colspan="4">
                         <page string="Consumed Products">
                             <field name="bom_id" domain="[('product_id','=',product_id),('bom_id','=',False)]" on_change="bom_id_change(bom_id)"/>
-                            <field name="routing_id" groups="base.group_extended" select="1"/>
+                            <field name="routing_id" groups="base.group_extended"/>
                             <field name="location_src_id" domain="[('usage','=','internal')]" on_change="location_id_change(location_src_id,location_dest_id)"/>
                             <field name="location_dest_id" domain="[('usage','=','internal')]"/>
                             <separator string="" colspan="4"/>
@@ -574,8 +574,8 @@
                         <page string="Work Orders" groups="base.group_extended">
                             <field colspan="4" name="workcenter_lines" nolabel="1">
                                 <form string="Production Work Centers">
-                                    <field colspan="4" name="name" select="1"/>
-                                    <field colspan="4" name="workcenter_id" select="1"/>
+                                    <field colspan="4" name="name"/>
+                                    <field colspan="4" name="workcenter_id"/>
                                     <field name="sequence"/>
                                     <field name="cycle"/>
                                     <field name="hour"/>
@@ -593,7 +593,7 @@
                             <field colspan="4" name="product_lines" nolabel="1" widget="one2many_list"/>
                         </page>
                         <page string="Extra Information">
-                            <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
+                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                             <field name="priority" groups="base.group_extended"/>
                             <newline/>
                             <field name="date_start"/>
@@ -794,20 +794,20 @@
                 <form string="Procurement">
                     <group col="2" colspan="2">
                         <separator colspan="2" string="References"/>
-                        <field name="name" select="1" string="Procurement Reason"/>
+                        <field name="name" string="Procurement Reason"/>
                         <field name="origin"/>
-                        <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
+                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     </group>
                     <group col="2" colspan="2">
                         <separator colspan="2" string="Planification"/>
-                        <field name="date_planned" select="1"/>
+                        <field name="date_planned"/>
                         <field name="procure_method"/>
                         <field name="priority" groups="base.group_extended"/>
                     </group>
                     <notebook colspan="4">
                     <page string="Procurement Details">
                         <separator colspan="4" string="Product &amp; Location"/>
-                        <field name="product_id" select="1" on_change="onchange_product_id(product_id)"/>
+                        <field name="product_id" on_change="onchange_product_id(product_id)"/>
                         <field name="location_id" domain="[('usage','=','internal')]"/>
                         <field name="product_qty"/>
                         <field name="product_uom"/>
@@ -950,11 +950,11 @@
             <field name="arch" type="xml">
                 <search string="Minimum Stock Rules Search">
                     <group col="10" colspan="4">
-                        <field name="name" select="1" />
-                        <field name="warehouse_id" select="1" widget="selection"/>
-                        <field name="location_id" select="1" />
-                        <field name="company_id" select="1" widget="selection"/>
-                        <field name="product_id" select="1"/>
+                        <field name="name"/>
+                        <field name="warehouse_id" widget="selection"/>
+                        <field name="location_id"/>
+                        <field name="company_id" widget="selection"/>
+                        <field name="product_id"/>
                     </group>
                     <newline/>
                     <group expand="1" string="Group By..." colspan="4" col="10">
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index b9858e19eaf..d4943bf4db4 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -14,12 +14,12 @@
                    <filter string="Can be sold" icon="terp-stock" domain="[('sale_ok','=',1)]"/>
                    <filter string="Can be Purchased" icon="terp-stock" domain="[('purchase_ok', '=', 1)]" />
                    <separator orientation="vertical"/>
-                   <field name="default_code" select="1"/>
-                   <field name="name" select="1"/>
-                   <field name="categ_id" select="1" widget="selection" operator="child_of"/>
+                   <field name="default_code"/>
+                   <field name="name"/>
+                   <field name="categ_id" widget="selection" operator="child_of"/>
                    <newline/>
                    <group col='8' colspan='14' expand="1" string="Extended options...">
-                       <field name="pricelist_id" select="1" widget="selection" context="{'pricelist': self}" />
+                       <field name="pricelist_id" widget="selection" context="{'pricelist': self}" />
                    </group>
                    <newline/>
                    <group col='8' colspan='15' expand='1' string='Group by...'>
@@ -65,12 +65,12 @@
                    <group colspan="4" col="6">
                     <group colspan="4" col="2">
                         <separator string="Product Description" colspan="4"/>
-                        <field name="name" select="1"  />
+                        <field name="name"/>
                         <field groups="product.group_product_variant" name="variants" />
                     </group>
                     <group colspan="1" col="2">
                         <separator string="Codes" colspan="2"/>
-                        <field name="default_code" select="1"/>
+                        <field name="default_code"/>
                         <field name="ean13" groups="base.group_extended"/>
                     </group>
                     <group colspan="1" col="2">
@@ -99,7 +99,7 @@
 
                             <group colspan="2" col="2" name="status">
                                 <separator string="Status" colspan="2"/>
-                                <field name="categ_id" select="1"/>
+                                <field name="categ_id"/>
                                 <field name="state"/>
                                 <field groups="base.group_extended" name="product_manager"/>
                             </group>
@@ -162,10 +162,10 @@
                         <page groups="base.group_extended" string="Packaging">
                             <field colspan="4" name="packaging" nolabel="1">
                                 <form string="Packaging">
-                                    <field name="ean" select="1"/>
+                                    <field name="ean"/>
                                     <field name="sequence" invisible="1"/>
                                     <newline/>
-                                    <field name="qty" select="1"/>
+                                    <field name="qty"/>
                                     <field name="ul"/>
                                     <field name="weight_ul"/>
                                     <separator colspan="4" string="Palletization"/>
@@ -177,7 +177,7 @@
                                     <field name="width"/>
                                     <field name="length"/>
                                     <separator colspan="4" string="Other Info"/>
-                                    <field colspan="4" name="name" select="1"/>
+                                    <field colspan="4" name="name"/>
                                 </form>
                             </field>
                         </page>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index c301116db2a..1a10aca3ac1 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -68,7 +68,7 @@
             <field name="arch" type="xml">
                 <form string="Purchase Order">
                     <group col="6" colspan="4">
-                        <field name="name" select="1"/>
+                        <field name="name"/>
                         <field name="date_order"/>
                         <field name="invoiced"/>
                         <newline/>
@@ -79,7 +79,7 @@
                     </group>
                     <notebook colspan="4">
                         <page string="Purchase Order">
-                            <field name="partner_id" on_change="onchange_partner_id(partner_id)" select="1" domain="[('supplier','=', 1)]"/>
+                            <field name="partner_id" on_change="onchange_partner_id(partner_id)" domain="[('supplier','=', 1)]"/>
                             <field name="partner_address_id"/>
                             <field domain="[('type','=','purchase')]" name="pricelist_id" groups="base.group_extended"/>
                             <field name="partner_ref"/>
@@ -157,10 +157,10 @@
                     <separator orientation="vertical"/>
                     <filter icon="terp-purchase" string="To Invoice" domain="[('invoiced','=',1)]" separator="1"/>
                     <separator orientation="vertical"/>
-                    <field name="name" select="1" string="Reference"/>
-                    <field name="partner_id" select="1"/>
-                    <field name="product_id" select="1"/>
-                    <field name="create_uid" select="1" widget="selection">
+                    <field name="name" string="Reference"/>
+                    <field name="partner_id"/>
+                    <field name="product_id"/>
+                    <field name="create_uid" widget="selection">
                         <filter icon="terp-partner" domain="[('create_uid','=',uid)]" help="My Purchase Orders"/>
                     </field>
                 </group>
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index 5ce49ec3693..e5ed52f7a35 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -33,13 +33,13 @@
         <field name="arch" type="xml">
             <form string="Purchase Requisition">
                 <group colspan="4" col="6">
-                    <field name="name" select="1"/>
-                    <field name="user_id" select="1"/>
-                    <field name="exclusive" select="1"/>
+                    <field name="name"/>
+                    <field name="user_id"/>
+                    <field name="exclusive"/>
                     <field name="date_start"/>
                     <field name="date_end"/>
                     <field name="origin"/>
-					<field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
+					<field name="company_id" groups="base.group_multi_company" widget="selection"/>                    
                 </group>
 
                 <notebook colspan="4">
@@ -72,7 +72,7 @@
                 </notebook>
 				<separator colspan="4"/>
 	                <group col="8" colspan="4">
-	                    <field name="state" select="1" readonly ="1"/>
+	                    <field name="state" readonly ="1"/>
 						<button name="tender_in_progress" states="draft" string="Confirm" type="object" icon="gtk-apply" />
 	                    <button name="tender_reset" states="done,cancel" string="Reset to Draft" type="object" icon="gtk-convert" />
 						<button name="tender_done" states="in_progress" string="Done" type="object" icon="gtk-jump-to" />
@@ -108,13 +108,13 @@
                  <group col='10' colspan='4'>
                     <filter icon="terp-purchase" string=" Current" domain="[('state','=','draft,in_progress')]" separator="1" help="Current Purchaes Requisition"/>
                     <separator orientation="vertical"/>
-                    <field name="name" select="1" string="Requisition Reference"/>
-                    <field name="purchase_ids" select="1"/>
-                    <field name="user_id" select="1" widget="selection">
+                    <field name="name" string="Requisition Reference"/>
+                    <field name="purchase_ids"/>
+                    <field name="user_id" widget="selection">
                         <filter icon="terp-partner" domain="[('create_uid','=',uid)]" help="My Requisition "/>
                     </field>
-                    <field name="exclusive" select="1" />
-                    <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
+                    <field name="exclusive"/>
+                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                 </group>
                 <newline/>
                   <group expand="1" string="Group By..." colspan="4" col="10">
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 7433520234e..123aa463b60 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -97,16 +97,16 @@
             <field name="arch" type="xml">
                 <form string="Sales order">
                     <group col="6" colspan="4">
-                        <field name="name" select="1"/>
+                        <field name="name"/>
                         <field name="client_order_ref"/>
                         <field name="shipped"/>
-                        <field name="date_order" select="1"/>
+                        <field name="date_order"/>
                         <field name="shop_id" on_change="onchange_shop_id(shop_id)" widget="selection" groups="base.group_extended"/>
                         <field name="invoiced"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Sale Order">
-                            <field name="partner_id" on_change="onchange_partner_id(partner_id)" required="1" select="1"/>
+                            <field name="partner_id" on_change="onchange_partner_id(partner_id)" required="1"/>
                             <field domain="[('partner_id','=',partner_id)]" name="partner_order_id"/>
                             <field domain="[('partner_id','=',partner_id)]" name="partner_invoice_id"/>
                             <field domain="[('partner_id','=',partner_id)]" name="partner_shipping_id"/>
@@ -123,12 +123,12 @@
                                                 context="partner_id=parent.partner_id,quantity=product_uom_qty,pricelist=parent.pricelist_id,shop=parent.shop_id,uom=product_uom"
                                                 name="product_id"
                                                 on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], True, parent.date_order, product_packaging, parent.fiscal_position)"
-                                                select="1"/>
+                                                />
                                             <field
                                                 context="partner_id=parent.partner_id,quantity=product_uom_qty,pricelist=parent.pricelist_id,shop=parent.shop_id,uom=product_uom"
                                                 name="product_uom_qty"
                                                 on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], False, parent.date_order, product_packaging, parent.fiscal_position, True)"
-                                                select="1"/>
+                                                />
                                             <field name="product_uom"
                                                 on_change="product_uom_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], False, parent.date_order)"/>
                                             <field
@@ -256,12 +256,12 @@
                     <filter icon="terp-sale" string="Running" domain="[('state','in',('manual','progress'))]"/>
                     <filter icon="terp-sale" string="Sales To Invoice" domain="[('state','=','manual')]"/>
                     <separator orientation="vertical"/>
-                    <field name="name" select="1"/>
-                    <field name="partner_id" select="1"/>
-                    <field name="user_id" select="1" widget="selection">
+                    <field name="name"/>
+                    <field name="partner_id"/>
+                    <field name="user_id" widget="selection">
                         <filter icon="terp-partner" domain="[('user_id','=',uid)]" help="My Sale Orders" default="1"/>
                     </field>
-                    <field name="date_order" select="1" string="Order date" />
+                    <field name="date_order" string="Order date" />
                     <newline/>
                     <group expand="1" string="Group By..." colspan="11" col="11">
                         <filter string="Customer" icon="terp-sale" domain="[]" context="{'group_by':'partner_id'}"/>
@@ -366,11 +366,11 @@
                     <notebook>
                         <page string="Order Lines">
                             <separator colspan="4" string="General Information"/>
-                            <field name="order_id" select="1"/>
-                            <field name="order_partner_id" readonly="1" select="1" invisible="1"/>
+                            <field name="order_id"/>
+                            <field name="order_partner_id" readonly="1" invisible="1"/>
                             <field name="product_uom_qty" readonly="1"/>
                             <field name="product_uom"/>
-                            <field name="product_id" readonly="1" select="1"/>
+                            <field name="product_id" readonly="1"/>
                             <field name="invoiced"/>
                             <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                             <separator colspan="4" string="Manual Designation"/>
@@ -417,10 +417,10 @@
                 <search string="Search Sales Order">
                     <filter icon="terp-purchase" string="To Invoice" domain="[('invoiced','&lt;&gt;', 1),('state','=','done')]" separator="1"/>
                     <separator orientation="vertical"/>
-                    <field name="order_id" select="1"/>
-                    <field name="order_partner_id" select="1"/>
-                    <field name="product_id" select="1"/>
-                    <field name="salesman_id" select="1" widget="selection">
+                    <field name="order_id"/>
+                    <field name="order_partner_id"/>
+                    <field name="product_id"/>
+                    <field name="salesman_id" widget="selection">
                         <filter icon="terp-sale" domain="[('salesman_id','=',uid)]" help="My Sale Order Lines"/>
                         <filter icon="terp-sale" domain="[('salesman_id','child_of',[uid])]" help="My Departments Sale Order Lines"/>
                     </field>
@@ -449,10 +449,10 @@
                         domain="[('invoiced','&lt;&gt;', 1),('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]"  default="1"
                         separator="1" />
                     <separator orientation="vertical"/>
-                    <field name="order_id" select="1"/>
-                    <field name="order_partner_id" select="1"/>
-                    <field name="product_id" select="1"/>
-                    <field name="state" select="1"/>
+                    <field name="order_id"/>
+                    <field name="order_partner_id"/>
+                    <field name="product_id"/>
+                    <field name="state"/>
                     <newline />
                     <group expand="1" string="Group By..." colspan="9" col="8">
                         <filter string="Product" icon="terp-sale" domain="[]" context="{'group_by':'product_id'}"/>
diff --git a/addons/sale_crm/sale_crm_view.xml b/addons/sale_crm/sale_crm_view.xml
index 24912052190..7c8e9319e5e 100644
--- a/addons/sale_crm/sale_crm_view.xml
+++ b/addons/sale_crm/sale_crm_view.xml
@@ -34,7 +34,7 @@
         <field name="inherit_id" ref="sale.view_sales_order_filter"/>
         <field name="arch" type="xml">
             <field name="date_order" position="after">
-                <field name="section_id" default="context.get('section_id', False)" select="1" widget="selection" string="Section">
+                <field name="section_id" default="context.get('section_id', False)" widget="selection" string="Section">
                     <filter icon="terp-crm"
                             domain="[('section_id','=',context.get('section_id',False))]"
                             groups="base.group_extended"
diff --git a/addons/sale_journal/picking_journal_view.xml b/addons/sale_journal/picking_journal_view.xml
index 7d2d657b7de..37e7e4846c1 100644
--- a/addons/sale_journal/picking_journal_view.xml
+++ b/addons/sale_journal/picking_journal_view.xml
@@ -10,12 +10,12 @@
                 <notebook>
                 <page string="Journal">
                     <separator string="Journal Information" colspan="4"/>
-                    <field name="name" select="1"/>
-                    <field name="code" select="1"/>
-                    <field name="user_id" select="1"/>
-                    <field name="date" select="1"/>
-                    <field name="date_created" select="1"/>
-                    <field name="date_validation" select="1"/>
+                    <field name="name"/>
+                    <field name="code"/>
+                    <field name="user_id"/>
+                    <field name="date"/>
+                    <field name="date_created"/>
+                    <field name="date_validation"/>
                     <separator string="States" colspan="4"/>
                     <field name="state"/>
                     <group col="3" colspan="2">
@@ -41,10 +41,10 @@
         <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Picking Journal">
-                <field name="name" select="1"/>
-                <field name="code" select="1"/>
-                <field name="user_id" select="1"/>
-                <field name="date" select="1"/>
+                <field name="name"/>
+                <field name="code"/>
+                <field name="user_id"/>
+                <field name="date"/>
                 <field name="state"/>
             </tree>
         </field>
@@ -60,10 +60,10 @@
                     <filter icon="terp-hr" string="My Picking Journals" domain="[('user_id','=',uid)]" help="My Picking Journals"/>
                     <filter icon="terp-hr" string="Open" domain="[('state','=','open')]" help="Open Picking Journals"/>
                     <separator orientation="vertical"/>
-                    <field name="name" select="1"/>
-                    <field name="code" select="1"/>
-                    <field name="user_id" select="1" widget="selection"/>
-                    <field name="date" select="1"/>
+                    <field name="name"/>
+                    <field name="code"/>
+                    <field name="user_id" widget="selection"/>
+                    <field name="date"/>
                 </group>
             </search>
         </field>
diff --git a/addons/sale_journal/picking_journal_view_report.xml b/addons/sale_journal/picking_journal_view_report.xml
index d2940fa3d2b..62c8d0a9ca1 100644
--- a/addons/sale_journal/picking_journal_view_report.xml
+++ b/addons/sale_journal/picking_journal_view_report.xml
@@ -11,11 +11,11 @@
 		<field name="type">form</field>
 		<field name="arch" type="xml">
 			<form string="Picking by invoice method">
-				<field name="name" select="1"/>
-				<field name="month" select="1"/>
-				<field name="invoice_state" select="1"/>
-				<field name="state" select="1"/>
-				<field name="invoice_type_id" select="1"/>
+				<field name="name"/>
+				<field name="month"/>
+				<field name="invoice_state"/>
+				<field name="state"/>
+				<field name="invoice_type_id"/>
 				<field name="quantity"/>
 				<field name="count"/>
 				<field name="price_total"/>
@@ -51,10 +51,10 @@
 					<filter icon="terp-sale" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Picking by invoice method in this year"/>
 	               	<filter icon="terp-sale" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Picking by invoice method in this month"/>
 	               	<separator orientation="vertical"/>
-					<field name="name" select="1"/>
-					<field name="month" select="1"/>
-					<field name="invoice_state" select="1"/>
-					<field name="state" select="1"/>
+					<field name="name"/>
+					<field name="month"/>
+					<field name="invoice_state"/>
+					<field name="state"/>
 				</group>
 			</search>
 		</field>
@@ -91,10 +91,10 @@
 		<field name="type">form</field>
 		<field name="arch" type="xml">
 			<form string="Picking by journals">
-				<field name="name" select="1"/>
-				<field name="month" select="1"/>
-				<field name="state" select="1"/>
-				<field name="journal_id" select="1"/>
+				<field name="name"/>
+				<field name="month"/>
+				<field name="state"/>
+				<field name="journal_id"/>
 				<field name="quantity"/>
 				<field name="count"/>
 				<field name="price_total"/>
@@ -128,9 +128,9 @@
 					<filter icon="terp-sale" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Picking by journals in this year"/>
 	               	<filter icon="terp-sale" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Picking by journals in this month"/>
 	               	<separator orientation="vertical"/>
-					<field name="name" select="1"/>
-					<field name="month" select="1"/>
-					<field name="state" select="1"/>
+					<field name="name"/>
+					<field name="month"/>
+					<field name="state"/>
 				</group>
 			</search>
 		</field>
diff --git a/addons/sale_journal/sale_journal_view.xml b/addons/sale_journal/sale_journal_view.xml
index 7783f646292..23142c3fcaa 100644
--- a/addons/sale_journal/sale_journal_view.xml
+++ b/addons/sale_journal/sale_journal_view.xml
@@ -42,12 +42,12 @@
                 <notebook>
                 <page string="Journal">
                     <separator string="Journal Information" colspan="4"/>
-                    <field name="name" select="1"/>
-                    <field name="code" select="1"/>
-                    <field name="user_id" select="1"/>
-                    <field name="date" select="1"/>
-                    <field name="date_created" select="1"/>
-                    <field name="date_validation" select="1"/>
+                    <field name="name"/>
+                    <field name="code"/>
+                    <field name="user_id"/>
+                    <field name="date"/>
+                    <field name="date_created"/>
+                    <field name="date_validation"/>
                     <separator string="States" colspan="4"/>
                     <field name="state"/>
                     <group col="3" colspan="2">
@@ -83,10 +83,10 @@
         <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Sale Journal">
-                <field name="name" select="1"/>
-                <field name="code" select="1"/>
-                <field name="user_id" select="1"/>
-                <field name="date" select="1"/>
+                <field name="name"/>
+                <field name="code"/>
+                <field name="user_id"/>
+                <field name="date"/>
                 <field name="state"/>
             </tree>
         </field>
@@ -102,10 +102,10 @@
 	            	<filter icon="terp-sale" string="My Sale Journals" domain="[('user_id','=',uid)]" help="My Sale Journals"/>
 	               	<filter icon="terp-sale" string="Open" domain="[('state','=','open')]" help="Open Sale Journals"/>
 	               	<separator orientation="vertical"/>
-	                <field name="name" select="1"/>
-	                <field name="code" select="1"/>
-	                <field name="user_id" select="1"/>
-	                <field name="date" select="1"/>
+	                <field name="name"/>
+	                <field name="code"/>
+	                <field name="user_id"/>
+	                <field name="date" />
 				</group>
             </search>
         </field>
@@ -285,9 +285,9 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Sales by Journal">
-                <field name="name" select="1"/>
-                <field name="state" select="1"/>
-                <field name="journal_id" select="1"/>
+                <field name="name"/>
+                <field name="state"/>
+                <field name="journal_id"/>
                 <field name="quantity"/>
                 <field name="count"/>
                 <field name="price_total"/>
@@ -306,9 +306,9 @@
 	            	<filter icon="terp-sale" string="This Year" domain="[('name','!=','')]" help="Sale journal in this year"/>
 	               	<filter icon="terp-sale" string="This Month" domain="[('name','=',time.strftime('%%Y-%%m-01'))]" help="Sale journal in this month"/>
 	               	<separator orientation="vertical"/>
-	                <field name="name" select="1"/>
-	                <field name="state" select="1"/>
-	                <field name="journal_id" select="1"/>
+	                <field name="name"/>
+	                <field name="state"/>
+	                <field name="journal_id"/>
 				</group>
             </search>
         </field>
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 46f4ca6e8e2..02c60968e04 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -8,8 +8,8 @@
             <field name="type">search</field>
             <field name="inherit_id" ref="product.product_search_form_view"/>
             <field name="arch" type="xml">
-                   <field name="pricelist_id" select="1" widget="selection" position="before">
-                       <field name="location_id" select="1" widget="selection" context="{'location': self}" />
+                   <field name="pricelist_id" widget="selection" position="before">
+                       <field name="location_id" widget="selection" context="{'location': self}" />
                        <separator orientation="vertical"/>
                    </field>
             </field>
diff --git a/addons/stock/report/report_stock_view.xml b/addons/stock/report/report_stock_view.xml
index f2606e764b4..014fb344fd6 100644
--- a/addons/stock/report/report_stock_view.xml
+++ b/addons/stock/report/report_stock_view.xml
@@ -13,8 +13,8 @@
                         <filter icon="terp-stock" string="Customer Locations" domain="[('location_id.usage', '=', 'customer')]" help="Customer Locations" />
                         <filter icon="terp-stock" string="Supplier Locations" domain="[('location_id.usage', '=', 'supplier')]" help="Supplier Locations" />
                         <separator orientation="vertical"/>
-                        <field name="location_id" select="1"/>
-                        <field name="product_id" select="1" default="1"/>
+                        <field name="location_id"/>
+                        <field name="product_id" default="1"/>
                     </group>
                     <newline/>
                     <group expand="1" string="Group By..." colspan="4" col="10">
@@ -161,8 +161,8 @@
                     <filter icon="gtk-media-rewind" string="Non Inv"
                         domain="[('date','=', False)]"/>
                     <separator orientation="vertical"/>
-                    <field name="product_id" select="1"/>
-                    <field name="date" select="1" />
+                    <field name="product_id"/>
+                    <field name="date"/>
                 </search>
             </field>
         </record>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 45b95779660..d82f106b871 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -50,9 +50,9 @@
             <field name="arch" type="xml">
                 <search string="Search Inventory">
                     <group col="10" colspan="4">
-                        <field name="name" select="1" />
-                        <field name="date" select="1" />
-                        <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
+                        <field name="name"/>
+                        <field name="date"/>
+                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     </group>
                 </search>
 
@@ -78,28 +78,28 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Lot Inventory">
-                    <field name="name" select="1"/>
-                    <field name="date" select="1"/>
-                    <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
+                    <field name="name"/>
+                    <field name="date"/>
+                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     <notebook colspan="4">
                     <page string="General Informations">
                         <field colspan="4" name="inventory_line_id" nolabel="1" widget="one2many_list">
                             <tree string="Inventory Lines" editable="bottom">
-                                <field context="location=location_id,uom=product_uom" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom)" select="1" domain="[('type','&lt;&gt;','service')]"/>
+                                <field context="location=location_id,uom=product_uom" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom)" domain="[('type','&lt;&gt;','service')]"/>
                                 <field name="product_qty"/>
                                 <field name="product_uom"/>
                                 <field name="prod_lot_id" groups="base.group_extended"/>
-                                <field colspan="4" domain="[('usage','=','internal')]" name="location_id" select="1"/>
+                                <field colspan="4" domain="[('usage','=','internal')]" name="location_id"/>
                                 <field name="state" invisible="1"/>
                                 <button name="%(stock.action_view_stock_inventory_line_split)d"
                                     string="Split inventory lines" groups="base.group_extended"
                                     type="action" icon="gtk-justify-fill" states="draft"/>
                             </tree>
                             <form string="Inventory Lines">
-                                <field colspan="4" context="location=location_id,uom=product_uom" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom)" select="1" domain="[('type','&lt;&gt;','service')]"/>
+                                <field colspan="4" context="location=location_id,uom=product_uom" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom)" domain="[('type','&lt;&gt;','service')]"/>
                                 <field name="product_qty"/>
                                 <field name="product_uom"/>
-                                <field  domain="[('usage','=','internal')]" name="location_id" select="1"/>
+                                <field  domain="[('usage','=','internal')]" name="location_id"/>
                                 <field name="prod_lot_id" groups="base.group_extended"/>
                                 <group colspan="2" col="3">
                                     <button name="%(stock.action_view_stock_inventory_line_split)d"
@@ -112,7 +112,7 @@
                         <field colspan="4" name="move_ids" nolabel="1"/>
                     </page>
                     </notebook>
-                    <field name="state" select="1"/>
+                    <field name="state"/>
                     <group col="4" colspan="2">
                         <button name="action_done" states="draft" string="Confirm Inventory" type="object" icon="gtk-apply"/>
                         <button name="action_cancel" states="cancel" string="Set to Draft" type="object" icon="gtk-cancel"/>
@@ -231,10 +231,10 @@
                 <form string="Production Lot">
                     <notebook colspan="4">
                         <page string="Production Lot">
-                            <field name="name" select="1"/>
+                            <field name="name"/>
                             <field name="ref"/>
-                            <field name="prefix" select="1"/>
-                            <field name="product_id" select="1"/>
+                            <field name="prefix"/>
+                            <field name="product_id"/>
                             <field name="stock_available"/>
                             <field name="date"/>
                             <field colspan="4" name="revisions" nolabel="1"/>
@@ -268,11 +268,11 @@
                     <group col="10" colspan="4">
                         <filter icon="terp-stock" name="available" string="Available" domain="[('stock_available', '&gt;', 0)]" help="Available Product Lots" />
                         <separator orientation="vertical"/>
-                        <field name="prefix" select="1"/>
-                        <field name="name" select="1"/>
-                        <field name="ref" select="1"/>
-                        <field name="product_id" select="1"/>
-                        <field name="date" select="1"/>
+                        <field name="prefix"/>
+                        <field name="name"/>
+                        <field name="ref"/>
+                        <field name="product_id"/>
+                        <field name="date"/>
                     </group>
                     <newline/>
                     <group expand="1" string="Group By..." colspan="4" col="8">
@@ -395,12 +395,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Stock location">
-                    <field name="name" select="1"/>
+                    <field name="name"/>
                     <field name="active" groups="base.group_extended"/>
                     <newline/>
-                    <field name="usage" select="1"/>
-                    <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
-                    <field name="account_id" select="1" groups="base.group_extended"/>
+                    <field name="usage"/>
+                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                    <field name="account_id" groups="base.group_extended"/>
                     <field name="location_id"/>
                     <field name="address_id" context="{'contact_display':'partner'}"/>
                     <field name="icon"/>
@@ -594,14 +594,14 @@
             <field name="arch" type="xml">
                 <form string="Picking list">
                     <group colspan="4" col="6">
-                        <field name="name" select="1" readonly="1"/>
-                        <field name="address_id" select="1" context="{'contact_display' : 'partner'}"/>
+                        <field name="name" readonly="1"/>
+                        <field name="address_id" context="{'contact_display' : 'partner'}"/>
                         <field name="origin"/>
                         <field name="backorder_id" readonly="1"/>
                         <field name="date" />
-                        <field name="min_date" select="1"/>
+                        <field name="min_date"/>
                         <field name="type"/>
-                        <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
+                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     </group>
                     <notebook colspan="4">
                         <page string="General Information">
@@ -611,7 +611,7 @@
                                     <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" select="1"/>
+                                    <field name="picking_id"/>
                                     <field name="prodlot_id" groups="base.group_extended"/>
                                     <field name="location_id"/>
                                     <field name="location_dest_id"/>
@@ -632,17 +632,17 @@
                                     <notebook colspan="4">
                                         <page string="General Information">
                                             <separator colspan="4" string="Move Information"/>
-                                            <field name="location_id" select="1" domain="[('usage','=','internal')]"/>
-                                            <field name="location_dest_id" select="1" domain="[('usage','=','internal')]"/>
+                                            <field name="location_id" domain="[('usage','=','internal')]"/>
+                                            <field name="location_dest_id" domain="[('usage','=','internal')]"/>
                                             <field colspan="4" context="location=location_id" name="product_id" on_change="onchange_product_id(product_id, location_id, location_dest_id)" select="1"/>
-                                            <field name="product_qty" select="1" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
-                                            <field name="product_uom" select="1"/>
+                                            <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" select="1"/>
+                                            <field colspan="4" invisible="1" name="name"/>
                                             <field invisible="1" name="date"/>
                                             <field name="date_planned"/>
-                                            <field name="address_id" select="1" context="{'contact_display':'partner'}"/>
+                                            <field name="address_id" context="{'contact_display':'partner'}"/>
                                             <field groups="base.group_extended" name="product_packaging"/>
                                             <field name="prodlot_id" groups="base.group_extended"
                                                 context="{'location_id':location_id, 'product_id':product_id}"
@@ -654,7 +654,7 @@
                                             <button name="%(track_line)d" string="Split in production lots" type="action" icon="gtk-justify-fill"/>
                                             <button name="%(move_scrap)d" string="Scrap Move Line" type="action" icon="gtk-justify-fill"/>
                                             <separator colspan="4" string="Move State"/>
-                                            <field name="state" select="1"/>
+                                            <field name="state"/>
                                             <group>
                                                 <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
                                                 <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object" icon="gtk-no"/>
@@ -705,10 +705,10 @@
                         <separator orientation="vertical"/>
                         <filter icon="terp-stock" string="Back Order" domain="[('backorder_id', '!=', False)]" help="Has Back Order"  />
                         <separator orientation="vertical"/>
-                        <field name="location_id" select="1"/>
-                        <field name="location_dest_id" select="1"/>
-                        <field name="name" select="1"/>
-                        <field name="address_id" select="1"/>
+                        <field name="location_id"/>
+                        <field name="location_dest_id"/>
+                        <field name="name"/>
+                        <field name="address_id"/>
                     </group>
                     <newline/>
                     <group expand="1" string="Group By..." colspan="4" col="8">
@@ -727,12 +727,12 @@
             <field name="arch" type="xml">
                 <tree colors="blue:state in ('draft');grey:state in ('cancel', 'done');red:state not in ('cancel', 'done') and date &lt; current_date" string="Picking list">
                     <field name="name"/>
-                    <field name="address_id" select="1"/>
+                    <field name="address_id"/>
                     <field name="backorder_id"/>
                     <field name="origin"/>
-                    <field name="date" select="1"/>
-                    <field name="min_date" select="1"/>
-                    <field name="state" select="1"/>
+                    <field name="date"/>
+                    <field name="min_date"/>
+                    <field name="state"/>
                     <button name="%(action_partial_picking)d" states="assigned" string="Validate" type="action" icon="gtk-go-forward" help="Validate Delivery"/>
                     <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel" icon="gtk-cancel" help="Cancel" confirm="This operation will cancel the delivery.    Do you want to continue?"/>
                 </tree>
@@ -745,13 +745,13 @@
             <field name="arch" type="xml">
                 <form string="Picking list">
                     <group col="6" colspan="4">
-                        <field name="name" select="1" readonly="1"/>
-                        <field name="address_id" select="1"/>
+                        <field name="name" readonly="1"/>
+                        <field name="address_id"/>
                         <field name="origin"/>
                         <field name="backorder_id" readonly="1"/>
                         <field name="date" />
-                        <field name="min_date" select="1"/>
-                        <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
+                        <field name="min_date"/>
+                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     </group>
                         <notebook colspan="4">
                         <page string="General Information">
@@ -761,7 +761,7 @@
                                     <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" select="1"/>
+                                    <field name="picking_id" />
                                     <field name="prodlot_id" groups="base.group_extended"/>
                                     <field name="location_id"/>
                                     <field name="location_dest_id"/>
@@ -782,14 +782,14 @@
                                     <notebook colspan="4">
                                         <page string="General Information">
                                             <separator colspan="4" string="Move Information"/>
-                                            <field name="location_id" select="1" domain="[('usage','=','internal')]"/>
-                                            <field name="location_dest_id" select="1" domain="[('usage','&lt;&gt;','view')]"/>
-                                            <field colspan="4" context="location=location_id" name="product_id" on_change="onchange_product_id(product_id, location_id, location_dest_id)" select="1"/>
-                                            <field name="product_qty" select="1" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
-                                            <field name="product_uom" select="1"/>
+                                            <field name="location_id" domain="[('usage','=','internal')]"/>
+                                            <field name="location_dest_id" domain="[('usage','&lt;&gt;','view')]"/>
+                                            <field colspan="4" context="location=location_id" name="product_id" on_change="onchange_product_id(product_id, location_id, location_dest_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" select="1"/>
+                                            <field colspan="4" invisible="1" name="name"/>
                                             <field invisible="1" name="date"/>
                                             <field name="date_planned"/>
                                             <field groups="base.group_extended" name="product_packaging"/>
@@ -797,9 +797,9 @@
                                                 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" select="1"/>
+                                            <field groups="base.group_extended" name="tracking_id"/>
                                             <separator colspan="4" string="Move State"/>
-                                            <field name="state" select="1"/>
+                                            <field name="state"/>
                                             <group>
                                                 <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
                                                 <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object" icon="gtk-find"/>
@@ -829,7 +829,7 @@
                             <field name="auto_picking"/>
                             <field name="active"/>
                             <newline/>
-                            <field name="date" select="1"/>
+                            <field name="date"/>
                             <field name="date_done"/>
                             <field name="move_type"/>
                         </page>
@@ -850,9 +850,9 @@
                         <separator orientation="vertical"/>
                         <filter icon="terp-stock" string="Back Order" domain="[('backorder_id','!=',False)]" help="Back Order"/>
                         <separator orientation="vertical"/>
-                        <field name="name" select="1"/>
-                        <field name="address_id" select="1"/>
-                        <field name="origin" select="1"/>
+                        <field name="name"/>
+                        <field name="address_id"/>
+                        <field name="origin"/>
                     </group>
                     <newline/>
                     <group expand="1" string="Group By..." colspan="4" col="10">
@@ -925,11 +925,11 @@
                     <group col="6" colspan="4">
                         <field name="address_id"/>
                         <field name="min_date"/>
-                        <field name="name" select="1" readonly="1"/>
+                        <field name="name" readonly="1"/>
                         <field name="invoice_state"/>
                         <field name="backorder_id" readonly="1"/>
                         <field name="origin" readonly="1"/>
-                        <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
+                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     </group>
                     <notebook colspan="4">
                         <page string="General Information">
@@ -939,7 +939,7 @@
                                     <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" select="1"/>
+                                    <field name="picking_id"/>
                                     <field name="prodlot_id" groups="base.group_extended"/>
                                     <field name="location_id"/>
                                     <field name="location_dest_id"/>
@@ -960,26 +960,26 @@
                                     <notebook colspan="4">
                                          <page string="General Information">
                                             <separator colspan="4" string="Move Information"/>
-                                            <field name="location_id" select="1" domain="[('usage','=','internal')]"/>
-                                            <field name="location_dest_id" select="1" domain="[('usage','&lt;&gt;','view')]"/>
-                                            <field colspan="4" context="location=location_id" name="product_id" on_change="onchange_product_id(product_id, location_id, location_dest_id)" select="1"/>
-                                            <field name="product_qty" select="1" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" />
-                                            <field name="product_uom" select="1"/>
+                                            <field name="location_id" domain="[('usage','=','internal')]"/>
+                                            <field name="location_dest_id" domain="[('usage','&lt;&gt;','view')]"/>
+                                            <field colspan="4" context="location=location_id" name="product_id" on_change="onchange_product_id(product_id, location_id, location_dest_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" select="1"/>
+                                            <field colspan="4" invisible="1" name="name"/>
                                             <field invisible="1" name="date"/>
                                             <field name="date_planned"/>
                                             <field groups="base.group_extended" name="product_packaging"/>
-                                            <field name="prodlot_id" select="1" groups="base.group_extended"
+                                            <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" select="1"/>
+                                            <field groups="base.group_extended" name="tracking_id"/>
                                             <label/>
                                             <button name="%(track_line)d" string="Split in production lots" type="action" icon="gtk-justify-fill"/>
                                             <separator colspan="4" string="Move State"/>
-                                            <field name="state" select="1"/>
+                                            <field name="state"/>
                                             <group>
                                                 <button name="force_assign" states="confirmed" string="Force Availability" type="object"  icon="gtk-jump-to"/>
                                                 <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object"  icon="gtk-no"/>
@@ -1028,9 +1028,9 @@
                         <filter icon="terp-stock" string="Available" domain="[('state','=','assigned')]" help="Assigned Outgoing Orders"/>
                         <filter icon="terp-stock" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Outgoing Orders"/>
                         <separator orientation="vertical"/>
-                        <field name="name" select="1"/>
-                        <field name="address_id" select="1"/>
-                        <field name="company_id" select="1" widget="selection"/>
+                        <field name="name"/>
+                        <field name="address_id"/>
+                        <field name="company_id" widget="selection"/>
                    </group>
                     <newline/>
                     <group expand="1" string="Group By..." colspan="4" col="8">
@@ -1097,14 +1097,14 @@
             <field name="arch" type="xml">
                 <form string="Input Picking List">
                     <group colspan="4" col="6">
-                        <field name="name" readonly="1" select="1"/>
+                        <field name="name" readonly="1"/>
                         <field name="address_id" on_change="onchange_partner_in(address_id)" context="{'contact_display':'partner'}"/>
                         <field name="origin"/>
                         <field name="backorder_id" readonly="1"/>
                         <field name="date"/>
                         <field name="min_date" readonly="1"/>
                         <field name="invoice_state" string="Invoice Control"/>
-                        <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
+                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     </group>
                     <notebook colspan="4">
                         <page string="General Information">
@@ -1130,29 +1130,29 @@
                                     <notebook colspan="4">
                                         <page string="General Information">
                                             <separator colspan="4" string="Move Information"/>
-                                            <field name="location_id" select="1" domain="[('usage','&lt;&gt;','view')]"/>
-                                            <field domain="[('usage','=','internal')]" name="location_dest_id" select="1"/>
-                                            <field colspan="4" context="location=location_id" name="product_id" on_change="onchange_product_id(product_id, location_id, location_dest_id)" select="1"/>
-                                            <field name="product_qty" select="1" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
-                                            <field name="product_uom" select="1"/>
+                                            <field name="location_id" domain="[('usage','&lt;&gt;','view')]"/>
+                                            <field domain="[('usage','=','internal')]" name="location_dest_id" />
+                                            <field colspan="4" context="location=location_id" name="product_id" on_change="onchange_product_id(product_id, location_id, location_dest_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" select="1"/>
+                                            <field colspan="4" invisible="1" name="name" />
                                             <field groups="base.group_extended" name="date_planned"/>
                                             <newline/>
                                             <newline/>
                                             <field groups="base.group_extended" name="product_packaging"/>
                                             <newline/>
-                                            <field name="prodlot_id" select="1" groups="base.group_extended"
+                                            <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" select="1"/>
+                                            <field groups="base.group_extended" name="tracking_id"/>
                                             <newline/>
                                             <label/>
                                             <button groups="base.group_extended" name="%(track_line)d" string="Split in production lots" type="action" icon="gtk-justify-fill"/>
                                             <separator colspan="4" string="Move State"/>
-                                            <field name="state" select="1"/>
+                                            <field name="state"/>
                                             <group>
                                                 <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon=""/>
                                                 <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object" icon=""/>
@@ -1198,9 +1198,9 @@
                         <separator orientation="vertical"/>
                         <filter icon="terp-stock" string="Back Order" domain="[('backorder_id', '!=', False)]" help="Has Back Order" />
                         <separator orientation="vertical"/>
-                        <field name="name" select="1"/>
-                        <field name="address_id" select="1"/>
-                        <field name="company_id" select="1" widget="selection" groups="base.group_multi_company" />
+                        <field name="name"/>
+                        <field name="address_id"/>
+                        <field name="company_id" widget="selection" groups="base.group_multi_company" />
                     </group>
                     <newline/>
                     <group expand="1" string="Group By..." colspan="4" col="8">
@@ -1252,9 +1252,9 @@
                         <filter icon="terp-stock" string="Available" domain="[('state','=','assigned')]" help="Assigned Internal Moves"/>
                         <filter icon="terp-stock" name="confirmed" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Internal Moves" />
                         <separator orientation="vertical"/>
-                        <field name="name" select="1"/>
-                        <field name="origin" select="1"/>
-                        <field name="company_id" select="1" widget="selection"/>
+                        <field name="name"/>
+                        <field name="origin"/>
+                        <field name="company_id" widget="selection"/>
                     </group>
                     <newline/>
                     <group expand="1" string="Group By..." colspan="4" col="8">
@@ -1289,7 +1289,7 @@
                     <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" select="1"/>
+                    <field name="picking_id"/>
                     <field name="prodlot_id" groups="base.group_extended"/>
                     <field name="location_id"/>
                     <field name="location_dest_id"/>
@@ -1313,7 +1313,7 @@
                             <group colspan="2" col="2">
                                 <separator colspan="2" string="Move Information"/>
                                 <field name="name"/>
-                                <field name="product_id" select="1" on_change="onchange_product_id(product_id,location_id,location_dest_id)"/>
+                                <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id)"/>
                                 <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
                                 <field name="product_uom"/>
                                 <field name="product_uos"/>
@@ -1321,11 +1321,11 @@
 
                             <group colspan="2" col="2">
                                 <separator string="Locations &amp; Picking" colspan="2" />
-                                <field name="location_id" select="1"/>
-                                <field name="location_dest_id" select="1"/>
+                                <field name="location_id"/>
+                                <field name="location_dest_id"/>
                                 <field name="picking_id"/>
                                 <field name="address_id" context="{'contact_display':'partner'}"/>
-                                <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
+                                <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                             </group>
 
                             <group colspan="2" col="2">
@@ -1337,7 +1337,7 @@
 
                             <group colspan="2" col="4">
                                 <separator string="Traceability" colspan="4" />
-                                <field name="tracking_id" select="1" colspan="4" />
+                                <field name="tracking_id" colspan="4" />
                                 <field name="prodlot_id" groups="base.group_extended"
                                     context="{'location_id':location_id, 'product_id':product_id}"
                                     domain="[('product_id','=?',product_id)]"
@@ -1350,7 +1350,7 @@
                         </page>
                     </notebook>
                     <group col="6" colspan="4">
-                        <field name="state" select="1"/>
+                        <field name="state"/>
                         <button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
                         <button name="action_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes"/>
                         <button name="action_cancel" states="assigned,confirmed" string="Cancel" type="object" icon="gtk-cancel"/>
diff --git a/addons/stock_planning/stock_planning_view.xml b/addons/stock_planning/stock_planning_view.xml
index e90d68cf855..5a504e56322 100644
--- a/addons/stock_planning/stock_planning_view.xml
+++ b/addons/stock_planning/stock_planning_view.xml
@@ -133,13 +133,13 @@
                 <form string="Stock and Sales Forecast">
                     <group colspan = "4" col = "4">
 		        <group colspan = "2" col="2" >
-                            <field name="company_id" select="1" 
+                            <field name="company_id"  
                                         groups="base.group_multi_company" 
                                         widget="selection" 
                                         on_change="onchange_company(company_id)"/>
-                            <field name="warehouse_id" select="1" domain = "[('company_id','=',company_id)] "/>
-                            <field name="period_id" select="1" />
-                            <field name="product_id" select="1" on_change="product_id_change(product_id)" />
+                            <field name="warehouse_id" domain = "[('company_id','=',company_id)] "/>
+                            <field name="period_id" />
+                            <field name="product_id" on_change="product_id_change(product_id)" />
 			    <field name="product_uom_categ"  invisible = "True"/>
 			    <field name="product_uos_categ"  invisible = "True"/>
                             <field name="product_uom"  
@@ -208,9 +208,9 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Stock and Sales Forecasts" editable="bottom">
-                    <field name="warehouse_id" select="1"/>
+                    <field name="warehouse_id"/>
                     <field name="user_id"/>
-                    <field name="period_id" select="1"/>
+                    <field name="period_id"/>
                     <field name="product_id" on_change="product_id_change(product_id)" />
                     <field name="product_qty"/>
                     <field name="product_uom" />
@@ -240,11 +240,11 @@
                 <search string="Search Stock and Sales Forecast">
                  <group col='10' colspan='4'>
                     <filter icon="terp-purchase" string="Validated" domain="[('state','=','validated')]" separator="1"/>
-                    <field name="company_id" select="1" widget="selection"/>
-                    <field name="warehouse_id" select="1" widget="selection"/>
-                    <field name="period_id" select="1" widget="selection"/>
-                    <field name="product_id" select="1" widget="selection"/>
-                    <field name="create_uid" select="1" widget="selection">
+                    <field name="company_id" widget="selection"/>
+                    <field name="warehouse_id" widget="selection"/>
+                    <field name="period_id" widget="selection"/>
+                    <field name="product_id" widget="selection"/>
+                    <field name="create_uid" widget="selection">
                         <filter icon="terp-purchase" domain="[('create_uid','=',uid)]" help="My Forecasts"/>
                     </field>
                 </group>
@@ -322,10 +322,10 @@
                         <group colspan ="3" col="2">
                             <separator colspan ="2" string = "General Info"/>
 
-                            <field name="company_id" select = "1" widget= "selection" 
+                            <field name="company_id" widget= "selection" 
                                          on_change="onchange_company(company_id)" groups="base.group_multi_company"/>
-                            <field name="warehouse_id" select="1" domain = "[('company_id','=',company_id)] " />
-                            <field name="period_id" select="1"  />
+                            <field name="warehouse_id" domain = "[('company_id','=',company_id)] " />
+                            <field name="period_id" />
                             <field name="product_id" on_change="product_id_change(product_id)"  />
 			    <field name="product_uom_categ"  invisible = "True"/>
 			    <field name="product_uos_categ"  invisible = "True"/>
@@ -386,10 +386,10 @@
                  <group col='10' colspan='4'>
 <!--  Doesn't work !       <filter icon="terp-purchase" string="Current" domain="[('line_time','=','Future')]" separator="1"/>  -->
                     <filter icon="terp-purchase" string="No Requisition" domain="[('history','=',False)]" separator="1"/>
-                    <field name="company_id" select="1" widget="selection"/>
-                    <field name="warehouse_id" select="1" widget="selection"/>
-                    <field name="period_id" select="1" widget="selection"/>
-                    <field name="product_id" select="1" widget="selection"/>
+                    <field name="company_id" widget="selection"/>
+                    <field name="warehouse_id" widget="selection"/>
+                    <field name="period_id" widget="selection"/>
+                    <field name="product_id" widget="selection"/>
                  </group>
               </search>
             </field>

From 28ec7935d022a62700a84a5e0904705a3f353045 Mon Sep 17 00:00:00 2001
From: mso <mso@mso>
Date: Fri, 30 Apr 2010 17:12:46 +0530
Subject: [PATCH 05/82] [FIX] stock: change in stock_change_standard_price

bzr revid: mso@mso-20100430114246-cbrtz0v6tdsv4cdw
---
 .../wizard/stock_change_standard_price.py     | 74 +++----------------
 .../stock_change_standard_price_view.xml      | 18 +++--
 2 files changed, 23 insertions(+), 69 deletions(-)

diff --git a/addons/stock/wizard/stock_change_standard_price.py b/addons/stock/wizard/stock_change_standard_price.py
index a18136fcac8..2230fe0caf3 100644
--- a/addons/stock/wizard/stock_change_standard_price.py
+++ b/addons/stock/wizard/stock_change_standard_price.py
@@ -91,68 +91,16 @@ class change_standard_price(osv.osv_memory):
 
         """
         rec_id = context and context.get('active_id', False)
-        prod_obj = self.pool.get('product.template')
-        location_obj = self.pool.get('stock.location')
-        lot_obj = self.pool.get('stock.report.prodlots')
-        move_obj = self.pool.get('account.move')
-        move_line_obj = self.pool.get('account.move.line')
-        data_obj = self.pool.get('ir.model.data')
-
-        res = self.read(cr, uid, ids[0], ['new_price'])
-        new_price = res.get('new_price',[])
-        data = prod_obj.browse(cr, uid, rec_id)
-        diff = data.standard_price - new_price
-        prod_obj.write(cr, uid, rec_id, {'standard_price': new_price})
-
-        loc_ids = location_obj.search(cr, uid, [('account_id','<>',False),('usage','=','internal')])
-        lot_ids = lot_obj.search(cr, uid, [('location_id', 'in', loc_ids),('product_id','=',rec_id)])
-        qty = 0
-        debit = 0.0
-        credit = 0.0
-        stock_input_acc = data.property_stock_account_input.id or data.categ_id.property_stock_account_input_categ.id
-        stock_output_acc = data.property_stock_account_output.id or data.categ_id.property_stock_account_output_categ.id
-
-        for lots in lot_obj.browse(cr, uid, lot_ids):
-            qty += lots.name
-
-        if stock_input_acc and stock_output_acc and lot_ids:
-            move_id = move_obj.create(cr, uid, {'journal_id': data.categ_id.property_stock_journal.id})
-            if diff > 0:
-                credit = qty * diff
-                move_line_obj.create(cr, uid, {
-                                'name': data.name,
-                                'account_id': stock_input_acc,
-                                'credit': credit,
-                                'move_id': move_id
-                                })
-                for lots in lot_obj.browse(cr, uid, lot_ids):
-                    credit = lots.name * diff
-                    move_line_obj.create(cr, uid, {
-                                    'name': 'Expense',
-                                    'account_id': lots.location_id.account_id.id,
-                                    'debit': credit,
-                                    'move_id': move_id
-                                    })
-            elif diff < 0:
-                debit = qty * -diff
-                move_line_obj.create(cr, uid, {
-                                'name': data.name,
-                                'account_id': stock_output_acc,
-                                'debit': debit,
-                                'move_id': move_id
-                                })
-                for lots in lot_obj.browse(cr, uid, lot_ids):
-                    debit = lots.name * -diff
-                    move_line_obj.create(cr, uid, {
-                                    'name': 'Income',
-                                    'account_id': lots.location_id.account_id.id,
-                                    'credit': debit,
-                                    'move_id': move_id
-                                    })
-            else:
-                raise osv.except_osv(_('Warning!'),_('No Change in Price.'))
-        else:
-            pass
-        return {}
+        assert rec_id, _('Active ID is not set in Context')
+        prod_obj = self.pool.get('product.product')
+        res = self.browse(cr, uid, ids) 
+        datas = {
+            'new_price' : res[0].new_price,
+            'stock_output_account' : res[0].stock_account_output.id,
+            'stock_input_account' : res[0].stock_account_input.id,
+            'stock_journal' : res[0].stock_journal.id
+        }
+        prod_obj.do_change_standard_price(cr, uid, [rec_id], datas, context)
+        return {}      
 
 change_standard_price()
diff --git a/addons/stock/wizard/stock_change_standard_price_view.xml b/addons/stock/wizard/stock_change_standard_price_view.xml
index ffca108390d..467fbf70443 100644
--- a/addons/stock/wizard/stock_change_standard_price_view.xml
+++ b/addons/stock/wizard/stock_change_standard_price_view.xml
@@ -7,12 +7,17 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
               <form string="Change Standard Price">
-             		<field name="new_price"/>              		
-                    <separator string="" colspan="4" />
-                    <label string="" colspan="2"/>
-              		<group col="2" colspan="2">                        
-	              		<button special="cancel" string="_Cancel" icon="gtk-cancel"/>
-	              		<button name="change_price" string="_Apply" type="object" icon="gtk-apply"/>
+             		<field name="new_price" on_change="onchange_price(new_price, context)" context="{'active_id': active_id}"/>
+              		<newline/>
+                    <field name="stock_account_input" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('enable_stock_in_out_acc','=',False)]}"/>
+              		<newline/>
+                    <field name="stock_account_output" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('enable_stock_in_out_acc','=',True)]}"/>
+              		<newline/>
+              		<field name="stock_journal"/>
+              		<field name="enable_stock_in_out_acc" invisible="1"/>
+              		<group col="2" colspan="4">
+	              		<button special="cancel" string="Cancel" icon="gtk-cancel"/>
+	              		<button name="change_price" string="Change" type="object" icon="gtk-ok"/>
               		</group>
               </form>
             </field>
@@ -30,3 +35,4 @@
 
     </data>
 </openerp>
+

From 19044f9d9c46b33b772ceec0d2bec3dc8ece64a5 Mon Sep 17 00:00:00 2001
From: mso <mso@mso>
Date: Tue, 4 May 2010 18:58:06 +0530
Subject: [PATCH 06/82] [IMP] stock: Task 590-tracking id added, 596-stock move
 report,view changed for change_standard_price wizard

bzr revid: mso@mso-20100504132806-vdrkkkoirva1ja4g
---
 addons/stock/report/report_stock_move.py        | 10 +++++++---
 addons/stock/report/report_stock_move_view.xml  | 16 +++++++++++-----
 addons/stock/stock_view.xml                     |  5 +++++
 .../wizard/stock_change_standard_price_view.xml | 17 ++++++-----------
 4 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/addons/stock/report/report_stock_move.py b/addons/stock/report/report_stock_move.py
index b5388b336e6..09fcff39eb0 100755
--- a/addons/stock/report/report_stock_move.py
+++ b/addons/stock/report/report_stock_move.py
@@ -35,8 +35,10 @@ class report_stock_move(osv.osv):
             ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'),
             ('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True),
         'product_id':fields.many2one('product.product', 'Product', readonly=True),
-        'location_id':fields.many2one('stock.location', 'Location', readonly=True),
+        'location_id': fields.many2one('stock.location', 'Source Location', readonly=True, select=True, help="Sets a location if you produce at a fixed location. This can be a partner location if you subcontract the manufacturing operations."),
+        'location_dest_id': fields.many2one('stock.location', 'Dest. Location', readonly=True, select=True, help="Location where the system will stock the finished products."),
         'product_qty':fields.integer('Qty',readonly=True),
+        'product_uom': fields.many2one('product.uom', 'Product UOM', readonly=True),
         'state': fields.selection([('draft', 'Draft'), ('waiting', 'Waiting'), ('confirmed', 'Confirmed'), ('assigned', 'Available'), ('done', 'Done'), ('cancel', 'Cancelled')], 'State', readonly=True, select=True,
                                   help='When the stock move is created it is in the \'Draft\' state.\n After that it is set to \'Confirmed\' state.\n If stock is available state is set to \'Avaiable\'.\n When the picking it done the state is \'Done\'.\
                                   \nThe state is \'Waiting\' if the move is waiting for another one.'),
@@ -53,10 +55,12 @@ class report_stock_move(osv.osv):
                 to_char(date_trunc('day',m.date), 'MM') as month,
                 to_char(date_trunc('day',m.date), 'YYYY-MM-DD') as day,
                 m.location_id as location_id,
+                m.location_dest_id as location_dest_id,
                 m.product_id as product_id,
                 m.state as state,
-                sum(m.product_qty) as product_qty                  
-                from stock_move as m group by m.product_id, m.location_id, m.id, m.date, m.state
+                m.product_uom as product_uom,
+                sum(m.product_qty) as product_qty
+                from stock_move as m group by m.id, m.product_id, m.location_id, m.location_dest_id, m.date, m.state, m.product_uom
             )
         """)
 report_stock_move()
diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index 79657da0fc7..5bd19efac80 100755
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -11,10 +11,13 @@
                 <field name="year" invisible="1" />
                 <field name="month" invisible="1"/>
                 <field name="day" invisible="1"/>
+                <field name="location_id" invisible="1"/>
+                <field name="location_dest_id" invisible="1"/>
                 <field name="product_id"/>
                 <field name="product_qty"/>
-                <field name="location_id"/>
+                <field name="product_uom"/>
                 <field name="state"/>
+                
            </tree>
         </field>
     </record>
@@ -47,7 +50,7 @@
                     domain="[('month','=',time.strftime('%%m'))]"
                     help="Stock Moves of this month"/>
 	            <filter icon="terp-stock"
-                    string="Current Stock"
+                    string="Today"
                     separator="1"
                     domain="[('date', '=', time.strftime('%%Y-%%m-%%d')]"
                     help="Stock Moves of today"/>
@@ -69,13 +72,16 @@
                     	help = "Completed Stock-Moves"/>
                 
                 <separator orientation="vertical"/>                                        
-                <field name="product_id" select="1" widget="selection"/>
-                <field name="location_id" select="1" widget="selection"/>
+                <field name="product_id"/>
+                <field name="location_id" widget = "selection"/>
+                <field name="location_dest_id"  widget = "selection"/>
+                
                 </group>
                 <newline/>
                 <group expand="1" string="Group By..." >
                     <filter string="Product" icon="terp-stock" context="{'group_by':'product_id'}"/>
-                    <filter string="Location" icon="terp-stock" context="{'group_by':'location_id'}"/>
+                    <filter string="Source Location" icon="terp-stock" context="{'group_by':'location_id'}"/>
+                    <filter string="Dest. Location" icon="terp-stock"  context="{'group_by':'location_dest_id'}"/>
                     <filter string="State" icon="terp-stock" context="{'group_by':'state'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Day" icon="terp-stock" context="{'group_by':'day'}"/>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 45b95779660..3fc390e7b4c 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1418,6 +1418,7 @@
                     <field name="backorder_id"/>
                     <field name="state"/>
                     <button name="%(action_partial_move)d" string="Partial" type="action" states="assigned" icon="gtk-justify-fill"/>
+                    <button name="action_done" states="assigned" string="Done" type="object" icon="gtk-jump-to"/>
                     <button name="action_cancel" states="assigned,confirmed" string="Cancel" type="object" icon="gtk-cancel"/>
                 </tree>
             </field>
@@ -1491,6 +1492,10 @@
                         <field name="product_id"/>
                     </group>
                     <newline/>
+                    <group col='8' colspan='14' expand="1" string="Tracking Lots">
+                       <field name="tracking_id" widget="selection" context="{'tracking_id': self}" />
+                    </group>
+                    <newline/>
                     <group expand="1" string="Group By..." colspan="4" col="8">
                         <filter string="Product" icon="terp-stock" domain="[]" context="{'group_by':'product_id'}"/>
                         <filter string="State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
diff --git a/addons/stock/wizard/stock_change_standard_price_view.xml b/addons/stock/wizard/stock_change_standard_price_view.xml
index 467fbf70443..374a34b4b6a 100644
--- a/addons/stock/wizard/stock_change_standard_price_view.xml
+++ b/addons/stock/wizard/stock_change_standard_price_view.xml
@@ -7,17 +7,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
               <form string="Change Standard Price">
-             		<field name="new_price" on_change="onchange_price(new_price, context)" context="{'active_id': active_id}"/>
-              		<newline/>
-                    <field name="stock_account_input" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('enable_stock_in_out_acc','=',False)]}"/>
-              		<newline/>
-                    <field name="stock_account_output" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('enable_stock_in_out_acc','=',True)]}"/>
-              		<newline/>
-              		<field name="stock_journal"/>
-              		<field name="enable_stock_in_out_acc" invisible="1"/>
-              		<group col="2" colspan="4">
-	              		<button special="cancel" string="Cancel" icon="gtk-cancel"/>
-	              		<button name="change_price" string="Change" type="object" icon="gtk-ok"/>
+             		<field name="new_price"/>              		
+                    <separator string="" colspan="4" />
+                    <label string="" colspan="2"/>
+              		<group col="2" colspan="2">                        
+	              		<button special="cancel" string="_Cancel" icon="gtk-cancel"/>
+	              		<button name="change_price" string="_Apply" type="object" icon="gtk-apply"/>
               		</group>
               </form>
             </field>

From 3e267b1e3c058b62abc175b642d292a7ded27bfe Mon Sep 17 00:00:00 2001
From: mso <mso@mso>
Date: Wed, 5 May 2010 15:57:11 +0530
Subject: [PATCH 07/82] [FIX] stock: To consider total qty of move when given
 quantity in partial delivery is greater than the total qty

bzr revid: mso@mso-20100505102711-b3los0fdlx5pja0c
---
 addons/stock/stock.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 4cee95a16c2..97d756190f6 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1891,8 +1891,8 @@ class stock_move(osv.osv):
         for move in too_many:
             self.write(cr, uid, move.id,
                     {
-                        'product_qty': product_qty,
-                        'product_uos_qty': product_qty
+                        'product_qty': move.product_qty,
+                        'product_uos_qty': move.product_qty
                     })
             complete.append(move)
 

From c9a1e402465e7f46f625a5250ec52822e64baa68 Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Wed, 5 May 2010 17:24:00 +0530
Subject: [PATCH 08/82] [IMP] mrp sale stock: set the needed search_default in
 the views

bzr revid: mtr@mtr-20100505115400-f5khszgnsciq33h5
---
 addons/mrp/mrp_view.xml                         |  7 ++++---
 addons/mrp/report/mrp_production_order_view.xml |  6 +++---
 addons/sale/sale_view.xml                       |  9 +++++----
 addons/stock/report/report_stock_view.xml       | 10 +++++-----
 4 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 202e2dadaf2..34df19f1852 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -618,8 +618,7 @@
                        <filter icon="terp-mrp" string="Draft"
                            domain="[('state','=','draft')]"
                            help="Non confirmed manufacturing orders"/>
-                       <filter icon="terp-mrp" string="Current"
-                           default="1"
+                       <filter icon="terp-mrp" name="current" string="Current"
                            domain="[('state','in',('confirmed','ready'))]"
                            help="Manufacturing Orders which are waiting for raw materials"/>
                        <filter icon="terp-mrp" string="Ready"
@@ -656,6 +655,7 @@
             <field name="res_model">mrp.production</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph,gantt</field>
+             <field name="context">{'search_default_current':1}</field>
             <field name="view_id" eval="False"/>
             <field name="search_view_id" ref="view_mrp_production_filter"/>
         </record>
@@ -852,7 +852,7 @@
             <field name="arch" type="xml">
                 <search string="Search Procurement">
                     <group col='10' colspan='4'>
-                       <filter icon="terp-mrp" string="Current" domain="[('state','in',('draft','confirmed'))]" default="1" help="Procurement Orders in draft or open state."/>
+                       <filter icon="terp-mrp" name="current" string="Current" domain="[('state','in',('draft','confirmed'))]" help="Procurement Orders in draft or open state."/>
                        <filter icon="terp-mrp" string="Exceptions" domain="[('state','=','exception')]" help="Procurement Orders with exceptions"/>
                        <filter icon="terp-mrp" string="Late"
                            domain="['&amp;', ('date_planned::date','&lt;', current_date), ('state', 'in', ('draft', 'confirmed'))]"
@@ -879,6 +879,7 @@
             <field name="res_model">mrp.procurement</field>
             <field name="view_type">form</field>
             <field name="view_id" eval="False"/>
+            <field name="context">{'search_default_current':1}</field>
             <field name="search_view_id" ref="view_mrp_procurement_filter"/>
         </record>
         <menuitem action="mrp_procurement_action" id="menu_mrp_procurement_action" parent="mrp.menu_mrp_manufacturing"
diff --git a/addons/mrp/report/mrp_production_order_view.xml b/addons/mrp/report/mrp_production_order_view.xml
index a97abe846de..1ae2e6b32bb 100644
--- a/addons/mrp/report/mrp_production_order_view.xml
+++ b/addons/mrp/report/mrp_production_order_view.xml
@@ -48,8 +48,8 @@
             <field name="arch" type="xml">
                 <search string="Search">
                   <group col="16" colspan="6">
-                   		<filter string="This Year" icon="terp-mrp" domain="[('name','=',time.localtime()[0])]" default="1" />
-						<filter string="This Month" icon="terp-mrp" domain="[('month','=',time.strftime('%%m'))]" default="1"/>
+                   		<filter string="This Year" name="this_year" icon="terp-mrp" domain="[('name','=',time.localtime()[0])]"/>
+						<filter string="This Month" name="this_month" icon="terp-mrp" domain="[('month','=',time.strftime('%%m'))]"/>
                         <separator orientation="vertical"/>
 						<filter string="Current" icon="terp-mrp" domain="[('state','in',('open','draft'))]"/>
 						<separator orientation="vertical"/>
@@ -101,7 +101,7 @@
             <field name="view_mode">tree,graph</field>
             <field name="view_id" ref="view_report_mrp_production_order_tree"/>
             <field name="search_view_id" ref="view_report_mrp_production_order_filter"/>
-          <field name="context">{'search_default_Product': 1}</field>
+          <field name="context">{'search_default_Product': 1,'search_default_this_year':1,'search_default_this_month':1}</field>
             
         </record>
 
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 123aa463b60..acaace9d7f9 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -259,7 +259,7 @@
                     <field name="name"/>
                     <field name="partner_id"/>
                     <field name="user_id" widget="selection">
-                        <filter icon="terp-partner" domain="[('user_id','=',uid)]" help="My Sale Orders" default="1"/>
+                        <filter icon="terp-partner" domain="[('user_id','=',uid)]" help="My Sale Orders" />
                     </field>
                     <field name="date_order" string="Order date" />
                     <newline/>
@@ -279,6 +279,7 @@
             <field name="res_model">sale.order</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph</field>
+            <field name="context">{'search_default_user_id':uid}</field>
             <field name="search_view_id" ref="view_sales_order_filter"/>
         </record>
         <menuitem action="action_order_form" id="menu_sale_order" parent="base.menu_sales" sequence="3"/>
@@ -426,7 +427,7 @@
                     </field>
                     <newline/>
                     <group expand="context.get('report',False)" string="Group By..." colspan="9" col="8">
-                        <filter string="Product" icon="terp-sale"  default="1" domain="[]" context="{'group_by':'product_id'}"/>
+                        <filter string="Product" icon="terp-sale" domain="[]" context="{'group_by':'product_id'}"/>
                         <filter string="Order" icon="terp-sale" domain="[]" context="{'group_by':'order_id'}"/>
                         <filter string="Salesman" icon="terp-sale" domain="[]" context="{'group_by':'salesman_id'}"/>
                         <filter string="State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
@@ -445,8 +446,8 @@
                         domain="[('state','=','done')]"
                         name="unshipped"
                         separator="1" />
-                    <filter icon="terp-purchase" string="Uninvoiced"
-                        domain="[('invoiced','&lt;&gt;', 1),('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]"  default="1"
+                    <filter icon="terp-purchase" string="Uninvoiced" name="uninvoiced"
+                        domain="[('invoiced','&lt;&gt;', 1),('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]" 
                         separator="1" />
                     <separator orientation="vertical"/>
                     <field name="order_id"/>
diff --git a/addons/stock/report/report_stock_view.xml b/addons/stock/report/report_stock_view.xml
index 014fb344fd6..01041392226 100644
--- a/addons/stock/report/report_stock_view.xml
+++ b/addons/stock/report/report_stock_view.xml
@@ -9,12 +9,12 @@
             <field name="arch" type="xml">
                 <search string="Search Location">
                     <group col="10" colspan="4">
-                        <filter icon="terp-stock" string="Internal Locations" domain="[('location_id.usage', '=', 'internal')]" help="Internal Locations" default="1" />
+                        <filter icon="terp-stock" name="internal_locations" string="Internal Locations" domain="[('location_id.usage', '=', 'internal')]" help="Internal Locations"/>
                         <filter icon="terp-stock" string="Customer Locations" domain="[('location_id.usage', '=', 'customer')]" help="Customer Locations" />
                         <filter icon="terp-stock" string="Supplier Locations" domain="[('location_id.usage', '=', 'supplier')]" help="Supplier Locations" />
                         <separator orientation="vertical"/>
                         <field name="location_id"/>
-                        <field name="product_id" default="1"/>
+                        <field name="product_id"/>
                     </group>
                     <newline/>
                     <group expand="1" string="Group By..." colspan="4" col="10">
@@ -73,7 +73,7 @@
             <field name="res_model">stock.report.prodlots</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="context">{'full':'1'}</field>
+            <field name="context">{'full':'1','search_default_internal_locations':1}</field>
             <field name="search_view_id" ref="view_stock_report_prodlots_filter" />
         </record>
         <record id="stock_report_tracklots_tree" model="ir.ui.view">
@@ -152,8 +152,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Dates of Inventories">
-                    <filter icon="gtk-media-rewind" string="Stockable"
-                        default="1"
+                    <filter icon="gtk-media-rewind" name="stockable" string="Stockable"
                         domain="[('product_id.type','=', 'product')]"/>
                     <filter icon="gtk-media-rewind" string="Consumable"
                         domain="[('product_id.type','=', 'consumable')]"/>
@@ -184,6 +183,7 @@
             <field name="name">Dates of Latest Inventories by Product</field>
             <field name="res_model">report.stock.lines.date</field>
             <field name="view_type">form</field>
+             <field name="context">{'search_default_stockable':1}</field>
             <field name="view_mode">tree,form</field>
         </record>
 

From b89b50b8bec80878f6b12ab0e7da09fffb7ac3d9 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.com>
Date: Mon, 10 May 2010 17:22:54 +0530
Subject: [PATCH 09/82] [ADD] auction: Converted remaining osv_memory wizards.

bzr revid: uco@tinyerp.com-20100510115254-0ka5tuixh982bgta
---
 addons/auction/__openerp__.py                 |   2 +
 addons/auction/wizard/__init__.py             |   2 +
 addons/auction/wizard/auction_aie_send.py     | 222 +++++++++++++++++
 .../auction/wizard/auction_aie_send_result.py | 139 +++++++++++
 .../wizard/auction_aie_send_result_view.xml   |  58 +++++
 .../auction/wizard/auction_aie_send_view.xml  |  63 +++++
 .../auction/wizard/auction_lots_numerotate.py | 184 ++++++++++++++
 .../wizard/auction_lots_numerotate_view.xml   | 132 ++++++++++
 addons/auction/wizard/wizard_aie_send.py      | 232 ------------------
 .../auction/wizard/wizard_aie_send_result.py  | 137 -----------
 .../auction/wizard/wizard_lots_numerotate.py  | 154 ------------
 11 files changed, 802 insertions(+), 523 deletions(-)
 create mode 100644 addons/auction/wizard/auction_aie_send.py
 create mode 100644 addons/auction/wizard/auction_aie_send_result.py
 create mode 100644 addons/auction/wizard/auction_aie_send_result_view.xml
 create mode 100644 addons/auction/wizard/auction_aie_send_view.xml
 create mode 100644 addons/auction/wizard/auction_lots_numerotate.py
 create mode 100644 addons/auction/wizard/auction_lots_numerotate_view.xml
 delete mode 100644 addons/auction/wizard/wizard_aie_send.py
 delete mode 100644 addons/auction/wizard/wizard_aie_send_result.py
 delete mode 100644 addons/auction/wizard/wizard_lots_numerotate.py

diff --git a/addons/auction/__openerp__.py b/addons/auction/__openerp__.py
index 8918a6394aa..cd27c60fdb7 100644
--- a/addons/auction/__openerp__.py
+++ b/addons/auction/__openerp__.py
@@ -50,8 +50,10 @@
         'wizard/auction_payer_sel_view.xml',
         'wizard/auction_lots_sms_send_view.xml',
         'wizard/auction_catalog_flagey_view.xml',
+#        'wizard/auction_aie_send_view.xml',
 #        'wizard/auction_aie_send_result_view.xml',
         'wizard/auction_lots_buyer_map_view.xml',
+#        'wizard/auction_lots_numerotate_view.xml',
         
         'auction_view.xml',
         'auction_report.xml',
diff --git a/addons/auction/wizard/__init__.py b/addons/auction/wizard/__init__.py
index 957ab02b053..41ada315889 100644
--- a/addons/auction/wizard/__init__.py
+++ b/addons/auction/wizard/__init__.py
@@ -31,8 +31,10 @@ import auction_lots_sms_send
 import auction_catalog_flagey_report
 #import auction_lots_cancel
 #import auction_transfer_unsold_object
+#import auction_aie_send
 #import auction_aie_send_result
 import auction_lots_buyer_map
+#import auction_lots_numerotate
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/auction/wizard/auction_aie_send.py b/addons/auction/wizard/auction_aie_send.py
new file mode 100644
index 00000000000..c395bb64982
--- /dev/null
+++ b/addons/auction/wizard/auction_aie_send.py
@@ -0,0 +1,222 @@
+# -*- 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/>.     
+#
+##############################################################################
+
+#
+# Does not properly work concurrently !!!
+#
+import base64
+import mimetypes
+import httplib
+import threading
+from tools.translate import _
+from osv import fields,osv
+
+class auction_lots_send_aie(osv.osv_memory):
+    _name = 'auction.lots.send.aie'
+    _descritption = 'Send to website'
+    
+    def _date_get(self, cr, uid, context={}):
+        selection = context and context.get('selection')
+        if selection:
+            return [('','')] + selection
+        return [('','')]
+
+    _columns = {
+        'uname': fields.char('Login', size=64),
+        'password': fields.char('Password', size=64),
+        'objects': fields.integer('# of objects', readonly=True),
+        'lang': fields.selection([('fr','fr'),('ned','ned'),('eng','eng'),('de','de')],'Language'),
+        'numerotation': fields.selection([('prov','Provisoire'),('definite','Definitive (ordre catalogue)')],'Numerotation'),
+        'dates': fields.selection(_date_get,'Auction Date'),
+        'img_send': fields.boolean('Send Image also ?'),   
+    }
+    
+    def default_get(self, cr, uid, fields, context):
+        """ 
+         To get default values for the object.
+         @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 which we want default values 
+         @param context: A standard dictionary 
+         @return: A dictionary which of fields with values. 
+        """
+        res = super(auction_lots_send_aie, self).default_get(cr, uid, fields, context=context)
+        if 'uname' in fields and context.get('uname',False):
+            res['uname'] = context.get('uname')
+        if 'password' in fields and context.get('password',False):
+            res['password'] = context.get('password')
+        return res
+    
+    def _catalog_send(uname, passwd, lang, did, catalog):
+        def post_multipart(host, selector, fields, files):
+            def encode_multipart_formdata(fields, files):
+                BOUNDARY = '----------ThIs_Is_tHe_bouNdaRY_$'
+                CRLF = '\r\n'
+                L = []
+                for (key, value) in fields:
+                    L.append('--' + BOUNDARY)
+                    L.append('Content-Disposition: form-data; name="%s"' % key)
+                    L.append('')
+                    L.append(value)
+                for (key,value) in files:
+                    L.append('--' + BOUNDARY)
+                    L.append('Content-Disposition: form-data; name="%s"; filename="%s"' % (key, key+'.pickle'))
+                    L.append('Content-Type: application/octet-stream')
+                    L.append('')
+                    L.append(value)
+                L.append('--' + BOUNDARY + '--')
+                L.append('')
+                body = CRLF.join(L)
+                content_type = 'multipart/form-data; boundary=%s' % BOUNDARY
+                return content_type, body
+            content_type, body = encode_multipart_formdata(fields, files)
+            import httplib
+    
+            headers = {"Content-type": content_type, "Accept": "*/*"}
+            conn = httplib.HTTPConnection(host)
+            conn.request("POST", '/bin/catalog.cgi', body, headers = headers)
+            response = conn.getresponse()
+            val = response.status
+            conn.close()
+            return val
+        return post_multipart('auction-in-europe.com', "/bin/catalog.cgi", (('uname',uname),('password',passwd),('did',did),('lang',lang)),(('file',catalog),))
+    
+    def _photo_bin_send(uname, passwd, ref, did, photo_name, photo_data):
+        def get_content_type(filename):
+            return mimetypes.guess_type(filename)[0] or 'application/octet-stream'
+    
+        def post_multipart(host, selector, fields, files):
+            def encode_multipart_formdata(fields, files):
+                BOUNDARY = '----------ThIs_Is_tHe_bouNdaRY_$'
+                CRLF = '\r\n'
+                L = []
+                for (key, value) in fields:
+                    L.append('--' + BOUNDARY)
+                    L.append('Content-Disposition: form-data; name="%s"' % key)
+                    L.append('')
+                    L.append(value)
+                for (key, filename, data) in files:
+                    L.append('--' + BOUNDARY)
+                    L.append('Content-Disposition: form-data; name="%s"; filename="%s"' % (key, filename))
+                    L.append('Content-Type: %s' % get_content_type(filename))
+                    L.append('')
+                    L.append(data)
+                L.append('--' + BOUNDARY + '--')
+                L.append('')
+                body = CRLF.join(L)
+                content_type = 'multipart/form-data; boundary=%s' % BOUNDARY
+                return content_type, body
+            content_type, body = encode_multipart_formdata(fields, files)
+    
+            headers = {"Content-type": content_type, "Accept": "*/*"}
+            conn = httplib.HTTPConnection(host)
+            conn.request("POST", '/bin/photo.cgi', body, headers = headers)
+            response = conn.getresponse()
+            val = response.status
+            conn.close()
+            return val
+        return post_multipart('auction-in-europe.com', "/bin/photo.cgi", (('uname',uname),('ref',ref),('passwd',passwd),('did',did)),(('file',photo_name,photo_data),))
+    
+    
+    def _photos_send(cr, uid, uname, passwd, did, ids):
+        for (ref,id) in ids:
+            service = netsvc.LocalService("object_proxy")
+    #       ids_attach = service.execute(db_name,uid, 'ir.attachment', 'search', [('res_model','=','auction.lots'), ('res_id', '=',id)])
+            datas = service.execute(cr.db_name,uid, 'auction.lots', 'read',[id], ['name','image'])
+            if len(datas):
+                bin = base64.decodestring(datas[0]['image'])
+                fname = datas[0]['name']
+                _photo_bin_send(uname, passwd, ref, did, fname, bin)
+    
+    def get_dates(self, cr, uid, ids, context={}):
+        import httplib
+        data_obj = self.pool.get('ir.model.data')
+        conn = httplib.HTTPConnection('www.auction-in-europe.com')
+        datas = self.read(cr, uid, ids[0],['uname','password'])
+        conn.request("GET", "/aie_upload/dates_get.php?uname=%s&passwd=%s" % (datas['uname'], datas['password']))
+        response = conn.getresponse()
+        if response.status == 200:
+            def _date_decode(x):
+                return (x.split(' - ')[0], (' - '.join(x.split(' - ')[1:]).decode('latin1','replace').encode('utf-8','replace')))
+            context['selection'] = map(_date_decode, response.read().split('\n'))
+            self._date_get(cr, uid, context=context)
+        else:
+            raise osv.except_osv(_('Error'), _("Connection to WWW.Auction-in-Europe.com failed !"))
+        id1 = data_obj._get_id(cr, uid, 'auction', 'view_auction_lots_send')
+        res_id = data_obj.browse(cr, uid, id1, context=context).res_id
+        context.update(datas)
+        return {
+            'view_type': 'form',
+            'view_mode': 'form',
+            'res_model': 'auction.lots.send.aie',
+            'views': [(res_id,'form')],
+            'type': 'ir.actions.act_window',
+            'target':'new',
+            'context': context
+        }
+    
+    def _send(self, cr, uid, ids, context={}):
+        import pickle, thread, sql_db
+        cr.execute('select name,aie_categ from auction_lot_category')
+        vals = dict(cr.fetchall())
+        cr.close()
+    
+        service = netsvc.LocalService("object_proxy")
+        lots = service.execute(cr.dbname, uid, 'auction.lots', 'read', context['active_ids'],  ['obj_num','lot_num','obj_desc','bord_vnd_id','lot_est1','lot_est2','artist_id','lot_type','aie_categ'])
+        lots_ids = []
+        datas = self.read(cr, uid, ids[0],['uname','login','lang','numerotation','dates'])
+        for l in lots:
+            if datas['numerotation']=='prov':
+                l['ref']='%s%03d' % (l['bord_vnd_id'][1],l['lot_num'])
+                l['ref2']='%s%03d' % (l['bord_vnd_id'][1],l['lot_num'])
+            else:
+                l['ref']='%04d' % (l['obj_num'],)
+                l['ref2']='%s%03d' % (l['bord_vnd_id'][1],l['lot_num'])
+            if l['artist_id']:
+                l['artist_id'] = l['artist_id'][1]
+            else:
+                l['artist_id'] = ''
+            for n in ('obj_desc','artist_id','lot_type'):
+                try:
+                    l[n]=l[n].decode('utf-8','replace').encode('latin1','replace')
+                except:
+                    l[n]=''
+            del l['lot_num']
+            del l['obj_num']
+            del l['bord_vnd_id']
+            l['aie_categ'] = vals.get(l['lot_type'], False)
+            lots_ids.append((l['ref'], l['id']))
+        args = pickle.dumps(lots)
+        thread.start_new_thread(_catalog_send, (datas['uname'],datas['password'],datas['lang'],datas['dates'], args))
+        if(datas['form']['img_send']==True):
+            thread.start_new_thread(_photos_send, (cr.dbname, uid, datas['uname'], datas['password'],datas['dates'], lots_ids))
+        return {}
+    
+    def send_pdf(self, cr, uid, ids, context):
+        threaded_calculation = threading.Thread(target=self._send, args=(cr, uid, ids, context))
+        threaded_calculation.start()
+        return {}
+
+auction_lots_send_aie()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/auction/wizard/auction_aie_send_result.py b/addons/auction/wizard/auction_aie_send_result.py
new file mode 100644
index 00000000000..404881b2d6b
--- /dev/null
+++ b/addons/auction/wizard/auction_aie_send_result.py
@@ -0,0 +1,139 @@
+# -*- 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/>.     
+#
+##############################################################################
+
+#
+# Does not properly work concurrently !!!
+#
+
+import netsvc
+from tools.translate import _
+from osv import fields, osv
+
+class auction_lots_pay(osv.osv_memory):
+    _name = 'auction.lots.send.aie.results'
+    _description = 'Send results to Auction-in-europe.com'
+    
+    
+    def _date_get(self, cr, uid, context={}):
+        selection = context and context.get('selection')
+        if selection:
+            return [('','')] + selection
+        return [('','')]
+    
+    _columns = {
+        'uname': fields.char('Login', size=64),
+        'password': fields.char('Password', size=64),
+        'objects': fields.integer('# of objects'),
+        'dates': fields.selection(_date_get,'Auction Date'),
+    }
+    
+    def default_get(self, cr, uid, fields, context):
+        """ 
+         To get default values for the object.
+         @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 which we want default values 
+         @param context: A standard dictionary 
+         @return: A dictionary which of fields with values. 
+        """
+        res = super(auction_lots_pay, self).default_get(cr, uid, fields, context=context)
+        if 'uname' in fields and context.get('uname',False):
+            res['uname'] = context.get('uname')
+        if 'password' in fields and context.get('password',False):
+            res['password'] = context.get('password')
+        return res
+
+    def _catalog_send(self, uname, passwd, did, catalog):
+        def post_multipart(host, selector, fields, files):
+            def encode_multipart_formdata(fields, files):
+                BOUNDARY = '----------ThIs_Is_tHe_bouNdaRY_$'
+                CRLF = '\r\n'
+                L = []
+                for (key, value) in fields:
+                    L.append('--' + BOUNDARY)
+                    L.append('Content-Disposition: form-data; name="%s"' % key)
+                    L.append('')
+                    L.append(value)
+                for (key,value) in files:
+                    L.append('--' + BOUNDARY)
+                    L.append('Content-Disposition: form-data; name="%s"; filename="%s"' % (key, key+'.pickle'))
+                    L.append('Content-Type: application/octet-stream')
+                    L.append('')
+                    L.append(value)
+                L.append('--' + BOUNDARY + '--')
+                L.append('')
+                body = CRLF.join(L)
+                content_type = 'multipart/form-data; boundary=%s' % BOUNDARY
+                return content_type, body
+            content_type, body = encode_multipart_formdata(fields, files)
+            import httplib
+    
+            headers = {"Content-type": content_type, "Accept": "*/*"}
+            conn = httplib.HTTPConnection(host)
+            conn.request("POST", '/bin/catalog_result.cgi', body, headers = headers)
+            response = conn.getresponse()
+            val = response.status
+            conn.close()
+            return val
+        return post_multipart('auction-in-europe.com', "/bin/catalog_result.cgi", (('uname',uname),('password',passwd),('did',did)),(('file',catalog),))
+    
+    def get_dates(self, cr, uid, ids, context):
+        import httplib
+        conn = httplib.HTTPConnection('www.auction-in-europe.com')
+        data_obj = self.pool.get('ir.model.data')
+        datas = self.read(cr, uid, ids[0],['uname','password'])
+        conn.request("GET", "/aie_upload/dates_get_result.php?uname=%s&passwd=%s" % (datas['uname'], datas['password']))
+        response = conn.getresponse()
+        if response.status == 200:
+            def _date_decode(x):
+                return (x.split(' - ')[0], (' - '.join(x.split(' - ')[1:]).decode('latin1').encode('utf-8')))
+            context['selection'] = map(_date_decode, response.read().split('\n'))
+            self._date_get(cr, uid, context=context)
+        else:
+            raise osv.except_osv(_('Error'),
+                                       _("Connection to WWW.Auction-in-Europe.com failed !"))
+        id1 = data_obj._get_id(cr, uid, 'auction', 'view_auction_lots_send_result_send')
+        res_id = data_obj.browse(cr, uid, id1, context=context).res_id
+        context.update(datas)
+        return {
+            'view_type': 'form',
+            'view_mode': 'form',
+            'res_model': 'auction.lots.send.aie.results',
+            'views': [(res_id,'form')],
+            'type': 'ir.actions.act_window',
+            'target':'new',
+            'context': context
+        }
+    
+    def send(self, cr, uid, ids, context):
+        import pickle
+        service = netsvc.LocalService("object_proxy")
+        datas = self.read(cr, uid, ids[0],['uname','password','dates'])
+        lots = service.execute(cr.dbname, uid, 'auction.lots', 'read', context['active_ids'],  ['obj_num','obj_price'])
+        args = pickle.dumps(lots)
+        self._catalog_send(datas['uname'], datas['password'], datas['dates'], args)
+        return {}
+    
+auction_lots_pay()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/auction/wizard/auction_aie_send_result_view.xml b/addons/auction/wizard/auction_aie_send_result_view.xml
new file mode 100644
index 00000000000..7056e88b20e
--- /dev/null
+++ b/addons/auction/wizard/auction_aie_send_result_view.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        
+        <!--  Auction lots send result -->
+        
+		<record id="view_auction_lots_send_result_login" model="ir.ui.view">
+            <field name="name">Auction lots send result - Login</field>
+            <field name="model">auction.lots.send.aie.results</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+				<form string="Login">
+				    <field name="uname"/>
+				    <newline/>
+				    <field name="password" password="True"/>
+				    <group col="2" colspan="4">
+                		<button icon='gtk-cancel' special="cancel"
+                			string="Cancel" />
+                		<button name="get_dates" string="Continue"
+                			colspan="1" type="object" icon="gtk-go-forward" />
+                	</group>
+				</form>
+			</field>
+		</record>
+		
+		<act_window name="Send results to Auction-in-europe.com"
+            res_model="auction.lots.send.aie.results"
+            src_model="auction.lots"
+		    view_mode="form"
+		    view_id="view_auction_lots_send_result_login"
+		    target="new"        
+            key2="client_action_multi"    
+		    id="action_view_auction_lots_send_result_login"/>
+
+		<record id="view_auction_lots_send_result_send" model="ir.ui.view">
+            <field name="name">Auction lots send result - Send</field>
+            <field name="model">auction.lots.send.aie.results</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+				<form string="Login">
+				    <field name="uname" readonly="1"/>
+				    <field name="password" password="True" readonly="1"/>
+				    <newline/>
+				    <field name="objects" readonly="1"/>
+				    <newline/>
+				    <field name="dates" colspan="3"/>
+				    <group col="2" colspan="4">
+                		<button icon='gtk-cancel' special="cancel"
+                			string="Cancel" />
+                		<button name="send" string="Send on your website"
+                			colspan="1" type="object" icon="gtk-go-forward" />
+                	</group>
+				</form>
+			</field>
+		</record>
+		
+	</data>
+</openerp>
diff --git a/addons/auction/wizard/auction_aie_send_view.xml b/addons/auction/wizard/auction_aie_send_view.xml
new file mode 100644
index 00000000000..b26aaaf8bc4
--- /dev/null
+++ b/addons/auction/wizard/auction_aie_send_view.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        
+        <!--  Auction lots send result -->
+        
+		<record id="view_auction_lots_send_login" model="ir.ui.view">
+            <field name="name">Auction lots send - Login</field>
+            <field name="model">auction.lots.send.aie</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+				<form string="Login">
+				    <field name="uname"/>
+				    <newline/>
+				    <field name="password" password="True"/>
+				    <separator colspan="4"/>
+				    <group col="2" colspan="4">
+                		<button icon='gtk-cancel' special="cancel"
+                			string="Cancel" />
+                		<button name="get_dates" string="Continue"
+                			colspan="1" type="object" icon="gtk-go-forward" />
+                	</group>
+				</form>
+			</field>
+		</record>
+		
+		<act_window name="Send to website"
+            res_model="auction.lots.send.aie"
+            src_model="auction.lots"
+		    view_mode="form"
+		    view_id="view_auction_lots_send_login"
+		    target="new"        
+            key2="client_action_multi"    
+		    id="action_view_auction_lots_send_login"/>
+		
+		<record id="view_auction_lots_send" model="ir.ui.view">
+            <field name="name">Auction lots - Send</field>
+            <field name="model">auction.lots.send.aie</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+				<form string="Login">
+			        <field name="uname" readonly="1"/>
+				    <field name="password" password="True" readonly="1"/>
+				    <newline/>
+				    <field name="objects"/>
+				    <field name="lang"/>
+				    <field name="numerotation"/>
+				    <field name="img_send"/>
+				    <newline/>
+				    <field name="dates" colspan="3"/>
+				    <separator colspan="4"/>
+				    <group col="2" colspan="4">
+                		<button icon='gtk-cancel' special="cancel"
+                			string="Cancel" />
+                		<button name="send_pdf" string="Send on your website"
+                			colspan="1" type="object" icon="gtk-go-forward" />
+                	</group>
+				</form>
+			</field>
+		</record>
+
+	</data>
+</openerp>
diff --git a/addons/auction/wizard/auction_lots_numerotate.py b/addons/auction/wizard/auction_lots_numerotate.py
new file mode 100644
index 00000000000..79163146529
--- /dev/null
+++ b/addons/auction/wizard/auction_lots_numerotate.py
@@ -0,0 +1,184 @@
+# -*- 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 netsvc
+import sql_db
+from osv import osv, fields
+from tools.translate import _
+
+class auction_lots_numerotate_per_lot(osv.osv_memory):
+    _name = 'auction.lots.numerotate'
+    _description = 'Numerotation (per lot)'
+    
+    _columns = {
+        'bord_vnd_id': fields.many2one('auction.deposit', 'Depositer Inventory', required=True),
+        'lot_num': fields.integer('Inventory Number', readonly=True),
+        'lot_est1': fields.float('Minimum Estimation', readonly=True),
+        'lot_est2': fields.float('Maximum Estimation', readonly=True),
+        'name': fields.char('Short Description', size=64, readonly=True),
+        'obj_desc': fields.text('Description', readonly=True),
+        'obj_num': fields.integer('Catalog Number', required=True)
+    }
+    
+    def default_get(self, cr, uid, fields, context):
+        """ 
+         To get default values for the object.
+         @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 which we want default values 
+         @param context: A standard dictionary 
+         @return: A dictionary which of fields with values. 
+        """
+        res = super(wiz_auc_lots_numerotate_per_lot, self).default_get(cr, uid, fields, context=context)
+        active_id = context.get('active_id',False)
+        active_model = context.get('active_model')
+        if active_id and (active_model and active_model!='auction.lots'):
+            return res
+        lots_obj = self.pool.get('auction.lots')
+        lots = lots_obj.browse(cr, uid, active_id)
+        if 'bord_vnd_id' in fields and context.get('bord_vnd_id',False):
+            res['bord_vnd_id'] = context.get('bord_vnd_id')
+        if 'lot_num' in fields and context.get('lot_num',False):
+            res['lot_num'] = context.get('lot_num')
+        if 'lot_est1' in fields:
+            res['lot_est1'] = lots.lot_est1
+        if 'lot_est2' in fields:
+            res['lot_est2'] = lots.lot_est2
+        if 'name' in fields:
+            res['name'] = lots.name
+        if 'obj_desc' in fields:
+            res['obj_desc'] = lots.obj_desc
+        if 'obj_num' in fields:
+            res['obj_num'] = lots.obj_num
+        return res
+    
+    def open_init_form(self, cr, uid, ids, context={}):
+        record_ids = context and context.get('active_ids',False) or False
+        assert record_ids, _('Active IDs not Found')
+        data_obj = self.pool.get('ir.model.data')
+        view_id = data_obj._get_id(cr, uid, 'auction', 'view_auction_numerotate')
+        if view_id:
+            res_id = data_obj.browse(cr, uid, view_id, context=context).res_id
+        return {
+            'view_type': 'form',
+            'view_mode': 'form',
+            'res_model': 'auction.lots.numerotate',
+            'res_id' : False,
+            'views': [(res_id,'form')],
+            'type': 'ir.actions.act_window',
+            'target':'new',
+            'context': context
+        }
+    
+    def numerotate(self, cr, uid, ids, context={}):
+        record_ids = context and context.get('active_ids',False) or False
+        assert record_ids, _('Active IDs not Found')
+        datas = self.read(cr, uid, ids[0], ['bord_vnd_id','lot_num','obj_num'])
+        data_obj = self.pool.get('ir.model.data')
+        lots_obj = self.pool.get('auction.lots')
+        res = lots_obj.search(cr,uid,[('bord_vnd_id','=',datas['bord_vnd_id']), 
+                                      ('lot_num','=',int(datas['lot_num']))])
+        found = [r for r in res if r in record_ids]
+        if len(found)==0:
+            raise osv.except_osv('UserError', 'This record does not exist !')
+        lots_obj.write(cr, uid, found, {'obj_num':int(datas['obj_num'])} )
+        view_id = data_obj._get_id(cr, uid, 'auction', 'view_auction_numerotate')
+        if view_id:
+            res_id = data_obj.browse(cr, uid, view_id, context=context).res_id
+        context.update(datas)
+        return {
+            'view_type': 'form',
+            'view_mode': 'form',
+            'res_model': 'auction.lots.numerotate',
+            'res_id' : False,
+            'views': [(res_id,'form')],
+            'type': 'ir.actions.act_window',
+            'target':'new',
+            'context': context
+        }
+    
+    def read_record(self, cr, uid, ids, context={}):
+        record_ids = context and context.get('active_ids',False) or False
+        assert record_ids, _('Active IDs not Found')
+        datas = self.read(cr, uid, ids[0], ['bord_vnd_id','lot_num'])
+        lots_obj = self.pool.get('auction.lots')
+        res = lots_obj.search(cr, uid, [('bord_vnd_id','=',datas['bord_vnd_id']), 
+                                        ('lot_num','=',int(datas['lot_num']))])
+        found = [r for r in res if r in record_ids]
+        if len(found)==0:
+            raise osv.except_osv('UserError', 'This record does not exist !')
+        lots_datas = lots_obj.read(cr, uid, found,
+                                   ['obj_num', 'name', 'lot_est1', 
+                                   'lot_est2', 'obj_desc'])
+        return lots_datas[0]
+    
+    def test_exist(self, cr, uid, ids, context={}):
+        record_ids = context and context.get('active_ids',False) or False
+        assert record_ids, _('Active IDs not Found')
+        data_obj = self.pool.get('ir.model.data')
+        datas = self.read(cr, uid, ids[0], ['bord_vnd_id','lot_num'])
+        res = self.pool.get('auction.lots').search(cr, uid, 
+                                                   [('bord_vnd_id','=',datas['bord_vnd_id']), 
+                                                    ('lot_num','=',int(datas['lot_num']))])
+        found = [r for r in res if r in record_ids]
+        if len(found)==0:
+            raise osv.except_osv('Error', 'This lot does not exist !')
+        view_id = data_obj._get_id(cr, uid, 'auction', 'view_auction_lots_numerotate_second')
+        if view_id:
+            res_id = data_obj.browse(cr, uid, view_id, context=context).res_id
+        context.update(datas)
+        return {
+            'view_type': 'form',
+            'view_mode': 'form',
+            'res_model': 'auction.lots.numerotate',
+            'res_id' : False,
+            'views': [(res_id,'form')],
+            'type': 'ir.actions.act_window',
+            'target':'new',
+            'context' : context
+        }
+    
+auction_lots_numerotate_per_lot()
+
+class auction_lots_numerotate(osv.osv_memory):
+    _name = 'auction.lots.numerotate_cont'
+    _description = 'Numerotation (automatic)'
+    
+    _columns = {
+        'number': fields.integer('First Number', required=True)   
+    }
+   
+    def numerotate_cont(self, cr, uid, ids, context={}):
+        record_ids = context and context.get('active_ids',False) or False
+        assert record_ids, _('Active IDs not Found')
+        datas = self.read(cr, uid, ids[0], ['number'])
+        nbr = int(datas['number'])
+        lots_obj = self.pool.get('auction.lots')
+        rec_ids = lots_obj.browse(cr, uid, record_ids)
+        for rec_id in rec_ids:
+            lots_obj.write(cr, uid, [rec_id.id], {'obj_num':nbr})
+            nbr+=1
+        return {}
+    
+auction_lots_numerotate()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/auction/wizard/auction_lots_numerotate_view.xml b/addons/auction/wizard/auction_lots_numerotate_view.xml
new file mode 100644
index 00000000000..6c7775dfbb6
--- /dev/null
+++ b/addons/auction/wizard/auction_lots_numerotate_view.xml
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        
+        <!--  Numerotation (per lot) -->
+        
+        <record id="view_auction_numerotate" model="ir.ui.view">
+            <field name="name">auction.lots.numerotate.open</field>
+            <field name="model">auction.lots.numerotate</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+				<form string="Catalog Numerotation" >
+				    <separator string="Object Reference" colspan="4"/>
+				    <field name="bord_vnd_id"/>
+				    <newline/>
+				    <field name="lot_num" readonly="False" required="True"/>
+				    <separator colspan="4"/>
+				    <group col="4" colspan="4">
+				    	<button icon='gtk-cancel' special="cancel"
+                			string="Exit" />
+                		<button name="test_exist" string="Continue"
+                			colspan="2" type="object" icon="gtk-go-forward" />
+				    </group>
+				</form>
+			</field>
+		</record>
+        
+        <act_window name="Numerotation (per lot)"
+            res_model="auction.lots.numerotate"
+            src_model="auction.lots"
+            view_id="view_auction_numerotate"
+		    view_mode="form"
+		    target="new"        
+            key2="client_action_multi"    
+		    id="action_view_auction_lots_numerotate"/>
+        
+		<record id="view_auction_lots_numerotate_second" model="ir.ui.view">
+            <field name="name">auction.lots.numerotate.second</field>
+            <field name="model">auction.lots.numerotate</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+				<form string="Catalog Numerotation" >
+		            <group>
+				        <separator string="Object Reference" colspan="4"/>
+				        <field name="bord_vnd_id" readonly="1"/>
+				        <field name="lot_num" readonly="1"/>
+				        <field name="name" readonly="1" colspan="3"/>
+				        <field name="obj_desc" readonly="1" colspan="3"/>
+				        <field name="lot_est1" readonly="1"/>
+				        <field name="lot_est2" readonly="1"/>
+				        <separator string="Object Reference" colspan="4"/>
+				        <field name="obj_num"/>
+				    </group>
+				    <newline/>
+				    <separator colspan="4"/>
+				    <group col="4" colspan="4">
+				    	<button icon='gtk-cancel' special="cancel"
+                			string="Exit" />
+                		<button name="open_init_form" string="Back" type="object"
+                			icon="gtk-go-back"/>
+                		<button name="numerotate" string="Numerotate"
+                			type="object" icon="gtk-go-forward"/>
+				    </group>
+				</form>
+			</field>
+		</record>
+		
+		<record id="action_auction_lots_numerotate" model="ir.actions.act_window">
+            <field name="name">Numerotation (per lot)</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">auction.lots.numerotate</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_auction_lots_numerotate_second"/>
+            <field name="target">new</field>            
+        </record>
+		
+		<record id="view_auction_numerotate_not_exist" model="ir.ui.view">
+            <field name="name">auction.lots.numerotate.not_exist</field>
+            <field name="model">auction.lots.numerotate</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+				<form string="Catalog Numerotation">
+				    <label string="This lot does not exist !" colspan="4"/>
+				    <group col="4" colspan="4">
+				    	<button icon='gtk-cancel' special="cancel"
+                			string="Exit" />
+                		<button name="open_init_form" string="Retry" type="object"
+                			icon="gtk-go-back"/>
+                	</group>
+				</form>
+			</field>
+		</record>
+		
+		<record id="action_auction_lots_numerotate_not_exist" model="ir.actions.act_window">
+            <field name="name">Numerotation - Not Exist</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">auction.lots.numerotate</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_auction_numerotate_not_exist"/>
+            <field name="target">new</field>            
+        </record>
+		    
+		<record id="view_auction_numerotate_cont" model="ir.ui.view">
+            <field name="name">Numerotation (automatic)</field>
+            <field name="model">auction.lots.numerotate_cont</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+				<form string="Catalog Numerotation" >
+				    <field name="number" colspan="4"/>
+				    <separator colspan="4"/>
+				    <group col="4" colspan="4">
+				    	<button icon='gtk-cancel' special="cancel"
+                			string="Exit" />
+                		<button name="numerotate_cont" string="Numerotation"
+                			colspan="2" type="object" icon="gtk-go-forward" />
+				    </group>
+				</form>
+			</field>
+		</record>
+		
+		<act_window name="Numerotation (automatic)"
+            res_model="auction.lots.numerotate_cont"
+            src_model="auction.lots"
+		    view_mode="form"
+		    target="new"        
+            key2="client_action_multi"    
+		    id="action_view_auction_numerotate_cont"/>
+
+	</data>
+</openerp>
diff --git a/addons/auction/wizard/wizard_aie_send.py b/addons/auction/wizard/wizard_aie_send.py
deleted file mode 100644
index 2d9c444cba1..00000000000
--- a/addons/auction/wizard/wizard_aie_send.py
+++ /dev/null
@@ -1,232 +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/>.     
-#
-##############################################################################
-
-#
-# Does not properly work concurently !!!
-#
-import pooler
-import wizard
-import netsvc
-import base64
-import mimetypes
-import httplib
-import threading
-from tools.translate import _
-
-login_form = '''<?xml version="1.0"?>
-<form title="Login">
-    <field name="uname"></field>
-    <newline/>
-    <field name="password"></field>
-</form>'''
-
-
-send_form = '''<?xml version="1.0"?>
-<form title="Selection">
-    <field name="uname"></field>
-    <field name="password"></field>
-    <newline/>
-    <field name="objects"></field>
-    <field name="lang"></field>
-    <field name="numerotation"></field>
-    <field name="img_send"></field>
-    <newline/>
-    <field name="dates" colspan="3"></field>
-</form>'''
-
-login_fields = {
-    'uname': {'string':'Login', 'type':'char'},
-    'password': {'string':'Password', 'type':'char'},
-    'numerotation': {'string':'Numerotation', 'type':'selection', 'selection':[('prov','Provisoire'),('definite','Definitive (ordre catalogue)')]},
-    'dates': {'string':'Auction Date', 'type':'selection', 'selection':[]}
-}
-
-send_fields = {
-    'uname': {'string':'Login', 'type':'char', 'readonly':True},
-    'password': {'string':'Password', 'type':'char', 'readonly':True},
-    'objects': {'string':'# of objects', 'type':'integer', 'readonly':True},
-    'lang': {'string':'Langage', 'type':'selection', 'selection':[('fr','fr'),('ned','ned'),('eng','eng'),('de','de')]},
-    'numerotation': {'string':'Numerotation', 'type':'selection', 'selection':[('prov','Provisoire'),('definite','Definitive (ordre catalogue)')]},
-    'dates': {'string':'Auction Date', 'type':'selection', 'selection':[]},
-    'img_send': {'string':'Send Image also ?', 'type':'boolean'}
-}
-
-def _catalog_send(uname, passwd, lang, did, catalog):
-    def post_multipart(host, selector, fields, files):
-        def encode_multipart_formdata(fields, files):
-            BOUNDARY = '----------ThIs_Is_tHe_bouNdaRY_$'
-            CRLF = '\r\n'
-            L = []
-            for (key, value) in fields:
-                L.append('--' + BOUNDARY)
-                L.append('Content-Disposition: form-data; name="%s"' % key)
-                L.append('')
-                L.append(value)
-            for (key,value) in files:
-                L.append('--' + BOUNDARY)
-                L.append('Content-Disposition: form-data; name="%s"; filename="%s"' % (key, key+'.pickle'))
-                L.append('Content-Type: application/octet-stream')
-                L.append('')
-                L.append(value)
-            L.append('--' + BOUNDARY + '--')
-            L.append('')
-            body = CRLF.join(L)
-            content_type = 'multipart/form-data; boundary=%s' % BOUNDARY
-            return content_type, body
-        content_type, body = encode_multipart_formdata(fields, files)
-        import httplib
-
-        headers = {"Content-type": content_type, "Accept": "*/*"}
-        conn = httplib.HTTPConnection(host)
-        conn.request("POST", '/bin/catalog.cgi', body, headers = headers)
-        response = conn.getresponse()
-        val = response.status
-        conn.close()
-        return val
-    return post_multipart('auction-in-europe.com', "/bin/catalog.cgi", (('uname',uname),('password',passwd),('did',did),('lang',lang)),(('file',catalog),))
-
-def _photo_bin_send(uname, passwd, ref, did, photo_name, photo_data):
-    def get_content_type(filename):
-        return mimetypes.guess_type(filename)[0] or 'application/octet-stream'
-
-    def post_multipart(host, selector, fields, files):
-        def encode_multipart_formdata(fields, files):
-            BOUNDARY = '----------ThIs_Is_tHe_bouNdaRY_$'
-            CRLF = '\r\n'
-            L = []
-            for (key, value) in fields:
-                L.append('--' + BOUNDARY)
-                L.append('Content-Disposition: form-data; name="%s"' % key)
-                L.append('')
-                L.append(value)
-            for (key, filename, data) in files:
-                L.append('--' + BOUNDARY)
-                L.append('Content-Disposition: form-data; name="%s"; filename="%s"' % (key, filename))
-                L.append('Content-Type: %s' % get_content_type(filename))
-                L.append('')
-                L.append(data)
-            L.append('--' + BOUNDARY + '--')
-            L.append('')
-            body = CRLF.join(L)
-            content_type = 'multipart/form-data; boundary=%s' % BOUNDARY
-            return content_type, body
-        content_type, body = encode_multipart_formdata(fields, files)
-
-        headers = {"Content-type": content_type, "Accept": "*/*"}
-        conn = httplib.HTTPConnection(host)
-        conn.request("POST", '/bin/photo.cgi', body, headers = headers)
-        response = conn.getresponse()
-        val = response.status
-        conn.close()
-        return val
-    return post_multipart('auction-in-europe.com', "/bin/photo.cgi", (('uname',uname),('ref',ref),('passwd',passwd),('did',did)),(('file',photo_name,photo_data),))
-
-
-def _photos_send(cr,uid, uname, passwd, did, ids):
-    for (ref,id) in ids:
-        service = netsvc.LocalService("object_proxy")
-#       ids_attach = service.execute(db_name,uid, 'ir.attachment', 'search', [('res_model','=','auction.lots'), ('res_id', '=',id)])
-        datas = service.execute(cr.db_name,uid, 'auction.lots', 'read',[id], ['name','image'])
-        if len(datas):
-            bin = base64.decodestring(datas[0]['image'])
-            fname = datas[0]['name']
-            _photo_bin_send(uname, passwd, ref, did, fname, bin)
-
-def _get_dates(self,cr,uid, datas,context={}):
-    global send_fields
-    import httplib
-    conn = httplib.HTTPConnection('www.auction-in-europe.com')
-    conn.request("GET", "/aie_upload/dates_get.php?uname=%s&passwd=%s" % (datas['form']['uname'], datas['form']['password']))
-    response = conn.getresponse()
-    if response.status == 200:
-        def _date_decode(x):
-            return (x.split(' - ')[0], (' - '.join(x.split(' - ')[1:]).decode('latin1','replace').encode('utf-8','replace')))
-        send_fields['dates']['selection'] = map(_date_decode, response.read().split('\n'))
-    else:
-        raise wizard.except_wizard(_('Error'), _("Connection to WWW.Auction-in-Europe.com failed !"))
-    return {'objects':len(datas['ids'])}
-
-def _send(self,db_name,uid, datas,context={}):
-    import pickle, thread, sql_db
-    #cr = pooler.get_db(cr.dbname).cursor()
-
-#   cr=sql_db.db.cursor()
-    cr = pooler.get_db(db_name).cursor()
-
-    cr.execute('select name,aie_categ from auction_lot_category')
-    vals = dict(cr.fetchall())
-    cr.close()
-
-    service = netsvc.LocalService("object_proxy")
-    lots = service.execute(cr.dbname,uid, 'auction.lots', 'read', datas['ids'],  ['obj_num','lot_num','obj_desc','bord_vnd_id','lot_est1','lot_est2','artist_id','lot_type','aie_categ'])
-    ids = []
-    for l in lots:
-        if datas['form']['numerotation']=='prov':
-            l['ref']='%s%03d' % (l['bord_vnd_id'][1],l['lot_num'])
-            l['ref2']='%s%03d' % (l['bord_vnd_id'][1],l['lot_num'])
-        else:
-            l['ref']='%04d' % (l['obj_num'],)
-            l['ref2']='%s%03d' % (l['bord_vnd_id'][1],l['lot_num'])
-        if l['artist_id']:
-            l['artist_id'] = l['artist_id'][1]
-        else:
-            l['artist_id'] = ''
-        for n in ('obj_desc','artist_id','lot_type'):
-            try:
-                l[n]=l[n].decode('utf-8','replace').encode('latin1','replace')
-            except:
-                l[n]=''
-        del l['lot_num']
-        del l['obj_num']
-        del l['bord_vnd_id']
-        l['aie_categ'] = vals.get(l['lot_type'], False)
-        ids.append((l['ref'], l['id']))
-    args = pickle.dumps(lots)
-    thread.start_new_thread(_catalog_send, (datas['form']['uname'],datas['form']['password'],datas['form']['lang'],datas['form']['dates'], args))
-    if(datas['form']['img_send']==True):
-        thread.start_new_thread(_photos_send, (cr.dbname,uid, datas['form']['uname'],datas['form']['password'],datas['form']['dates'], ids))
-    return {}
-
-def _send_pdf(self, cr, uid, data, context):
-    threaded_calculation = threading.Thread(target=_send, args=(self, cr.dbname, uid, data, context))
-    threaded_calculation.start()
-    return {}
-
-class wiz_auc_lots_pay(wizard.interface):
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type': 'form', 'arch':login_form, 'fields': login_fields, 'state':[('date_ask','Continue'),('end','Cancel')]}
-        },
-        'date_ask': {
-            'actions': [_get_dates],
-            'result': {'type': 'form', 'arch':send_form, 'fields': send_fields, 'state':[('send','Send on your website'),('end','Cancel')]}
-        },
-        'send': {
-            'actions': [_send_pdf],
-            'result': {'type': 'state', 'state':'end'}
-        }
-    }
-wiz_auc_lots_pay('auction.lots.send.aie');
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/auction/wizard/wizard_aie_send_result.py b/addons/auction/wizard/wizard_aie_send_result.py
deleted file mode 100644
index 30b6b82c124..00000000000
--- a/addons/auction/wizard/wizard_aie_send_result.py
+++ /dev/null
@@ -1,137 +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/>.     
-#
-##############################################################################
-
-#
-# Does not properly work concurently !!!
-#
-
-import wizard
-import netsvc
-from tools.translate import _
-
-login_form = '''<?xml version="1.0"?>
-<form title="Login">
-    <field name="uname"></field>
-    <newline/>
-    <field name="password"></field>
-</form>'''
-
-
-send_form = '''<?xml version="1.0"?>
-<form title="Selection">
-    <field name="uname"></field>
-    <field name="password"></field>
-    <newline/>
-    <field name="objects"></field>
-    <newline/>
-    <field name="dates" colspan="3"></field>
-</form>'''
-
-login_fields = {
-    'uname': {'string':'Login', 'type':'char'},
-    'password': {'string':'Password', 'type':'char'},
-    'dates': {'string':'Auction Date', 'type':'selection', 'selection':[]}
-}
-
-send_fields = {
-    'uname': {'string':'Login', 'type':'char', 'readonly':True},
-    'password': {'string':'Password', 'type':'char', 'readonly':True},
-    'objects': {'string':'# of objects', 'type':'integer', 'readonly':True},
-    'dates': {'string':'Auction Date', 'type':'selection', 'selection':[]}
-}
-
-def _catalog_send(uname, passwd, did, catalog):
-    def post_multipart(host, selector, fields, files):
-        def encode_multipart_formdata(fields, files):
-            BOUNDARY = '----------ThIs_Is_tHe_bouNdaRY_$'
-            CRLF = '\r\n'
-            L = []
-            for (key, value) in fields:
-                L.append('--' + BOUNDARY)
-                L.append('Content-Disposition: form-data; name="%s"' % key)
-                L.append('')
-                L.append(value)
-            for (key,value) in files:
-                L.append('--' + BOUNDARY)
-                L.append('Content-Disposition: form-data; name="%s"; filename="%s"' % (key, key+'.pickle'))
-                L.append('Content-Type: application/octet-stream')
-                L.append('')
-                L.append(value)
-            L.append('--' + BOUNDARY + '--')
-            L.append('')
-            body = CRLF.join(L)
-            content_type = 'multipart/form-data; boundary=%s' % BOUNDARY
-            return content_type, body
-        content_type, body = encode_multipart_formdata(fields, files)
-        import httplib
-
-        headers = {"Content-type": content_type, "Accept": "*/*"}
-        conn = httplib.HTTPConnection(host)
-        conn.request("POST", '/bin/catalog_result.cgi', body, headers = headers)
-        response = conn.getresponse()
-        val = response.status
-        conn.close()
-        return val
-    return post_multipart('auction-in-europe.com', "/bin/catalog_result.cgi", (('uname',uname),('password',passwd),('did',did)),(('file',catalog),))
-
-def _get_dates(self,cr,uid, datas, context):
-    global send_fields
-    import httplib
-    conn = httplib.HTTPConnection('www.auction-in-europe.com')
-    conn.request("GET", "/aie_upload/dates_get_result.php?uname=%s&passwd=%s" % (datas['form']['uname'], datas['form']['password']))
-    response = conn.getresponse()
-    if response.status == 200:
-        def _date_decode(x):
-            return (x.split(' - ')[0], (' - '.join(x.split(' - ')[1:]).decode('latin1').encode('utf-8')))
-        send_fields['dates']['selection'] = map(_date_decode, response.read().split('\n'))
-    else:
-        raise wizard.except_wizard(_('Error'),
-                                   _("Connection to WWW.Auction-in-Europe.com failed !"))
-    return {'objects':len(datas['ids'])}
-
-def _send(self,cr,uid, datas, context):
-    import pickle
-    service = netsvc.LocalService("object_proxy")
-    lots = service.execute(cr.dbname,uid, 'auction.lots', 'read', datas['ids'],  ['obj_num','obj_price'])
-    args = pickle.dumps(lots)
-    _catalog_send(datas['form']['uname'],datas['form']['password'], datas['form']['dates'], args)
-    return {}
-
-class wiz_auc_lots_pay(wizard.interface):
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type': 'form', 'arch':login_form, 'fields': login_fields, 'state':[('date_ask','Continue'),('end','Cancel')]}
-        },
-        'date_ask': {
-            'actions': [_get_dates],
-            'result': {'type': 'form', 'arch':send_form, 'fields': send_fields, 'state':[('send','Send on your website'),('end','Cancel')]}
-        },
-        'send': {
-            'actions': [_send],
-            'result': {'type': 'state', 'state':'end'}
-        }
-    }
-wiz_auc_lots_pay('auction.lots.send.aie.results');
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/auction/wizard/wizard_lots_numerotate.py b/addons/auction/wizard/wizard_lots_numerotate.py
deleted file mode 100644
index 1232a559e4d..00000000000
--- a/addons/auction/wizard/wizard_lots_numerotate.py
+++ /dev/null
@@ -1,154 +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 wizard
-import netsvc
-import pooler
-import sql_db
-
-numerotate_form_cont = '''<?xml version="1.0"?>
-<form title="%s">
-    <field name="number" string="%s"/>
-</form>''' % ('Continuous Numerotation','First Number')
-
-numerotate_fields_cont = {
-    'number': {'string':'First Number', 'type':'integer', 'required':True}
-}
-
-numerotate_not_exist = '''<?xml version="1.0"?>
-<form title="%s">
-    <label string="This lot does not exist !" colspan="4"/>
-</form>''' % ('Catalog Numerotation',)
-
-
-numerotate_form = '''<?xml version="1.0"?>
-<form title="%s">
-    <separator string="%s" colspan="4"/>
-    <field name="bord_vnd_id"/>
-    <newline/>
-    <field name="lot_num"/>
-</form>''' % ('Catalog Numerotation','Object Reference')
-
-numerotate_fields = {
-    'bord_vnd_id': {'string':'Depositer Inventory', 'type':'many2one', 'required':True, 'relation':'auction.deposit'},
-    'lot_num': {'string':'Lot Number', 'type':'integer', 'required':True},
-}
-
-numerotate_form2 = '''<?xml version="1.0"?>
-<form title="%s">
-    <group>
-        <separator string="%s" colspan="4"/>
-        <field name="bord_vnd_id" readonly="1"/>
-        <field name="lot_num" readonly="1"/>
-        <field name="name" readonly="1" colspan="3"/>
-        <field name="obj_desc" readonly="1" colspan="3"/>
-        <field name="lot_est1" readonly="1"/>
-        <field name="lot_est2" readonly="1"/>
-        <separator string="%s" colspan="4"/>
-        <field name="obj_num"/>
-    </group>
-</form>''' % ('Catalog Numerotation','Object Reference','Object Reference')
-
-numerotate_fields2 = {
-    'bord_vnd_id': {'string':'Object Inventory', 'type':'many2one', 'relation':'auction.deposit', 'readonly':True},
-    'lot_num': {'string':'Inventory Number', 'type':'integer', 'readonly':True},
-    'lot_est1': {'string':'Minimum Estimation', 'type':'float', 'readonly':True},
-    'lot_est2': {'string':'Maximum Estimation', 'type':'float', 'readonly':True},
-    'name': {'string':'Short Description', 'type':'char', 'size':64, 'readonly':True},
-    'obj_desc': {'string':'Description', 'type':'text', 'readonly':True},
-    'obj_num': {'string':'Catalog Number', 'type':'integer', 'required':True}
-}
-
-def _read_record(self,cr,uid,datas,context={}):
-    form = datas['form']
-    res = pooler.get_pool(cr.dbname).get('auction.lots').search(cr,uid,[('bord_vnd_id','=',form['bord_vnd_id']), ('lot_num','=',int(form['lot_num']))])
-    found = [r for r in res if r in datas['ids']]
-    if len(found)==0:
-        raise wizard.except_wizard('UserError', 'This record does not exist !')
-    datas = pooler.get_pool(cr.dbname).get('auction.lots').read(cr,uid,found,['obj_num', 'name', 'lot_est1', 'lot_est2', 'obj_desc'])
-    return datas[0]
-
-def _test_exist(self,cr,uid,datas,context={}):
-    form = datas['form']
-    res = pooler.get_pool(cr.dbname).get('auction.lots').search(cr,uid,[('bord_vnd_id','=',form['bord_vnd_id']), ('lot_num','=',int(form['lot_num']))])
-    found = [r for r in res if r in datas['ids']]
-    if len(found)==0:
-        return 'not_exist'
-    return 'search'
-
-def _numerotate(self,cr,uid,datas,context={}):
-    form = datas['form']
-    res = pooler.get_pool(cr.dbname).get('auction.lots').search(cr,uid,[('bord_vnd_id','=',form['bord_vnd_id']), ('lot_num','=',int(form['lot_num']))])
-    found = [r for r in res if r in datas['ids']]
-    if len(found)==0:
-        raise wizard.except_wizard('UserError', 'This record does not exist !')
-    pooler.get_pool(cr.dbname).get('auction.lots').write(cr,uid,found,{'obj_num':int(form['obj_num'])} )
-    return {'lot_inv':'', 'lot_num':''}
-
-def _numerotate_cont(self,cr,uid,datas,context={}):
-    nbr = int(datas['form']['number'])
-    refs = pooler.get_pool(cr.dbname).get('auction.lots')
-    rec_ids = refs.browse(cr,uid,datas['ids'])
-    for rec_id in rec_ids:
-        refs.write(cr,uid,[rec_id.id],{'obj_num':nbr})
-        nbr+=1
-    return {}
-
-class wiz_auc_lots_numerotate(wizard.interface):
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type': 'form', 'arch':numerotate_form, 'fields': numerotate_fields, 'state':[('end','Cancel'),('choice','Continue')]}
-        },
-        'search': {
-            'actions': [_read_record],
-            'result': {'type': 'form', 'arch':numerotate_form2, 'fields': numerotate_fields2, 'state':[('end','Exit'),('init','Back'),('set_number','Numerotate')]}
-        },
-        'choice' : {
-            'actions' : [],
-            'result' : {'type' : 'choice', 'next_state': _test_exist }
-        },
-        'not_exist' : {
-            'actions': [],
-            'result': {'type': 'form', 'arch':numerotate_not_exist, 'fields': {}, 'state':[('end','Exit'),('init','Retry')]}
-        },
-        'set_number': {
-            'actions': [_numerotate],
-            'result': {'type': 'state', 'state':'init'}
-        }
-    }
-wiz_auc_lots_numerotate('auction.lots.numerotate');
-
-
-class wiz_auc_lots_numerotate(wizard.interface):
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type': 'form', 'arch':numerotate_form_cont, 'fields': numerotate_fields_cont, 'state':[('end','Exit'),('set_number','Numerotation')]}
-        },
-        'set_number': {
-            'actions': [_numerotate_cont],
-            'result': {'type': 'state', 'state':'end'}
-        }
-    }
-wiz_auc_lots_numerotate('auction.lots.numerotate_cont');
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-

From 36bab80a14a2f0f70cdd38434d95981be7735b20 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 11 May 2010 14:42:22 +0530
Subject: [PATCH 10/82] Task Id-617 :  Add the yml for
 purchase_requisition_exclusive and purchase_requisition multiple

bzr revid: sbh@tinyerp.com-20100511091222-ht4x9uhhgu846095
---
 addons/purchase_requisition/__openerp__.py    |   1 +
 .../test/purchase_requisition.yml             | 222 ++++++++++++++++++
 .../test/purchase_requisition_exclusive.yml   | 139 +++++++++++
 3 files changed, 362 insertions(+)
 create mode 100644 addons/purchase_requisition/test/purchase_requisition.yml
 create mode 100644 addons/purchase_requisition/test/purchase_requisition_exclusive.yml

diff --git a/addons/purchase_requisition/__openerp__.py b/addons/purchase_requisition/__openerp__.py
index 35e7e8a82ca..bb6266aceed 100644
--- a/addons/purchase_requisition/__openerp__.py
+++ b/addons/purchase_requisition/__openerp__.py
@@ -35,6 +35,7 @@
                     "purchase_requisition_view.xml",
                     "security/ir.model.access.csv","purchase_requisition_sequence.xml"],
     "active": False,
+    "test":['test/purchase_requisition.yml','test/purchase_requisition_exclusive.yml'],
     "installable": True
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/purchase_requisition/test/purchase_requisition.yml b/addons/purchase_requisition/test/purchase_requisition.yml
new file mode 100644
index 00000000000..7ac6edccd3c
--- /dev/null
+++ b/addons/purchase_requisition/test/purchase_requisition.yml
@@ -0,0 +1,222 @@
+
+-
+  In order to test the purchase requicisition module, I will do a sale order -> purchase_requisition ->
+  purchase flow and I will buy the required products at two different suppliers.
+
+- 
+  Modifying a res.users record
+- 
+  !record {model: res.users, id: base.user_root}:
+    groups_id:
+      - base.group_system
+      - base.group_erp_manager
+      - base.group_user
+      - base.group_multi_company
+      - base.group_extended
+      - base.group_no_one
+      - base.group_partner_manager
+      - base.group_maintenance_manager
+      - product.group_uos
+      - product.group_product_manager
+      - product.group_product_variant
+      - account.group_account_invoice
+      - account.group_account_user
+      - account.group_account_manager
+      - stock.group_stock_manager
+      - stock.group_stock_user
+      - purchase.group_purchase_manager
+      - purchase.group_purchase_user
+      - mrp.group_mrp_manager
+      - mrp.group_mrp_user
+      - sale.group_sale_manager
+      - sale.group_sale_user
+    
+- 
+  I start by creating a new product 'Laptop ACER', which is purchased at Asustek, in MTO,
+  with the generation of purchase requisitions.
+- 
+  !record {model: product.product, id: product_product_laptopacer0}:
+    categ_id: product.product_category_3
+    cost_method: standard
+    mes_type: fixed
+    name: Laptop ACER
+    procure_method: make_to_order
+    purchase_requisition: 1
+    seller_ids:
+      - delay: 1
+        name: base.res_partner_asus
+        qty: 5.0
+    supply_method: buy
+    type: product
+    uom_id: product.product_uom_unit
+    uom_po_id: product.product_uom_unit
+    volume: 0.0
+    warranty: 0.0
+    weight: 0.0
+    weight_net: 0.0
+    list_price: 100.0    
+    
+    
+- 
+  Then I sell 5 Laptop ACER to the customer Agrolait, sale order TEST/TENDER/0001
+- 
+  !record {model: sale.order, id: sale_order_testtender0}:
+    date_order: '2010-05-10'
+    invoice_quantity: order
+    name: TEST/TENDER/0001
+    order_line:
+      - name: Laptop ACER
+        price_unit: 100.0
+        product_uom: product.product_uom_unit
+        product_uom_qty: 5.0
+        state: draft
+        delay: 7.0
+        product_id: product_product_laptopacer0
+        product_uos_qty: 5.0
+        th_weight: 0.0
+        type: make_to_order
+    order_policy: manual
+    partner_id: base.res_partner_agrolait
+    partner_invoice_id: base.res_partner_address_8
+    partner_order_id: base.res_partner_address_8
+    partner_shipping_id: base.res_partner_address_8
+    picking_policy: direct
+    pricelist_id: product.list0
+    shop_id: sale.shop
+        
+- 
+  Performing a workflow action order_confirm on module sale.order
+- 
+  !workflow {model: sale.order, action: order_confirm, ref: sale_order_testtender0}
+    
+- 
+  I launch he scheduler to compute all procurements, and planify all requisitions orders.
+- 
+  !python {model: mrp.procurement.compute.all}: |
+    proc_obj = self.pool.get('mrp.procurement')
+    proc_obj._procure_confirm(cr,uid)
+-
+  On the purchase tender, I create a new purchase order for the supplier 'DistriPC' by clicking on
+  the button 'New RfQ'. This opens a window to ask me the supplier and I set DistriPC
+  
+- 
+  Creating a purchase.requisition.partner record
+  
+- 
+  !record {model: purchase.requisition.partner, id: purchase_requisition_partner_0}:
+    partner_address_id: base.res_partner_address_7
+    partner_id: base.res_partner_4
+    
+- 
+  Performing an osv_memory action create_order on module purchase.requisition.partner
+  
+- 
+  !python {model: purchase.requisition.partner}: |
+    req_obj = self.pool.get('purchase.requisition')
+    ids =req_obj.search(cr, uid, [('origin','=','TEST/TENDER/0001')])
+    self.create_order(cr, uid, [ref("purchase_requisition_partner_0")], {"lang":
+      'en_US', "active_model": "purchase.requisition", "tz": False, "record_id":
+      1, "active_ids": ids, "active_id": ids[0], })
+    
+-
+ I check that I have two purchase orders on the purchase tender  
+  
+-
+ !python {model: purchase.order}: |
+    order_ids =self.search(cr, uid, [('origin','=','TEST/TENDER/0002')])
+    assert (order_ids==2), "Purchase order  hasn't Created"
+- 
+ I set the purchase requisition as 'Not Exclusive'
+ 
+-
+ !python {model: purchase.requisition}: |
+    ids =self.search(cr, uid, [('origin','=','TEST/TENDER/0001')])
+    self.write(cr,uid,ids[0],{'exclusive': 'multiple' })
+-
+  I change the quantities so that the purchase order for DistriPC includes 3 pieces and the
+  purchase order for Asustek includes 2 pieces.
+
+- 
+  !python {model: purchase.order}: |
+    line_obj=self.pool.get('purchase.order.line')  
+    purchase_id1= self.search(cr, uid, [('name','=','PO00001')])
+    purchase_id2= self.search(cr, uid, [('name','=','PO00002')])
+    order_line1=self.browse(cr, uid, purchase_id1, context)[0].order_line[0].id
+    order_line2=self.browse(cr, uid, purchase_id2, context)[0].order_line[0].id    
+    line_obj.write(cr, uid, [order_line1], {'product_qty':2})
+    line_obj.write(cr, uid, [order_line2], {'product_qty':3})  
+-
+  I confirm and validate both purchase orders
+  
+-
+  !python {model: purchase.order}: |
+   order_ids= self.search(cr, uid, [])
+   import netsvc
+   wf_service = netsvc.LocalService("workflow")  
+   for id in order_ids:    
+      wf_service.trg_validate(uid, 'purchase.order',id,'purchase_confirm', cr)    
+      wf_service.trg_validate(uid, 'purchase.order',id,'purchase_approve', cr) 
+   
+-
+  I check that the delivery order of the customer is in state 'Waiting Goods'
+  
+-
+  !python {model: stock.picking }: |
+    picking_id = self.search(cr, uid, [('origin','=','TEST/TENDER/0001'),('type','=','delivery')])
+    if picking_id:
+      pick=self.browse(cr,uid,picking_id[0])
+      assert (pick.state) =='confirmed'," Order is  not confirm"
+      assert(pick.move_lines[0].state=='wating'),'Order is  not wating"'
+
+-
+  I receive the order of the supplier Asustek from the Incoming Products menu
+  
+-
+  !python {model: stock.picking }: |
+   import time
+   picking_id = self.search(cr, uid, [('origin','=','PO00001:TEST/TENDER/0001'),('type','=','in')])
+   if picking_id:
+     pick=self.browse(cr,uid,picking_id[0])
+     move =pick.move_lines[0]
+     partial_datas = {
+              'partner_id': 2,
+              'address_id': 6,
+              'delivery_date' : time.strftime('%Y-%m-%d'),
+           }
+     partial_datas['move%s'%(move.id)]= {
+       'product_id': move.product_id,
+       'product_qty': move.product_qty,
+       'product_uom': move.product_uom.id,
+      } 
+     self.do_partial(cr, uid, picking_id,partial_datas)
+-
+ I receive the order of the supplier DistriPC from the Incoming Shipments menu
+ 
+-   
+  !python {model: stock.picking }: |
+   import time
+   picking_id = self.search(cr, uid, [('origin','=','PO00002:TEST/TENDER/0001'),('type','=','in')])
+   if picking_id:
+      pick=self.browse(cr,uid,picking_id[0])
+      move =pick.move_lines[0]
+      partial_datas = {
+           'partner_id': 4,
+            'address_id': 7,
+            'delivery_date' : time.strftime('%Y-%m-%d'),
+           }
+      partial_datas['move%s'%(move.id)]= {
+          'product_id': move.product_id,
+          'product_qty': move.product_qty,
+          'product_uom': move.product_uom.id,
+      } 
+      self.do_partial(cr, uid, picking_id,partial_datas)
+-
+  Now, I can check that the delivery order of the customer is in the state Available
+  
+-
+  !python {model: stock.picking }: |
+   picking_id = self.search(cr, uid, [('origin','=','TEST/TENDER/0001'),('type','=','out')])
+   if picking_id:
+      pick=self.browse(cr,uid,picking_id[0])
+      assert (pick.state) =='available'," Order is  not available"    
+
diff --git a/addons/purchase_requisition/test/purchase_requisition_exclusive.yml b/addons/purchase_requisition/test/purchase_requisition_exclusive.yml
new file mode 100644
index 00000000000..e70e8200eef
--- /dev/null
+++ b/addons/purchase_requisition/test/purchase_requisition_exclusive.yml
@@ -0,0 +1,139 @@
+-
+  In order to test the purchase requicisition module, I will do a sale order -> purchase_requisition ->
+  purchase flow and I will buy the required products at two different suppliers.
+  
+-
+  I start by creating a new product 'Laptop ACER', which is purchased at Asustek, in MTO,
+  with the generation of purchase requisitions.    
+  
+- 
+  Modifying a res.users record
+- 
+  !record {model: res.users, id: base.user_root}:
+    groups_id:
+      - base.group_system
+      - base.group_erp_manager
+      - base.group_user
+      - base.group_multi_company
+      - base.group_extended
+      - base.group_no_one
+      - base.group_partner_manager
+      - base.group_maintenance_manager
+      - product.group_uos
+      - product.group_product_manager
+      - product.group_product_variant
+      - account.group_account_invoice
+      - account.group_account_user
+      - account.group_account_manager
+      - stock.group_stock_manager
+      - stock.group_stock_user
+      - purchase.group_purchase_manager
+      - purchase.group_purchase_user
+      - mrp.group_mrp_manager
+      - mrp.group_mrp_user
+      - sale.group_sale_manager
+      - sale.group_sale_user
+- 
+  !record {model: product.product, id: product_product_laptopacer1}:
+    categ_id: product.product_category_3
+    cost_method: standard
+    list_price: 1000.0
+    mes_type: fixed
+    name: Laptop ACER1
+    procure_method: make_to_order
+    purchase_requisition: 1
+    seller_ids:
+      - delay: 1
+        name: base.res_partner_asus
+        qty: 5.0
+    supply_method: buy
+    type: product
+    uom_id: product.product_uom_unit
+    uom_po_id: product.product_uom_unit 
+    
+- 
+  Then I sell 5 Laptop ACER to the customer Agrolait, sale order TEST/TENDER/0002
+  
+- 
+  !record {model: sale.order, id: sale_order_testtender1}:
+    date_order: '2010-04-20'
+    invoice_quantity: order
+    name: TEST/TENDER/0002
+    order_line:
+      - name: Laptop ACER1
+        price_unit: 1000.0
+        product_uom: product.product_uom_unit
+        product_uom_qty: 5.0
+        state: draft
+        'delay': 7.0
+        'product_id': product_product_laptopacer1
+        'type': make_to_order
+    order_policy: manual
+    partner_id: base.res_partner_agrolait
+    partner_invoice_id: base.res_partner_address_8
+    partner_order_id: base.res_partner_address_8
+    partner_shipping_id: base.res_partner_address_8
+    picking_policy: direct
+    pricelist_id: product.list0
+    shop_id: sale.shop    
+- 
+  Performing a workflow action order_confirm on module sale.order
+- 
+  !workflow {model: sale.order, action: order_confirm, ref: sale_order_testtender1}
+
+- 
+  I launch he scheduler to compute all procurements, and planify all requisitions orders
+-  
+  !python {model: mrp.procurement.compute.all}: |
+    proc_obj = self.pool.get('mrp.procurement')
+    proc_obj._procure_confirm(cr,uid)
+-
+  I should find a purchase requisition with the origin 'TEST/TENDER/0002', that includes a request for
+  5 Laptop ACER, and a purchase order on the default supplier for this product
+-    
+ !python {model: purchase.requisition}: |
+    requisition_ids =self.search(cr, uid, [('origin','=','TEST/TENDER/0002')])
+    assert len(requisition_ids), "Purchase requisition  hasn't Created"
+-
+  On the purchase tender, I create a new purchase order for the supplier 'DistriPC' by clicking on
+  the button 'New RfQ'. This opens a window to ask me the supplier and I set DistriPC  
+- 
+  Creating a purchase.requisition.partner record
+- 
+  !record {model: purchase.requisition.partner, id: purchase_requisition_partner_0}:
+    partner_address_id: base.res_partner_address_7
+    partner_id: base.res_partner_4
+        
+- 
+  Performing an osv_memory action create_order on module purchase.requisition.partner
+- 
+  !python {model: purchase.requisition.partner}: |
+    req_obj = self.pool.get('purchase.requisition')
+    ids =req_obj.search(cr, uid, [('origin','=','TEST/TENDER/0002')])
+    self.create_order(cr, uid, [ref("purchase_requisition_partner_0")], {"lang":
+      'en_US', "active_model": "purchase.requisition", "tz": False, "record_id":
+      1, "active_ids": ids, "active_id": ids[0], })
+    
+-
+  I set the purchase tender as 'Exclusive'      
+- 
+ !python {model: purchase.requisition}: |
+    ids =self.search(cr, uid, [('origin','=','TEST/TENDER/0002')])
+    self.write(cr,uid,ids[0],{'exclusive': 'exclusive' })
+-
+ I confirm and validate the RfQ of Asustek      
+-
+ !python {model: purchase.order}: |
+    purchase_id= self.search(cr, uid, [('name','=','PO00003')])[0]
+    import netsvc
+    wf_service = netsvc.LocalService("workflow")  
+    if purchase_id:
+      wf_service.trg_validate(uid, 'purchase.order',purchase_id,'purchase_confirm', cr)
+      wf_service.trg_validate(uid, 'purchase.order',purchase_id,'purchase_approve', cr)  
+-
+  I check that RfQ of DistriPC is cancelled.
+-        
+  !python {model: purchase.order}: |
+   purchase_id= self.search(cr, uid, [('name','=','PO00004')])[0]  
+   state=self.browse(cr,uid,purchase_id).state
+   assert (state=='cancel')
\ No newline at end of file

From aa6933aeb3a8188cad1679812781ab36d53e26c9 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 11 May 2010 15:49:12 +0530
Subject: [PATCH 11/82] Task 529: Create a yml for stock and fix the bug in
 picking wizard

bzr revid: sbh@tinyerp.com-20100511101912-z25438ekb15592me
---
 addons/stock/__openerp__.py      |   2 +-
 addons/stock/stock.py            |   2 +-
 addons/stock/test/stock_test.yml | 357 +++++++++++++++++++++++++++++++
 3 files changed, 359 insertions(+), 2 deletions(-)
 create mode 100644 addons/stock/test/stock_test.yml

diff --git a/addons/stock/__openerp__.py b/addons/stock/__openerp__.py
index 20e0d30d8fb..f1b60f244cd 100644
--- a/addons/stock/__openerp__.py
+++ b/addons/stock/__openerp__.py
@@ -68,7 +68,7 @@ Thanks to the double entry management, the inventory controlling is powerful and
         "security/stock_security.xml",
         "security/ir.model.access.csv",
     ],
-    'demo_xml': ['stock_demo.xml'],
+    'test': ['stock_test.yml'],
     'installable': True,
     'active': False,
     'certificate': '0055421559965',
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 3795351e03a..2bc2511e871 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1006,7 +1006,7 @@ class stock_picking(osv.osv):
 
             delivered_pack = self.browse(cr, uid, delivered_pack_id, context=context)
             delivery_id = delivery_obj.create(cr, uid, {
-                'name':  delivered_pack.name,
+                'name':  delivered_pack.name or move.name,
                 'partner_id': partner_id,
                 'address_id': address_id,
                 'date': delivery_date,
diff --git a/addons/stock/test/stock_test.yml b/addons/stock/test/stock_test.yml
new file mode 100644
index 00000000000..ffe5596604c
--- /dev/null
+++ b/addons/stock/test/stock_test.yml
@@ -0,0 +1,357 @@
+
+-
+  In order to test the stock module, I will create product,
+  create physical inventory ,fill inventory lines from location,split inventory line into production lot
+     
+- 
+  Creating a account.account.type record
+- 
+  !record {model: account.account.type, id: account_account_type_asset0}:
+    close_method: balance
+    code: asset
+    name: Asset
+    sign: 1
+    
+    
+- 
+  Creating a account.account.type record
+- 
+  !record {model: account.account.type, id: account_account_type_liability0}:
+    close_method: balance
+    code: liability
+    name: Liability
+    sign: 1    
+    
+- 
+  Creating a account.account.type record
+- 
+  !record {model: account.account.type, id: account_account_type_income0}:
+    close_method: unreconciled
+    code: income
+    name: Income
+    sign: 1
+    
+    
+- 
+  Creating a account.account.type record
+- 
+  !record {model: account.account.type, id: account_account_type_expense0}:
+    close_method: unreconciled
+    code: expense
+    name: Expense
+    sign: 1    
+- 
+  Creating a account.account.type record
+- 
+  !record {model: account.account.type, id: account_account_type_cash0}:
+    close_method: balance
+    code: cash
+    name: Cash
+    sign: 1
+    
+    
+- 
+  Creating a account.account.type record
+- 
+  !record {model: account.account.type, id: account_account_type_receivable0}:
+    close_method: balance
+    code: receivable
+    name: Receivable
+    sign: 1
+-
+ 
+  Creating a account.account record
+- 
+  !record {model: account.account, id: account_account_receivable0}:
+    code: '40000'
+    company_id: base.main_company
+    currency_mode: current
+    name: Receivable
+    parent_left: 1
+    parent_right: 2
+    type: receivable
+    user_type: account_account_type_receivable0
+- 
+  Creating a account.account record
+- 
+  !record {model: account.account, id: account_account_payable0}:
+    code: '440000'
+    company_id: base.main_company
+    currency_mode: current
+    name: Payable
+    parent_left: 3
+    parent_right: 4
+    type: payable
+    user_type: account_account_type_expense0    
+- 
+  Creating a account.journal record
+- 
+  !record {model: account.journal, id: account_journal_purchasejournal0}:
+    code: pur
+    company_id: base.main_company
+    name: Purchase Journal
+    sequence_id:  account.sequence_purchase_journal
+    type: purchase
+    view_id: account.account_journal_bank_view
+    
+- 
+  Creating a account.journal record
+- 
+  !record {model: account.journal, id: account_journal_salejouran0}:
+    code: sal
+    company_id: base.main_company
+    name: Sale Jouran
+    sequence_id: account.sequence_sale_journal
+    type: sale
+    view_id: account.account_journal_view
+    
+- 
+  Creating a account.account record
+- 
+  !record {model: account.account, id: account_account_expenseaccount0}:
+    code: Expe
+    company_id: base.main_company
+    currency_mode: current
+    name: Expense Account
+    parent_left: 5
+    parent_right: 6
+    type: consolidation
+    user_type: account_account_type_asset0
+- 
+  Creating a account.account record
+- 
+  !record {model: account.account, id: account_account_productsale0}:
+    code: '001'
+    company_id: base.main_company
+    currency_mode: current
+    name: Product Sale
+    type: other
+    user_type: stock.account_account_type_income0
+    
+    
+- 
+  Creating a account.account record
+- 
+  !record {model: account.account, id: account_account_productpurchase0}:
+    code: '0002'
+    company_id: base.main_company
+    currency_mode: current
+    name: Product Purchase
+    type: other
+    user_type: account_account_type_expense0
+        
+- 
+  Creating a res.partner record
+- 
+  !record {model: res.partner, id: res_partner_shawtrust0}:
+    address:
+      - country_id: base.in    
+      - street: St James House, Vicar Lane, Sheffield
+    lang: en_US
+    name: 'Shaw Trust '
+    property_account_payable: account_account_payable0
+    property_account_receivable: account_account_receivable0
+-    
+  Creating a res.partner record
+- 
+  !record {model: res.partner, id: res_partner_diasorinltd0}:
+    address:
+      - country_id: base.in
+        street: Ash House, Ash Road
+    name: DiaSorin Ltd
+    supplier: true
+    
+        
+-
+  Creating a res.partner record
+- 
+  !record {model: res.partner, id: res_partner_microlinktechnologies0}:
+    address:
+      - street: Kailash Vaibhav, Parksite
+    name: Micro Link Technologies
+    property_account_payable: account_account_payable0
+    property_account_receivable: account_account_receivable0   
+    supplier: true        
+    
+-
+  Creating a res.partner.address record
+- 
+  !record {model: res.partner.address, id: res_partner_address_0}:
+    country_id: base.in
+    partner_id: stock.res_partner_diasorinltd0
+    street: Ash House, Ash Road
+    title: Ms.
+    
+               
+-     
+  Creating a product.category record
+- 
+  !record {model: product.category, id: product_category_computer0}:
+    name: Computer
+
+- 
+  Creating a product.product record
+- 
+  !record {model: product.product, id: product_product_hppaviliondesktoppcs0}:
+    categ_id: stock.product_category_computer0
+    cost_method: standard
+    mes_type: fixed
+    list_price: 1000.0    
+    name: HP Pavilion Desktop PCs
+    procure_method: make_to_stock
+    seller_ids:
+      - delay: 1
+        name: stock.res_partner_shawtrust0
+        qty: 5.0
+    supply_method: buy
+    type: product
+    uom_id: product.product_uom_unit
+    uom_po_id: product.product_uom_unit
+    property_account_expense: account_account_productsale0
+    property_account_income: account_account_productsale0    
+    
+- 
+  Creating a product.product record
+- 
+  !record {model: product.product, id: product_product_hpcdwriters0}:
+    categ_id: stock.product_category_computer0
+    cost_method: standard
+    list_price: 1000.0
+    mes_type: fixed
+    name: HP CD writers
+    procure_method: make_to_stock
+    seller_ids:
+      - delay: 1
+        name: res_partner_shawtrust0
+        qty: 5.0
+    supply_method: buy
+    type: product
+    uom_id: product.product_uom_unit
+    uom_po_id: product.product_uom_unit
+    property_account_expense: account_account_productpurchase0
+    property_account_income: account_account_productsale0
+    
+- 
+  I have creating Physical Inventory
+-  
+   !record {model: stock.inventory, id: stock_inventory_physicalinventoy0}:  
+    company_id: base.main_company
+    date: '2010-05-10 18:19:13'
+    date_done: '2010-05-10 18:19:59'
+    inventory_line_id:
+      - company_id: base.main_company
+        location_id: stock.stock_location_stock
+        product_id: stock.product_product_hpcdwriters0
+        product_qty: 10.0
+        product_uom: product.product_uom_unit
+      - company_id: base.main_company
+        location_id: stock.stock_location_stock
+        product_id: stock.product_product_hppaviliondesktoppcs0
+        product_qty: 10.0
+        product_uom: product.product_uom_unit
+    name: Physical inventory
+    state: draft
+    
+
+- 
+  I have Confirm the Inventory
+- 
+  !python {model: stock.inventory}: |
+   self.action_done(cr,uid,[ref('stock_inventory_physicalinventoy0')])
+- 
+  Creating a stock.fill.inventory record
+- 
+  !record {model: stock.fill.inventory, id: stock_fill_inventory_0}:
+    location_id: stock.stock_location_stock
+       
+- 
+  I have fill_inventory on module stock.fill.inventory
+- 
+  !python {model: stock.fill.inventory}: |
+    self.fill_inventory(cr, uid, [ref("stock_fill_inventory_0")], {"lang": 'en_US',
+      "full": "1", "tz": False, "active_model": "stock.inventory", "active_ids":
+      [ref("stock_inventory_physicalinventoy0")], "active_id": ref("stock_inventory_physicalinventoy0"), })
+
+- 
+  Creating a stock.move.split record
+- 
+  !record {model: stock.move.split, id: stock_move_split_0}:
+    line_ids:
+      - name: '00001'
+        quantity: 5      
+    product_id: stock.product_product_hpcdwriters0
+    
+    
+- 
+  Split into production line
+- 
+  !python {model: stock.move.split}: |
+    move_obj=self.pool.get('stock.move')
+    product_obj=self.pool.get('product.product')
+    product_id=product_obj.search(cr,uid,[('name','=','HP CD writers')])
+    move_ids=move_obj.search(cr,uid,[('product_id','in',product_id)])
+    self.split_lot(cr, uid, [ref("stock_move_split_0")], {"lang": 'en_US', "active_model":
+      "stock.move", "active_ids": move_ids, "tz": False, "active_id":move_ids[0]
+      })
+-
+ 
+  In Order to test the picking i have  create picking with move lines
+- 
+  !record {model: stock.picking, id: stock_picking_0}:
+    address_id: res_partner_address_0
+    company_id: base.main_company
+    date: '2010-05-11 15:18:52'
+    invoice_state: none
+    move_lines:
+      - company_id: base.main_company
+        date_planned: '2010-05-11 15:18:57'
+        location_dest_id: stock.stock_location_customers
+        location_id: stock.stock_location_stock
+        name: HP CD writers
+        product_id: stock.product_product_hpcdwriters0
+        product_qty: 3.0
+        product_uom: product.product_uom_unit
+        date: '2010-05-11 15:18:57'
+        product_uos_qty: 3.0
+    move_type: direct
+    type: internal
+    
+    
+- 
+  Performing an osv_memory action draft_force_assign on module stock.picking
+- 
+  !python {model: stock.picking}: |
+    self.draft_force_assign(cr, uid, [ref("stock_picking_0")], {"lang": "en_US", "active_model":
+      "ir.ui.menu", "tz": False, "search_default_confirmed": 1, "contact_display":
+      "partner", "active_ids": [ref("stock.menu_action_picking_tree6")], "active_id":
+      ref("stock.menu_action_picking_tree6"), })
+    
+    
+- 
+  Performing an osv_memory action force_assign on module stock.picking
+- 
+  !python {model: stock.picking}: |
+    self.force_assign(cr, uid, [ref("stock_picking_0")], {"lang": "en_US", "active_model":
+      "ir.ui.menu", "tz": False, "search_default_confirmed": 1, "contact_display":
+      "partner", "active_ids": [ref("stock.menu_action_picking_tree6")], "active_id":
+      ref("stock.menu_action_picking_tree6"), })
+    
+    
+-
+  Performing an osv_memory action do_partial on module stock.partial.picking
+-  
+  !python {model: stock.picking }: |
+   import time
+   pick=self.browse(cr,uid,ref('stock_picking_0'))
+   move =pick.move_lines[0]
+   partial_datas = {
+          'partner_id':pick.address_id.partner_id.id,
+           'address_id': pick.address_id.id,
+           'delivery_date' : time.strftime('%Y-%m-%d')
+            }
+   partial_datas['move%s'%(move.id)]= {
+          'product_id': move.product_id,
+          'product_qty': move.product_qty,
+          'product_uom': move.product_uom.id,
+      } 
+   self.do_partial(cr, uid, [ref('stock_picking_0')],partial_datas)
\ No newline at end of file

From 61aa8dd446ee4d87d392faf793df065d1c07eec2 Mon Sep 17 00:00:00 2001
From: mso <mso@mso>
Date: Tue, 11 May 2010 17:23:03 +0530
Subject: [PATCH 12/82] [IMP] stock: Task-590 Improve receive products,
 Tracking Lot improvements

bzr revid: mso@mso-20100511115303-z3unhyzno54702wf
---
 addons/stock/stock.py                     | 36 +++++++++++++++++++----
 addons/stock/stock_view.xml               |  2 +-
 addons/stock/wizard/stock_partial_move.py |  7 ++++-
 3 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 185f4715ce9..870867d3267 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -350,7 +350,21 @@ stock_location()
 class stock_tracking(osv.osv):
     _name = "stock.tracking"
     _description = "Stock Tracking Lots"
-
+    
+    def get_create_tracking_lot(self, cr, uid, ids, context):
+        tracking_id = context.get('tracking_id', False)
+        tracking_id_list = self.search(cr, uid, [('name', '=', tracking_id)],
+                                            limit=1)
+        if tracking_id_list:
+            tracking_id = tracking_id_list[0]
+        tracking_obj = self.browse(cr, uid, tracking_id)
+        if not tracking_obj:
+            tracking_lot_vals = {
+                'name': tracking_id
+                }
+            tracking_id = self.create(cr, uid, tracking_lot_vals,
+                    context=context)
+        return tracking_id
     def checksum(sscc):
         salt = '31' * 8 + '3'
         sum = 0
@@ -1602,7 +1616,12 @@ class stock_move(osv.osv):
                         'line_id': lines,
                         'ref': ref,
                     })
-        self.write(cr, uid, ids, {'state': 'done', 'date_planned': time.strftime('%Y-%m-%d %H:%M:%S')})
+        tracking_id = context.get('tracking_id', False)
+        if tracking_id:
+            tracking = self.pool.get('stock.tracking')
+            tracking_id = tracking.get_create_tracking_lot(cr, uid,[rec_id], context=context )        
+             
+        self.write(cr, uid, ids, {'state': 'done', 'date_planned': time.strftime('%Y-%m-%d %H:%M:%S'), 'tracking_id': tracking_id})
         for pick in self.pool.get('stock.picking').browse(cr, uid, picking_ids):
             if all(move.state == 'done' for move in pick.move_lines):
                 self.pool.get('stock.picking').action_done(cr, uid, [pick.id])
@@ -1819,7 +1838,8 @@ class stock_move(osv.osv):
         partner_id = partial_datas.get('partner_id', False)
         address_id = partial_datas.get('address_id', False)
         delivery_date = partial_datas.get('delivery_date', False)
-
+        tracking_id = context.get('tracking_id', False)
+        
         new_moves = []
 
         complete, too_many, too_few = [], [], []
@@ -1835,6 +1855,10 @@ class stock_move(osv.osv):
             product_price = partial_data.get('product_price',0.0)
             product_currency = partial_data.get('product_currency',False)
             if move.product_qty == product_qty:
+                self.write(cr, uid, move.id,
+                {
+                    'tracking_id': tracking_id
+                })
                 complete.append(move)
             elif move.product_qty > product_qty:
                 too_few.append(move)
@@ -1879,6 +1903,7 @@ class stock_move(osv.osv):
                         'state': 'assigned',
                         'move_dest_id': False,
                         'price_unit': move.price_unit,
+                        'tracking_id': tracking_id,
                     })
                 complete.append(self.browse(cr, uid, new_move))
             self.write(cr, uid, move.id,
@@ -1892,12 +1917,13 @@ class stock_move(osv.osv):
             self.write(cr, uid, move.id,
                     {
                         'product_qty': move.product_qty,
-                        'product_uos_qty': move.product_qty
+                        'product_uos_qty': move.product_qty,
+                        'tracking_id': tracking_id
                     })
             complete.append(move)
 
         for move in complete:
-            self.action_done(cr, uid, [move.id])
+            self.action_done(cr, uid, [move.id], context)
 
             # TOCHECK : Done picking if all moves are done
             cr.execute("""
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 62d36f2da92..efe95adbff7 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1493,7 +1493,7 @@
                     </group>
                     <newline/>
                     <group col='8' colspan='14' expand="1" string="Tracking Lots">
-                       <field name="tracking_id" widget="selection" context="{'tracking_id': self}" />
+                       <field name="tracking_id" context="{'tracking_id': self}" />
                     </group>
                     <newline/>
                     <group expand="1" string="Group By..." colspan="4" col="8">
diff --git a/addons/stock/wizard/stock_partial_move.py b/addons/stock/wizard/stock_partial_move.py
index bf8d1058aa2..dc4e6d465db 100644
--- a/addons/stock/wizard/stock_partial_move.py
+++ b/addons/stock/wizard/stock_partial_move.py
@@ -186,6 +186,12 @@ class stock_partial_move(osv.osv_memory):
         return res   
 
     def do_partial(self, cr, uid, ids, context):    
+        rec_id = context and context.get('active_id', False)
+        tracking_id = context.get('tracking_id', False)
+        if tracking_id:
+            tracking = self.pool.get('stock.tracking')
+            tracking_id = tracking.get_create_tracking_lot(cr, uid,[rec_id], context=context )        
+            context ['tracking_id'] = tracking_id 
         move_obj = self.pool.get('stock.move')    
         move_ids = context.get('active_ids', False)
         partial = self.browse(cr, uid, ids[0], context)
@@ -208,7 +214,6 @@ class stock_partial_move(osv.osv_memory):
                     'product_price' : getattr(partial, 'move%s_product_price'%(m.id)),
                     'product_currency': getattr(partial, 'move%s_product_currency'%(m.id)).id
                 })  
-        
         res = move_obj.do_partial(cr, uid, move_ids, partial_datas, context=context)
         return {}
  

From 5dd40ebbdb8cfb4e342adc5a4a010166f1fe330e Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.com>
Date: Tue, 11 May 2010 18:22:13 +0530
Subject: [PATCH 13/82] [IMP] mrp: Improved yaml test cases.

bzr revid: uco@tinyerp.com-20100511125213-zsipuad1jvtmn3k8
---
 addons/mrp/test/mrp_phantom_bom.yml      | 14 +++++++-------
 addons/mrp/test/mrp_production_order.yml | 12 ++++++------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/addons/mrp/test/mrp_phantom_bom.yml b/addons/mrp/test/mrp_phantom_bom.yml
index df4ade1cb6e..a9c6c0a4608 100644
--- a/addons/mrp/test/mrp_phantom_bom.yml
+++ b/addons/mrp/test/mrp_phantom_bom.yml
@@ -129,7 +129,6 @@
     date_planned: '2010-04-16 15:53:36'
     location_dest_id: stock.stock_location_output
     location_src_id: stock.stock_location_stock
-    name: MO/00002
     product_id: product_product_orangejuice0
     product_qty: 100.0
     product_uom: product_uom_litre0
@@ -171,7 +170,7 @@
 -
   !python {model: mrp.procurement}: |
     from tools.translate import _
-    proc_ids = self.search(cr, uid, [('origin','=',':MO/00002')])
+    proc_ids = self.search(cr, uid, [('state','!=','cofirmed')])
     assert proc_ids, _('No Procurements!')
 -
   The scheduler runs.
@@ -196,7 +195,7 @@
   !python {model: purchase.order}: |
     from tools.translate import _
     import netsvc
-    purch_ids = self.search(cr, uid, [('origin','in',['SCHEDULER','OP/00002','OP/00003'])])
+    purch_ids = self.search(cr, uid, [('state','=','draft')])
     assert purch_ids, _('No Purchase Orders were made!')
     wf_service = netsvc.LocalService("workflow")
     for p_id in purch_ids:
@@ -207,7 +206,7 @@
   !python {model: purchase.order}: |
     from tools.translate import _
     import netsvc
-    purch_ids = self.search(cr, uid, [('origin','in',['SCHEDULER','OP/00002','OP/00003']),('state','=','confirmed')])
+    purch_ids = self.search(cr, uid, [('state','=','confirmed')])
     assert purch_ids, _('No Confirmed Purchase Orders found!')
     wf_service = netsvc.LocalService("workflow")
     for p_id in purch_ids:
@@ -217,7 +216,7 @@
 -
   !python {model: stock.picking}: |
     from tools.translate import _
-    pick_ids = self.search(cr, uid, [('origin','in',['PO00001:SCHEDULER','PO00002:SCHEDULER','PO00003:OP/00002','PO00004:OP/00003']),('type','=','in')])
+    pick_ids = self.search(cr, uid, [('type','=','in')])
     assert pick_ids, _('No Incoming Shipments found!')
 -
   I receive both the products. My incoming pickings are done.
@@ -229,6 +228,7 @@
 -
   !python {model: stock.partial.picking}: |
      pick_obj = self.pool.get('stock.picking')
-     picking_ids = pick_obj.search(cr, uid, [('origin','in',['PO00001:SCHEDULER','PO00002:SCHEDULER','PO00003:OP/00002','PO00004:OP/00003']),('type','=','in')])
-     self.do_partial(cr, uid, [1],context={'active_ids': picking_ids})
+     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/mrp/test/mrp_production_order.yml b/addons/mrp/test/mrp_production_order.yml
index 023a9f22f31..f143239462a 100644
--- a/addons/mrp/test/mrp_production_order.yml
+++ b/addons/mrp/test/mrp_production_order.yml
@@ -86,27 +86,27 @@
 -
   !python {model: mrp.procurement}: |
     from tools.translate import _
-    proc_ids = self.search(cr, uid, [('origin','=',':MO/00004')])
+    proc_ids = self.search(cr, uid, [('state','!=','confirmed')])
     assert proc_ids, _('No Procurements!')
 -
   The scheduler runs.
 -
   !function {model: mrp.procurement, name: run_scheduler}:
     - model: mrp.procurement
-      search: "[('origin','=',':MO/00004')]"
+      search: "[('state','=','cofirmed')]"
 -
   I am checking Internal picking.
 -
   !python {model: stock.picking}: |
     from tools.translate import _
-    pick_ids = self.search(cr, uid, [('origin','=',':MO/00004'),('type','=','internal')])
+    pick_ids = self.search(cr, uid, [('state','!=','done'),('type','=','internal')])
     assert pick_ids, _('No Internal Pickings!')
 -
   I see that there is a manufacturing order for the subproduct of PC1 with ready state.
 -
   !python {model: mrp.production}: |
     from tools.translate import _
-    order_ids = self.search(cr, uid, [('origin','=',':MO/00004'),('state','=','ready')])
+    order_ids = self.search(cr, uid, [('state','=','confirmed')])
     assert order_ids, _('No manufacturing order!')
 -
   I start producing that product first. So I marked it as started.
@@ -117,7 +117,7 @@
 -
   !python {model: mrp.product.produce}: |
     prod_obj = self.pool.get('mrp.production')
-    prod_ids = prod_obj.search(cr, uid, [('origin','=',':MO/00004')])
+    prod_ids = prod_obj.search(cr, uid, [('state','=','confirmed')])
     self.do_produce(cr, uid, [1], context={'active_ids': prod_ids})
 -
   Now the manufacturing order for subproduct CPU_GEN is done. And manufacturing
@@ -125,7 +125,7 @@
 -
   !python {model: mrp.production}: |
     from tools.translate import _
-    prod_ids = self.search(cr, uid, [('origin','=',':MO/00004'),('state','=','done')])
+    prod_ids = self.search(cr, uid, [('state','!=','done')])
     assert prod_ids, _('Manufacturing order is yet not done!')
 -
   I start producing the product PC1.

From 172690e7e92961f80ac5c09e1de38cce60ca2dff Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.com>
Date: Tue, 11 May 2010 18:35:40 +0530
Subject: [PATCH 14/82] [ADD] sale: Added yaml test for procurement and sale
 order flow. Improved state name in mrp production yaml.

bzr revid: uco@tinyerp.com-20100511130540-w2uvd3zl1hum59ei
---
 addons/mrp/test/mrp_production_order.yml |  2 +-
 addons/sale/__openerp__.py               |  1 +
 addons/sale/test/sale_procurement.yml    | 93 ++++++++++++++++++++++++
 3 files changed, 95 insertions(+), 1 deletion(-)
 create mode 100644 addons/sale/test/sale_procurement.yml

diff --git a/addons/mrp/test/mrp_production_order.yml b/addons/mrp/test/mrp_production_order.yml
index f143239462a..5de26180723 100644
--- a/addons/mrp/test/mrp_production_order.yml
+++ b/addons/mrp/test/mrp_production_order.yml
@@ -93,7 +93,7 @@
 -
   !function {model: mrp.procurement, name: run_scheduler}:
     - model: mrp.procurement
-      search: "[('state','=','cofirmed')]"
+      search: "[('state','=','confirmed')]"
 -
   I am checking Internal picking.
 -
diff --git a/addons/sale/__openerp__.py b/addons/sale/__openerp__.py
index 23e72c60775..32688c91c8a 100644
--- a/addons/sale/__openerp__.py
+++ b/addons/sale/__openerp__.py
@@ -60,6 +60,7 @@
 #        'process/sale_process.xml',
     ],
     'demo_xml': ['sale_demo.xml'],
+#    'test': ['test/sale_procurement.yml'],
     'installable': True,
     'active': False,
     'certificate': '0058103601429',
diff --git a/addons/sale/test/sale_procurement.yml b/addons/sale/test/sale_procurement.yml
new file mode 100644
index 00000000000..5a73236f7bc
--- /dev/null
+++ b/addons/sale/test/sale_procurement.yml
@@ -0,0 +1,93 @@
+-
+  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.
+-
+  !record {model: product.product, id: product_product_table0}:
+    categ_id: product.cat1
+    name: Table
+    procure_method: make_to_order
+    supply_method: produce
+    type: product
+    uom_id: product.product_uom_unit
+    uom_po_id: product.product_uom_unit
+-
+  !record {model: product.product, id: product_product_wood0}:
+    categ_id: product.cat1
+    name: Wood
+    procure_method: make_to_stock
+    supply_method: buy
+    type: product
+    uom_id: product.product_uom_kgm
+    uom_po_id: product.product_uom_kgm
+-
+  I define Minimum stock rule for my stockable product wood
+- 
+  !record {model: stock.warehouse.orderpoint, id: stock_warehouse_orderpoint_op0}:
+    company_id: base.main_company
+    location_id: stock.stock_location_stock
+    logic: max
+    name: OP/00002
+    product_id: product_product_wood0
+    product_max_qty: 15.0
+    product_min_qty: 10.0
+    product_uom: product.product_uom_kgm
+    qty_multiple: 1
+    warehouse_id: stock.warehouse0
+-
+  Now I make a sale order for table.
+- 
+  !record {model: sale.order, id: sale_order_so0}:
+    amount_total: 5.0
+    amount_untaxed: 5.0
+    date_order: '2010-04-30'
+    invoice_quantity: order
+    name: SO006
+    order_line:
+      - company_id: base.main_company
+        delay: 7.0
+        name: Table
+        price_unit: 1.0
+        product_id: product_product_table0
+        product_uom: product.product_uom_unit
+        product_uom_qty: 5.0
+        product_uos_qty: 5.0
+        state: draft
+        type: make_to_order
+    order_policy: manual
+    partner_id: base.res_partner_agrolait
+    partner_invoice_id: base.res_partner_address_8
+    partner_order_id: base.res_partner_address_8
+    partner_shipping_id: base.res_partner_address_8
+    picking_policy: direct
+    pricelist_id: product.list0
+    shop_id: sale.shop
+-
+  I confirm the order.
+- 
+  !workflow {model: sale.order, action: order_confirm, ref: sale_order_so0}
+-
+  I check that one procurement is generated.
+-
+  !python {model: mrp.procurement}: |
+    from tools.translate import _
+    proc_ids = self.search(cr, uid, [('state','=','confirmed')])
+    assert proc_ids, _('No Procurements!')
+- 
+  The scheduler runs.
+-
+  !function {model: mrp.procurement, name: run_scheduler}:
+    - model: mrp.procurement
+      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.
+-
+  !python {model: mrp.procurement}: |
+    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

From f4744b146f68af13efc1c017b1b2d1bae835e596 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 11 May 2010 19:11:05 +0530
Subject: [PATCH 15/82] Task 529: Create a yml for delivery

bzr revid: sbh@tinyerp.com-20100511134105-s5j99ytbx2fc7gxg
---
 addons/delivery/__openerp__.py                |   1 +
 addons/delivery/test/delivery_test.yml        | 176 ++++++++++++++++++
 .../test/purchase_requisition.yml             |   7 +-
 .../test/purchase_requisition_exclusive.yml   |   1 +
 4 files changed, 181 insertions(+), 4 deletions(-)
 create mode 100644 addons/delivery/test/delivery_test.yml

diff --git a/addons/delivery/__openerp__.py b/addons/delivery/__openerp__.py
index 9b0949e07e1..5ac26ce3d23 100644
--- a/addons/delivery/__openerp__.py
+++ b/addons/delivery/__openerp__.py
@@ -39,6 +39,7 @@
         'partner_view.xml'
     ],
     'demo_xml': ['delivery_demo.xml'],
+    'test':['delivery_test.yml',],
     'installable': True,
     'active': False,
     'certificate': '0033981912253',
diff --git a/addons/delivery/test/delivery_test.yml b/addons/delivery/test/delivery_test.yml
new file mode 100644
index 00000000000..aedb76b4926
--- /dev/null
+++ b/addons/delivery/test/delivery_test.yml
@@ -0,0 +1,176 @@
+-
+  In order to test the delivery module, I will do Configuration ‣ Delivery ‣ Delivery Method 
+  And there are two methods for doing that 
+     Delivery based on order quantities,
+     Delivery based on delivered quantities.
+  
+-     
+ I have creating the partner associated with the transport
+- 
+  Creating a res.partner record
+- 
+  !record {model: res.partner, id: res_partner_thepost0}:
+    address:
+      - country_id: base.in
+        name: Micro Link
+    credit_limit: 0.0
+    name: The Post
+    property_account_payable: account.a_pay
+    property_account_receivable: account.a_recv
+    
+    
+- 
+  
+  I have creating associated product for delivery.
+- 
+  !record {model: product.product, id: product_product_deliverybypost0}:
+    categ_id: product.product_category_services
+    cost_method: standard
+    mes_type: fixed
+    name: Delivery Product
+    procure_method: make_to_stock
+    supply_method: buy
+    type: service
+    uom_id: product.product_uom_unit
+    uom_po_id: product.product_uom_unit
+    warranty: 0.0
+    
+-    
+
+  Creating a Delivery Method
+- 
+  !record {model: delivery.carrier, id: delivery_carrier_theopenerpexperss0}:
+    name: The OpenERP Experss
+    partner_id: res_partner_thepost0
+    product_id: product_product_deliverybypost0
+- 
+  Creating a delivery.grid record and define the region for which the tariffs in the grid will be applicable.
+  Then set the condition for which this rule is applicable
+- 
+  !record {model: delivery.grid, id: delivery_grid_weight0}:
+    carrier_id: delivery_carrier_theopenerpexperss0
+    line_ids:
+      - list_price: 120.0
+        max_value: 250.0
+        name: Weight of product
+        operator: <=
+        standard_price: 60.0
+        type: weight
+        price_type: fixed
+        variable_factor: weight
+      - list_price: 0.0
+        max_value: 500.0
+        name: Price &gt;= 500
+        operator: <=
+        standard_price: 20.0
+        type: price
+        price_type: fixed
+        variable_factor: weight
+    country_ids:
+      - base.id
+      - base.be
+      - base.in
+      - base.io
+        
+    name: Weight
+    sequence: 1
+    
+-
+  To check the Delivery based on order quantities , I have created sale order and picking_policy is direct
+- 
+  !record {model: sale.order, id: sale_order_so0}:
+    date_order: '2010-05-11'
+    invoice_quantity: order
+    name: Test/delivery
+    order_line:
+      - name: '[PC1] Basic PC'
+        price_unit: 450.0
+        product_uom: product.product_uom_unit
+        product_uom_qty: 10.0
+        state: draft
+        delay: 2.0
+        product_id: product.product_product_pc1
+        product_uos_qty: 10.0
+        th_weight: 0.0
+        type: make_to_stock
+    order_policy: manual
+    partner_id: base.res_partner_agrolait
+    partner_invoice_id: base.res_partner_address_8
+    partner_order_id: base.res_partner_address_8
+    partner_shipping_id: base.res_partner_address_8
+    picking_policy: direct
+    pricelist_id: product.list0
+    shop_id: sale.shop
+      
+- 
+  Creating a delivery.sale.order record
+- 
+  !record {model: delivery.sale.order, id: delivery_sale_order_0}:
+    carrier_id: delivery_carrier_theopenerpexperss0
+- 
+   To add the delivery charges on the quotation, I have click on Delivery costs button and select the carrier 
+- 
+  !python {model: delivery.sale.order}: |
+    self.delivery_set(cr, uid, [ref("delivery_sale_order_0")], {"lang": "en_US", "active_model":
+      "sale.order", "tz": False, "order_id": 8, "active_ids": [ref("sale_order_so0")],
+      "active_id": ref("sale_order_so0"), })
+-
+  I check that I have two  order line on the sale order 
+- 
+  Performing a workflow action order_confirm on module sale.order
+- 
+  !workflow {model: sale.order, action: order_confirm, ref: sale_order_so0}    
+    
+-
+ To check the  Invoicing based on deliveries.I have created new sale order and picking_policy is Complete Delivery
+- 
+  !record {model: sale.order, id: sale_order_test_complete0}:
+    name: Test/Complete Deliver  
+    carrier_id: delivery.delivery_carrier_theopenerpexperss0
+    invoice_quantity: procurement
+    order_line:
+      - name: '[PC1] Basic PC'
+        price_unit: 450.0
+        product_uom: product.product_uom_unit
+        product_uom_qty: 10.0
+        state: draft
+        delay: 2.0
+        product_id: product.product_product_pc1
+        product_uos_qty: 10.0
+        th_weight: 0.0
+        type: make_to_stock
+    partner_id: base.res_partner_4  
+    partner_order_id: base.res_partner_address_7  
+    partner_invoice_id: base.res_partner_address_7
+    partner_shipping_id: base.res_partner_address_7        
+    pricelist_id: product.list0        
+    order_policy: picking
+    
+    
+- 
+  Performing a workflow action order_confirm on module sale.order
+- 
+  !workflow {model: sale.order, action: order_confirm, ref: sale_order_test_complete0}
+- 
+  Creating a stock.invoice.onshipping record
+- 
+  !record {model: stock.invoice.onshipping, id: stock_invoice_onshipping_0}:
+    journal_id: account.sales_journal
+    type: out_invoice
+- 
+  Create a Invoice form picking
+- 
+  !python {model: stock.invoice.onshipping}: |
+    so=self.pool.get('sale.order').browse(cr,uid,ref('sale_order_test_complete0')) 
+    self.create_invoice(cr, uid, [ref("stock_invoice_onshipping_0")], {"lang": "en_US",
+      "tz": False, "active_model": "stock.picking", "contact_display": "partner",
+      "active_ids": [so.picking_ids[0].id], "active_id": so.picking_ids[0].id })
+-
+  To check  invoice corresponding to the delivery charge in invoice line
+- 
+  !python {model: account.invoice}: |
+    import base
+    so=self.pool.get('sale.order').browse(cr,uid,ref('sale_order_test_complete0'))
+    ids=len(so.invoice_ids[0].invoice_line)
+    assert len(ids), "Invoice   hasn't Created"
+    
diff --git a/addons/purchase_requisition/test/purchase_requisition.yml b/addons/purchase_requisition/test/purchase_requisition.yml
index 7ac6edccd3c..206cd89b6df 100644
--- a/addons/purchase_requisition/test/purchase_requisition.yml
+++ b/addons/purchase_requisition/test/purchase_requisition.yml
@@ -97,7 +97,6 @@
     proc_obj._procure_confirm(cr,uid)
 -
   On the purchase tender, I create a new purchase order for the supplier 'DistriPC' by clicking on
-  the button 'New RfQ'. This opens a window to ask me the supplier and I set DistriPC
   
 - 
   Creating a purchase.requisition.partner record
@@ -123,7 +122,7 @@
   
 -
  !python {model: purchase.order}: |
-    order_ids =self.search(cr, uid, [('origin','=','TEST/TENDER/0002')])
+    order_ids =self.search(cr, uid, [('origin','=','TEST/TENDER/0001')])
     assert (order_ids==2), "Purchase order  hasn't Created"
 - 
  I set the purchase requisition as 'Not Exclusive'
@@ -200,8 +199,8 @@
       pick=self.browse(cr,uid,picking_id[0])
       move =pick.move_lines[0]
       partial_datas = {
-           'partner_id': 4,
-            'address_id': 7,
+           'partner_id':pick.address_id.partner_id.id,
+            'address_id': pick.address_id.id,
             'delivery_date' : time.strftime('%Y-%m-%d'),
            }
       partial_datas['move%s'%(move.id)]= {
diff --git a/addons/purchase_requisition/test/purchase_requisition_exclusive.yml b/addons/purchase_requisition/test/purchase_requisition_exclusive.yml
index e70e8200eef..f5e668d0d53 100644
--- a/addons/purchase_requisition/test/purchase_requisition_exclusive.yml
+++ b/addons/purchase_requisition/test/purchase_requisition_exclusive.yml
@@ -93,6 +93,7 @@
 -    
  !python {model: purchase.requisition}: |
     requisition_ids =self.search(cr, uid, [('origin','=','TEST/TENDER/0002')])
+    ids=len(requisition_ids)
     assert len(requisition_ids), "Purchase requisition  hasn't Created"
 -
   On the purchase tender, I create a new purchase order for the supplier 'DistriPC' by clicking on

From 6243599ca5bbf23e6af9f36713d30c1a20d81bff Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 11 May 2010 19:31:59 +0530
Subject: [PATCH 16/82] [IMP]: Improve the yml for delivery and 
 purchase_requisition

bzr revid: sbh@tinyerp.com-20100511140159-sdayvpwhwewkqpfn
---
 addons/delivery/__openerp__.py                |  2 +-
 addons/delivery/test/delivery_test.yml        |  2 +-
 .../test/purchase_requisition.yml             | 34 ++-----------------
 .../test/purchase_requisition_exclusive.yml   | 29 +---------------
 addons/stock/__openerp__.py                   |  2 +-
 5 files changed, 6 insertions(+), 63 deletions(-)

diff --git a/addons/delivery/__openerp__.py b/addons/delivery/__openerp__.py
index 5ac26ce3d23..684547e0a89 100644
--- a/addons/delivery/__openerp__.py
+++ b/addons/delivery/__openerp__.py
@@ -39,7 +39,7 @@
         'partner_view.xml'
     ],
     'demo_xml': ['delivery_demo.xml'],
-    'test':['delivery_test.yml',],
+    'test':['test/delivery_test.yml',],
     'installable': True,
     'active': False,
     'certificate': '0033981912253',
diff --git a/addons/delivery/test/delivery_test.yml b/addons/delivery/test/delivery_test.yml
index aedb76b4926..3597ca523fa 100644
--- a/addons/delivery/test/delivery_test.yml
+++ b/addons/delivery/test/delivery_test.yml
@@ -172,5 +172,5 @@
     import base
     so=self.pool.get('sale.order').browse(cr,uid,ref('sale_order_test_complete0'))
     ids=len(so.invoice_ids[0].invoice_line)
-    assert len(ids), "Invoice   hasn't Created"
+    assert (ids<2), "Invoice   hasn't Created"
     
diff --git a/addons/purchase_requisition/test/purchase_requisition.yml b/addons/purchase_requisition/test/purchase_requisition.yml
index 206cd89b6df..b70e66b3098 100644
--- a/addons/purchase_requisition/test/purchase_requisition.yml
+++ b/addons/purchase_requisition/test/purchase_requisition.yml
@@ -2,35 +2,6 @@
 -
   In order to test the purchase requicisition module, I will do a sale order -> purchase_requisition ->
   purchase flow and I will buy the required products at two different suppliers.
-
-- 
-  Modifying a res.users record
-- 
-  !record {model: res.users, id: base.user_root}:
-    groups_id:
-      - base.group_system
-      - base.group_erp_manager
-      - base.group_user
-      - base.group_multi_company
-      - base.group_extended
-      - base.group_no_one
-      - base.group_partner_manager
-      - base.group_maintenance_manager
-      - product.group_uos
-      - product.group_product_manager
-      - product.group_product_variant
-      - account.group_account_invoice
-      - account.group_account_user
-      - account.group_account_manager
-      - stock.group_stock_manager
-      - stock.group_stock_user
-      - purchase.group_purchase_manager
-      - purchase.group_purchase_user
-      - mrp.group_mrp_manager
-      - mrp.group_mrp_user
-      - sale.group_sale_manager
-      - sale.group_sale_user
-    
 - 
   I start by creating a new product 'Laptop ACER', which is purchased at Asustek, in MTO,
   with the generation of purchase requisitions.
@@ -55,8 +26,6 @@
     weight: 0.0
     weight_net: 0.0
     list_price: 100.0    
-    
-    
 - 
   Then I sell 5 Laptop ACER to the customer Agrolait, sale order TEST/TENDER/0001
 - 
@@ -123,7 +92,8 @@
 -
  !python {model: purchase.order}: |
     order_ids =self.search(cr, uid, [('origin','=','TEST/TENDER/0001')])
-    assert (order_ids==2), "Purchase order  hasn't Created"
+    ids=len(order_ids)
+    assert (ids==2), "Purchase order  hasn't Created"
 - 
  I set the purchase requisition as 'Not Exclusive'
  
diff --git a/addons/purchase_requisition/test/purchase_requisition_exclusive.yml b/addons/purchase_requisition/test/purchase_requisition_exclusive.yml
index f5e668d0d53..ee6d5b60d01 100644
--- a/addons/purchase_requisition/test/purchase_requisition_exclusive.yml
+++ b/addons/purchase_requisition/test/purchase_requisition_exclusive.yml
@@ -6,34 +6,7 @@
   I start by creating a new product 'Laptop ACER', which is purchased at Asustek, in MTO,
   with the generation of purchase requisitions.    
   
-- 
-  Modifying a res.users record
-- 
-  !record {model: res.users, id: base.user_root}:
-    groups_id:
-      - base.group_system
-      - base.group_erp_manager
-      - base.group_user
-      - base.group_multi_company
-      - base.group_extended
-      - base.group_no_one
-      - base.group_partner_manager
-      - base.group_maintenance_manager
-      - product.group_uos
-      - product.group_product_manager
-      - product.group_product_variant
-      - account.group_account_invoice
-      - account.group_account_user
-      - account.group_account_manager
-      - stock.group_stock_manager
-      - stock.group_stock_user
-      - purchase.group_purchase_manager
-      - purchase.group_purchase_user
-      - mrp.group_mrp_manager
-      - mrp.group_mrp_user
-      - sale.group_sale_manager
-      - sale.group_sale_user
-- 
+-
   !record {model: product.product, id: product_product_laptopacer1}:
     categ_id: product.product_category_3
     cost_method: standard
diff --git a/addons/stock/__openerp__.py b/addons/stock/__openerp__.py
index f1b60f244cd..ec7ce1c6cee 100644
--- a/addons/stock/__openerp__.py
+++ b/addons/stock/__openerp__.py
@@ -68,7 +68,7 @@ Thanks to the double entry management, the inventory controlling is powerful and
         "security/stock_security.xml",
         "security/ir.model.access.csv",
     ],
-    'test': ['stock_test.yml'],
+    'test': ['test/stock_test.yml'],
     'installable': True,
     'active': False,
     'certificate': '0055421559965',

From 56a7a70876c0f1a3b49c1bb73707862e44e52f7a Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 11 May 2010 20:10:39 +0530
Subject: [PATCH 17/82] [IMP]: Improve the yml   purchase_requisition

bzr revid: sbh@tinyerp.com-20100511144039-tecj6p1k6crajjg2
---
 .../test/purchase_requisition.yml             | 20 ++++++++++++-------
 .../test/purchase_requisition_exclusive.yml   |  7 ++++---
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/addons/purchase_requisition/test/purchase_requisition.yml b/addons/purchase_requisition/test/purchase_requisition.yml
index b70e66b3098..ef2331a3518 100644
--- a/addons/purchase_requisition/test/purchase_requisition.yml
+++ b/addons/purchase_requisition/test/purchase_requisition.yml
@@ -108,12 +108,15 @@
 - 
   !python {model: purchase.order}: |
     line_obj=self.pool.get('purchase.order.line')  
-    purchase_id1= self.search(cr, uid, [('name','=','PO00001')])
-    purchase_id2= self.search(cr, uid, [('name','=','PO00002')])
+    partner_obj=self.pool.get('res.partner')    
+    partner_id1=partner_obj.search(cr,uid,[('name','=','ASUStek')])[0] 
+    partner_id2=self.pool.get('res.partner').search(cr,uid,[('name','=','Distrib PC')])[0]   
+    purchase_id1= self.search(cr, uid, [('partner_id','=',partner_id1)])
+    purchase_id2= self.search(cr, uid, [('partner_id','=',partner_id2)])
     order_line1=self.browse(cr, uid, purchase_id1, context)[0].order_line[0].id
-    order_line2=self.browse(cr, uid, purchase_id2, context)[0].order_line[0].id    
-    line_obj.write(cr, uid, [order_line1], {'product_qty':2})
-    line_obj.write(cr, uid, [order_line2], {'product_qty':3})  
+    order_line2=self.browse(cr, uid, purchase_id2, context)[0].order_line[0].id
+    line_obj.write(cr, uid, order_line1, {'product_qty':2})
+    line_obj.write(cr, uid, order_line2, {'product_qty':3})  
 -
   I confirm and validate both purchase orders
   
@@ -143,7 +146,9 @@
 -
   !python {model: stock.picking }: |
    import time
-   picking_id = self.search(cr, uid, [('origin','=','PO00001:TEST/TENDER/0001'),('type','=','in')])
+   partner_obj=self.pool.get('res.partner')    
+   partner_id=partner_obj.search(cr,uid,[('name','=','ASUStek')])[0]    
+   picking_id = self.search(cr, uid, [('address_id.partner_id','=',partner_id),('type','=','in')])
    if picking_id:
      pick=self.browse(cr,uid,picking_id[0])
      move =pick.move_lines[0]
@@ -164,7 +169,8 @@
 -   
   !python {model: stock.picking }: |
    import time
-   picking_id = self.search(cr, uid, [('origin','=','PO00002:TEST/TENDER/0001'),('type','=','in')])
+   partner_id=self.pool.get('res.partner').search(cr,uid,[('name','=','Distrib PC')])[0]     
+   picking_id = self.search(cr, uid, [('address_id.partner_id','=',partner_id),('type','=','in')])
    if picking_id:
       pick=self.browse(cr,uid,picking_id[0])
       move =pick.move_lines[0]
diff --git a/addons/purchase_requisition/test/purchase_requisition_exclusive.yml b/addons/purchase_requisition/test/purchase_requisition_exclusive.yml
index ee6d5b60d01..c6efc38dc60 100644
--- a/addons/purchase_requisition/test/purchase_requisition_exclusive.yml
+++ b/addons/purchase_requisition/test/purchase_requisition_exclusive.yml
@@ -95,10 +95,11 @@
     ids =self.search(cr, uid, [('origin','=','TEST/TENDER/0002')])
     self.write(cr,uid,ids[0],{'exclusive': 'exclusive' })
 -
- I confirm and validate the RfQ of Asustek      
+ I confirm and validate the RfQ of ASUStek      
 -
  !python {model: purchase.order}: |
-    purchase_id= self.search(cr, uid, [('name','=','PO00003')])[0]
+    partner_id=self.pool.get('res.partner').search(cr,uid,[('name','=','ASUStek')])[0]
+    purchase_id= self.search(cr, uid, [('partner_id','=','partner_id)])[0]
     import netsvc
     wf_service = netsvc.LocalService("workflow")  
     if purchase_id:
@@ -108,6 +109,6 @@
   I check that RfQ of DistriPC is cancelled.
 -        
   !python {model: purchase.order}: |
-   purchase_id= self.search(cr, uid, [('name','=','PO00004')])[0]  
+   partner_id=self.pool.get('res.partner').search(cr,uid,[('name','=','Distrib PC')])[0]
    state=self.browse(cr,uid,purchase_id).state
    assert (state=='cancel')
\ No newline at end of file

From ac7a461f4ef317e648b9aec9533d46f9f7883684 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 11 May 2010 20:15:06 +0530
Subject: [PATCH 18/82] [IMP]: Improve the yml   purchase_requisition

bzr revid: sbh@tinyerp.com-20100511144506-tigiwtgb1vz6109v
---
 .../test/purchase_requisition_exclusive.yml                    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/purchase_requisition/test/purchase_requisition_exclusive.yml b/addons/purchase_requisition/test/purchase_requisition_exclusive.yml
index c6efc38dc60..cc59649577e 100644
--- a/addons/purchase_requisition/test/purchase_requisition_exclusive.yml
+++ b/addons/purchase_requisition/test/purchase_requisition_exclusive.yml
@@ -99,7 +99,7 @@
 -
  !python {model: purchase.order}: |
     partner_id=self.pool.get('res.partner').search(cr,uid,[('name','=','ASUStek')])[0]
-    purchase_id= self.search(cr, uid, [('partner_id','=','partner_id)])[0]
+    purchase_id= self.search(cr, uid, [('partner_id','=',partner_id)])[0]
     import netsvc
     wf_service = netsvc.LocalService("workflow")  
     if purchase_id:
@@ -110,5 +110,6 @@
 -        
   !python {model: purchase.order}: |
    partner_id=self.pool.get('res.partner').search(cr,uid,[('name','=','Distrib PC')])[0]
+   purchase_id= self.search(cr, uid, [('partner_id','=',partner_id)])[0]  
    state=self.browse(cr,uid,purchase_id).state
    assert (state=='cancel')
\ No newline at end of file

From 4dc5ca30bb7a16218c7f404a84d582c3d30402f7 Mon Sep 17 00:00:00 2001
From: mso <mso@mso>
Date: Wed, 12 May 2010 11:20:51 +0530
Subject: [PATCH 19/82] [ADD] sale: yml test forSO with prepaid shipping policy
 has been added.

bzr revid: mso@mso-20100512055051-8fkw74dt72bkezdo
---
 addons/sale/test/prepaid_sale_order.yml | 410 ++++++++++++++++++++++++
 1 file changed, 410 insertions(+)
 create mode 100644 addons/sale/test/prepaid_sale_order.yml

diff --git a/addons/sale/test/prepaid_sale_order.yml b/addons/sale/test/prepaid_sale_order.yml
new file mode 100644
index 00000000000..e2aa34c8263
--- /dev/null
+++ b/addons/sale/test/prepaid_sale_order.yml
@@ -0,0 +1,410 @@
+-
+  In order to test the sale module in the Open-ERP, I need to configure details regarding product & customer.
+-
+  I want to sell my mobile products to the customer with name Cleartrail
+- 
+  Creating an account.account.type record
+- 
+  !record {model: account.account.type, id: account_account_type_view0}:
+    close_method: none
+    code: View
+    name: View
+    sign: 1
+    
+    
+- 
+  Creating an account.account.type record
+- 
+  !record {model: account.account.type, id: account_account_type_income0}:
+    close_method: unreconciled
+    code: Income
+    name: Income
+    sign: 1
+    
+    
+- 
+  Creating an account.account.type record
+- 
+  !record {model: account.account.type, id: account_account_type_expense0}:
+    close_method: unreconciled
+    code: Expense
+    name: Expense
+    sign: 1
+    
+    
+- 
+  Creating an account.account.type record
+- 
+  !record {model: account.account.type, id: account_account_type_cash0}:
+    close_method: balance
+    code: Cash
+    name: Cash
+    sign: 1
+    
+    
+- 
+  Creating an account.account record
+- 
+  !record {model: account.account, id: account_account_minimalchart0}:
+    code: '0'
+    company_id: base.main_company
+    currency_mode: current
+    name: Minimal Chart
+    parent_left: 1
+    parent_right: 12
+    type: view
+    user_type: account_account_type_view0
+- 
+  Creating an account.account record
+- 
+  !record {model: account.account, id: account_account_payable1}:
+    code: AP
+    company_id: base.main_company
+    currency_mode: current
+    name: Payable
+    parent_id: account_account_minimalchart0
+    parent_left: 2
+    parent_right: 3
+    reconcile: true
+    type: payable
+    user_type: account_account_type_expense0
+    
+    
+- 
+  Creating an account.account record
+- 
+  !record {model: account.account, id: account_account_receivable0}:
+    code: AR
+    company_id: base.main_company
+    currency_mode: current
+    name: Receivable
+    parent_id: account_account_minimalchart0
+    parent_left: 4
+    parent_right: 5
+    reconcile: true
+    type: receivable
+    user_type: account_account_type_income0
+    
+    
+- 
+  Creating an account.account record
+- 
+  !record {model: account.account, id: account_account_cash0}:
+    code: C
+    company_id: base.main_company
+    currency_mode: current
+    name: Cash
+    parent_id: account_account_minimalchart0
+    parent_left: 6
+    parent_right: 7
+    type: other
+    user_type: account_account_type_cash0
+    
+    
+- 
+  Creating an account.account record
+- 
+  !record {model: account.account, id: account_account_purchases0}:
+    code: P
+    company_id: base.main_company
+    currency_mode: current
+    name: Purchases
+    parent_id: account_account_minimalchart0
+    parent_left: 8
+    parent_right: 9
+    type: other
+    user_type: account_account_type_expense0
+- 
+  Creating an account.account record
+- 
+  !record {model: account.account, id: account_account_sales0}:
+    code: S
+    company_id: base.main_company
+    currency_mode: current
+    name: Sales
+    parent_id: account_account_minimalchart0
+    parent_left: 10
+    parent_right: 11
+    type: other
+    user_type: account_account_type_income0
+
+    
+- 
+  Creating an account.journal record
+- 
+  !record {model: account.journal, id: account_journal_purchasejournal0}:
+    code: PUJ
+    company_id: base.main_company
+    default_credit_account_id: account_account_purchases0
+    default_debit_account_id: account_account_purchases0
+    name: Purchase Journal
+    sequence_id: account.sequence_purchase_journal
+    type: purchase
+    view_id: account.account_journal_view
+    
+    
+- 
+  Creating an account.journal record
+- 
+  !record {model: account.journal, id: account_journal_salejournal0}:
+    code: SAJ
+    company_id: base.main_company
+    default_credit_account_id: account_account_sales0
+    default_debit_account_id: account_account_sales0
+    name: Sale Journal
+    sequence_id: account.sequence_sale_journal
+    type: sale
+    view_id: account.account_journal_view
+    
+    
+- 
+  Creating an account.journal record
+- 
+  !record {model: account.journal, id: account_journal_bankjournal0}:
+    code: BNK
+    company_id: base.main_company
+    default_credit_account_id: account_account_cash0
+    default_debit_account_id: account_account_cash0
+    name: Bank Journal
+    sequence_id: account.sequence_journal
+    type: cash
+    view_id: account.account_journal_bank_view
+    
+    
+- 
+  Creating a ir.property record
+- 
+  !record {model: ir.property, id: ir_property_propertyaccountexpensecateg0}:
+    company_id: base.main_company
+    fields_id: account.field_res_partner_property_account_payable
+    name: property_account_expense_categ
+    value_reference: account.account,5
+    
+    
+- 
+  Creating a ir.property record
+- 
+  !record {model: ir.property, id: ir_property_propertyaccountincomecateg0}:
+    company_id: base.main_company
+    fields_id: account.field_res_partner_property_account_receivable
+    name: property_account_income_categ
+    value_reference: account.account,6
+- 
+  Creating a res.partner.category record
+- 
+  !record {model: res.partner.category, id: res_partner_category_customers0}:
+    name: Customers
+-
+  Creating an res.partner record
+- 
+  !record {model: res.partner, id: res_partner_cleartrail0}:
+    category_id:
+      - res_partner_category_customers0
+    name: Cleartrail
+    
+    
+- 
+  Creating an res.partner.address record
+- 
+  !record {model: res.partner.address, id: res_partner_address_1}:
+    partner_id: res_partner_cleartrail0
+    street: onam plaza, 14 B palasia A B Road
+    type: contact
+    
+    
+- 
+  Creating an res.partner.address record
+- 
+  !record {model: res.partner.address, id: res_partner_address_2}:
+    partner_id: res_partner_cleartrail0
+    type: invoice
+    
+    
+- 
+  Creating an res.partner.address record
+- 
+  !record {model: res.partner.address, id: res_partner_address_3}:
+    partner_id: res_partner_cleartrail0
+    street: sangam house 15 B palasia, A B Road
+    type: delivery
+-
+  Customer Cleartrail has specific instrument requirements regarding the stockable products
+- 
+  Creating an product.category record
+- 
+  !record {model: product.category, id: product_category_allproductssellable0}:
+    name: Mobile Products Sellable
+    
+    
+- 
+  Creating an product.category record
+- 
+  !record {model: product.category, id: product_category_services0}:
+    name: Mobile Services
+- 
+  Creating an product.template record
+- 
+  !record {model: product.template, id: product_template_lgviewtysmart0}:
+    categ_id: product_category_allproductssellable0
+    cost_method: standard
+    list_price: 170.0
+    mes_type: fixed
+    name: LG Viewty Smart
+    procure_method: make_to_order
+    standard_price: 160.0
+    supply_method: produce
+    type: product
+    uom_id: product.product_uom_unit
+    uom_po_id: product.product_uom_unit
+    
+-    
+  Creating an product.product record
+- 
+  !record {model: product.product, id: product_product_lgviewtysmart0}:
+    categ_id: product_category_allproductssellable0
+    cost_method: standard
+    list_price: 170.0
+    mes_type: fixed
+    name: LG Viewty Smart
+    pricelist_purchase: 'Default Purchase Pricelist (0.00) : 160.00\n'
+    pricelist_sale: 'Public Pricelist (0.00) : 170.00\n'
+    procure_method: make_to_order
+    property_account_expense: sale.account_account_payable1
+    property_account_income: sale.account_account_receivable0
+    seller_delay: '1'
+    standard_price: 160.0
+    supply_method: produce
+    type: product
+    uom_id: product.product_uom_unit
+    uom_po_id: product.product_uom_unit
+-
+  Creating a sale.order record
+- 
+  !record {model: sale.order, id: sale_order_so0}:
+    date_order: '2010-05-03'
+    invoice_quantity: order
+    name: SO004
+    order_line:
+      - name: LG Viewty Smart
+        price_unit: 170.0
+        product_uom: product.product_uom_unit
+        product_uom_qty: 500.0
+        state: draft
+        delay: 7.0
+        product_id: sale.product_product_lgviewtysmart0
+        product_uos_qty: 500.0
+        th_weight: 0.0
+        type: make_to_order
+    order_policy: prepaid
+    partner_id: sale.res_partner_cleartrail0
+    partner_invoice_id: sale.res_partner_address_2
+    partner_order_id: sale.res_partner_address_1
+    partner_shipping_id: sale.res_partner_address_3
+    picking_policy: direct
+    pricelist_id: product.list0
+    shop_id: sale.shop
+    
+    
+- 
+  Performing a workflow action order_confirm on module sale.order
+- 
+  !workflow {model: sale.order, action: order_confirm, ref: sale_order_so0}
+-
+  I will verify whether the invoice has been generated for SO since Shipping policy is 'Payment Before Delivery'
+-
+  !python {model: sale.order}: |
+    so = self.browse(cr, uid, ref("sale_order_so0"))
+    assert so.invoice_ids, "Invoices has not been generated for sale_order_so0"
+- 
+  Performing a workflow action invoice_open on module account.invoice
+- 
+  !python {model: account.invoice}: |
+    sale_order_obj = self.pool.get('sale.order')
+    so = sale_order_obj.browse(cr, uid, ref("sale_order_so0"))
+    import netsvc
+    wf_service = netsvc.LocalService("workflow")  
+    invoice_ids = so.invoice_ids
+    for invoice in invoice_ids:
+      wf_service.trg_validate(uid, 'account.invoice',invoice.id,'invoice_open', cr) 
+-
+  I will verify the picking associated with the sale order sale_order_so0
+- 
+  !python {model: sale.order}: |
+    so = self.browse(cr, uid, ref("sale_order_so0"))
+    assert so.picking_ids,"Picking has not been generated for sale_order_so0"
+-
+  Creating a account.invoice.pay record
+- 
+  !record {model: account.invoice.pay, id: account_invoice_pay_tst0}:
+    amount: 85000.0
+    date: '2010-05-10'
+    journal_id: sale.account_journal_bankjournal0
+    name: tst
+    period_id: account.period_5
+- 
+  Performing an osv_memory action wo_check on module account.invoice.pay
+- 
+  !python {model: account.invoice.pay}: |
+    sale_order_obj = self.pool.get('sale.order')
+    so = sale_order_obj.browse(cr, uid, ref("sale_order_so0"))  
+    self.wo_check(cr, uid, [ref("account_invoice_pay_tst0")], {"lang": "en_US", "tz":
+      False, "active_model": 'account.invoice', "active_ids": [so.invoice_ids[0].id], "type":
+      "out_invoice", "active_id": so.invoice_ids[0].id, })
+    
+    
+- 
+  Creating a account.invoice.pay.writeoff record
+- 
+  !record {model: account.invoice.pay.writeoff, id: account_invoice_pay_writeoff_0}:
+    analytic_id: account.analytic_customers
+    comment: Write-Off
+    writeoff_acc_id: account.a_sale
+    writeoff_journal_id: sale.account_journal_bankjournal0
+    
+    
+- 
+  Performing an osv_memory action pay_and_reconcile_writeoff on module account.invoice.pay.writeoff
+- 
+  !python {model: account.invoice.pay.writeoff}: |
+    sale_order_obj = self.pool.get('sale.order')
+    so = sale_order_obj.browse(cr, uid, ref("sale_order_so0"))   
+    self.pay_and_reconcile_writeoff(cr, uid, [ref("account_invoice_pay_writeoff_0")],
+      {"lang": 'en_US', "tz": False, "active_model": 'account.invoice', "active_ids":
+      [so.invoice_ids[0].id], "type": "out_invoice", "active_id": so.invoice_ids[0].id, })
+    
+    
+-
+  I will verify the picking associated with the sale order sale_order_so0
+- 
+  !python {model: sale.order}: |
+    so = self.browse(cr, uid, ref("sale_order_so0"))
+    assert so.picking_ids,"Picking has not been generated for sale_order_so0"
+- 
+  Creating a stock.partial.picking record
+- 
+  !python {model: stock.picking }: |
+   import time
+   picking_id = self.search(cr, uid, [('origin','=','SO004'),('type','=','out')])
+   if picking_id:
+      pick=self.browse(cr,uid,picking_id[0])
+      pick.force_assign(cr, uid)
+      partial_datas = {
+           'partner_id':pick.address_id.partner_id.id,
+            'address_id': pick.address_id.id,
+            'delivery_date' : time.strftime('%Y-%m-%d'),
+           }
+      move = pick.move_lines[0]
+      partial_datas['move%s'%(move.id)]= {
+          'product_id': move.product_id.id,
+          'product_qty': move.product_qty,
+          'product_uom': move.product_uom.id,
+      } 
+      self.do_partial(cr, uid, picking_id,partial_datas)
+-
+  I verify that picking order is in done state
+-
+  !python {model: stock.picking }: |
+   picking_id = self.search(cr, uid, [('origin','=','SO004'),('type','=','out')])
+   if picking_id:
+     pick = self.browse(cr,uid,picking_id[0])
+     assert (pick.state) =='done', "Picking for SO is not in done state."
\ No newline at end of file

From 1e2ff71da47e931d25438015a77dd0fd82b0effc Mon Sep 17 00:00:00 2001
From: mso <mso@mso>
Date: Wed, 12 May 2010 12:49:52 +0530
Subject: [PATCH 20/82] [ADD] sale: yml test for SO with shipping and manual
 invoice order policy has been added.

bzr revid: mso@mso-20100512071952-r45kuxx67pzwwg6d
---
 .../sale/test/shipping_manual_sale_order.yml  | 416 ++++++++++++++++++
 1 file changed, 416 insertions(+)
 create mode 100644 addons/sale/test/shipping_manual_sale_order.yml

diff --git a/addons/sale/test/shipping_manual_sale_order.yml b/addons/sale/test/shipping_manual_sale_order.yml
new file mode 100644
index 00000000000..2ed3db022d3
--- /dev/null
+++ b/addons/sale/test/shipping_manual_sale_order.yml
@@ -0,0 +1,416 @@
+-
+  In order to test the sale module in the Open-ERP, I need to configure details regarding product & customer.
+-
+  I want to sell my mobile products to the customer with name Cleartrail
+- 
+  Creating an account.account.type record
+- 
+  !record {model: account.account.type, id: account_account_type_view0}:
+    close_method: none
+    code: View
+    name: View
+    sign: 1
+    
+    
+- 
+  Creating an account.account.type record
+- 
+  !record {model: account.account.type, id: account_account_type_income0}:
+    close_method: unreconciled
+    code: Income
+    name: Income
+    sign: 1
+    
+    
+- 
+  Creating an account.account.type record
+- 
+  !record {model: account.account.type, id: account_account_type_expense0}:
+    close_method: unreconciled
+    code: Expense
+    name: Expense
+    sign: 1
+    
+    
+- 
+  Creating an account.account.type record
+- 
+  !record {model: account.account.type, id: account_account_type_cash0}:
+    close_method: balance
+    code: Cash
+    name: Cash
+    sign: 1
+    
+    
+- 
+  Creating an account.account record
+- 
+  !record {model: account.account, id: account_account_minimalchart0}:
+    code: '0'
+    company_id: base.main_company
+    currency_mode: current
+    name: Minimal Chart
+    parent_left: 1
+    parent_right: 12
+    type: view
+    user_type: account_account_type_view0
+- 
+  Creating an account.account record
+- 
+  !record {model: account.account, id: account_account_payable1}:
+    code: AP
+    company_id: base.main_company
+    currency_mode: current
+    name: Payable
+    parent_id: account_account_minimalchart0
+    parent_left: 2
+    parent_right: 3
+    reconcile: true
+    type: payable
+    user_type: account_account_type_expense0
+    
+    
+- 
+  Creating an account.account record
+- 
+  !record {model: account.account, id: account_account_receivable0}:
+    code: AR
+    company_id: base.main_company
+    currency_mode: current
+    name: Receivable
+    parent_id: account_account_minimalchart0
+    parent_left: 4
+    parent_right: 5
+    reconcile: true
+    type: receivable
+    user_type: account_account_type_income0
+    
+    
+- 
+  Creating an account.account record
+- 
+  !record {model: account.account, id: account_account_cash0}:
+    code: C
+    company_id: base.main_company
+    currency_mode: current
+    name: Cash
+    parent_id: account_account_minimalchart0
+    parent_left: 6
+    parent_right: 7
+    type: other
+    user_type: account_account_type_cash0
+    
+    
+- 
+  Creating an account.account record
+- 
+  !record {model: account.account, id: account_account_purchases0}:
+    code: P
+    company_id: base.main_company
+    currency_mode: current
+    name: Purchases
+    parent_id: account_account_minimalchart0
+    parent_left: 8
+    parent_right: 9
+    type: other
+    user_type: account_account_type_expense0
+- 
+  Creating an account.account record
+- 
+  !record {model: account.account, id: account_account_sales0}:
+    code: S
+    company_id: base.main_company
+    currency_mode: current
+    name: Sales
+    parent_id: account_account_minimalchart0
+    parent_left: 10
+    parent_right: 11
+    type: other
+    user_type: account_account_type_income0
+
+    
+- 
+  Creating an account.journal record
+- 
+  !record {model: account.journal, id: account_journal_purchasejournal0}:
+    code: PUJ
+    company_id: base.main_company
+    default_credit_account_id: account_account_purchases0
+    default_debit_account_id: account_account_purchases0
+    name: Purchase Journal
+    sequence_id: account.sequence_purchase_journal
+    type: purchase
+    view_id: account.account_journal_view
+    
+    
+- 
+  Creating an account.journal record
+- 
+  !record {model: account.journal, id: account_journal_salejournal0}:
+    code: SAJ
+    company_id: base.main_company
+    default_credit_account_id: account_account_sales0
+    default_debit_account_id: account_account_sales0
+    name: Sale Journal
+    sequence_id: account.sequence_sale_journal
+    type: sale
+    view_id: account.account_journal_view
+    
+    
+- 
+  Creating an account.journal record
+- 
+  !record {model: account.journal, id: account_journal_bankjournal0}:
+    code: BNK
+    company_id: base.main_company
+    default_credit_account_id: account_account_cash0
+    default_debit_account_id: account_account_cash0
+    name: Bank Journal
+    sequence_id: account.sequence_journal
+    type: cash
+    view_id: account.account_journal_bank_view
+    
+    
+- 
+  Creating a ir.property record
+- 
+  !record {model: ir.property, id: ir_property_propertyaccountexpensecateg0}:
+    company_id: base.main_company
+    fields_id: account.field_res_partner_property_account_payable
+    name: property_account_expense_categ
+    value_reference: account.account,5
+    
+    
+- 
+  Creating a ir.property record
+- 
+  !record {model: ir.property, id: ir_property_propertyaccountincomecateg0}:
+    company_id: base.main_company
+    fields_id: account.field_res_partner_property_account_receivable
+    name: property_account_income_categ
+    value_reference: account.account,6
+- 
+  Creating a res.partner.category record
+- 
+  !record {model: res.partner.category, id: res_partner_category_customers0}:
+    name: Customers
+-
+  Creating an res.partner record
+- 
+  !record {model: res.partner, id: res_partner_cleartrail0}:
+    category_id:
+      - res_partner_category_customers0
+    name: Cleartrail
+    
+    
+- 
+  Creating an res.partner.address record
+- 
+  !record {model: res.partner.address, id: res_partner_address_1}:
+    partner_id: res_partner_cleartrail0
+    street: onam plaza, 14 B palasia A B Road
+    type: contact
+    
+    
+- 
+  Creating an res.partner.address record
+- 
+  !record {model: res.partner.address, id: res_partner_address_2}:
+    partner_id: res_partner_cleartrail0
+    type: invoice
+    
+    
+- 
+  Creating an res.partner.address record
+- 
+  !record {model: res.partner.address, id: res_partner_address_3}:
+    partner_id: res_partner_cleartrail0
+    street: sangam house 15 B palasia, A B Road
+    type: delivery
+-
+  Customer Cleartrail has specific instrument requirements regarding the stockable products
+- 
+  Creating an product.category record
+- 
+  !record {model: product.category, id: product_category_allproductssellable0}:
+    name: Mobile Products Sellable
+    
+    
+- 
+  Creating an product.category record
+- 
+  !record {model: product.category, id: product_category_services0}:
+    name: Mobile Services
+- 
+  Creating an product.template record
+- 
+  !record {model: product.template, id: product_template_newchocolateslidermobile0}:
+    categ_id: product_category_allproductssellable0
+    cost_method: standard
+    list_price: 200.0
+    mes_type: fixed
+    name: New Chocolate Slider Mobile
+    procure_method: make_to_order
+    standard_price: 189.0
+    supply_method: buy
+    type: product
+    uom_id: product.product_uom_unit
+    uom_po_id: product.product_uom_unit
+   
+- 
+  Creating an product.product record
+- 
+  !record {model: product.product, id: product_product_newchocolateslidermobile0}:
+    categ_id: product_category_allproductssellable0
+    cost_method: standard
+    list_price: 200.0
+    mes_type: fixed
+    name: New Chocolate Slider Mobile
+    pricelist_purchase: 'Default Purchase Pricelist (0.00) : 189.00\n'
+    pricelist_sale: 'Public Pricelist (0.00) : 200.00\n'
+    procure_method: make_to_order
+    property_account_expense: sale.account_account_payable1
+    property_account_income: sale.account_account_receivable0
+    seller_delay: '1'
+    standard_price: 189.0
+    supply_method: buy
+    type: product
+    uom_id: product.product_uom_unit
+    uom_po_id: product.product_uom_unit
+    
+
+- 
+  Creating a sale.order record
+-
+  !record {model: sale.order, id: sale_order_so0}:
+    date_order: '2010-05-12'
+    invoice_quantity: order
+    name: SO001
+    order_line:
+      - name: New Chocolate Slider Mobile
+        price_unit: 200.0
+        product_uom: product.product_uom_unit
+        product_uom_qty: 500.0
+        state: draft
+        delay: 7.0
+        product_id: sale.product_product_newchocolateslidermobile0
+        product_uos_qty: 500.0
+        type: make_to_order
+    order_policy: manual
+    partner_id: sale.res_partner_cleartrail0
+    partner_invoice_id: sale.res_partner_address_2
+    partner_order_id: sale.res_partner_address_1
+    partner_shipping_id: sale.res_partner_address_3
+    picking_policy: direct
+    pricelist_id: product.list0
+    shop_id: sale.shop
+- 
+  Performing a workflow action order_confirm on module sale.order
+- 
+  !workflow {model: sale.order, action: order_confirm, ref: sale_order_so0}
+-
+  I click on Create Invoice button to create the invoice.
+-
+  Performing a workflow action manual_invoice on module sale.order
+- 
+  !workflow {model: sale.order, action: manual_invoice, ref: sale_order_so0}
+-
+  I verify whether the invoice has been generated for SO
+-
+  !python {model: sale.order}: |
+    so = self.browse(cr, uid, ref("sale_order_so0"))
+    assert so.invoice_ids, "Invoices has not been generated for sale_order_so0"
+- 
+  Performing a workflow action invoice_open on module account.invoice
+- 
+  !python {model: account.invoice}: |
+    sale_order_obj = self.pool.get('sale.order')
+    so = sale_order_obj.browse(cr, uid, ref("sale_order_so0"))
+    import netsvc
+    wf_service = netsvc.LocalService("workflow")  
+    invoice_ids = so.invoice_ids
+    for invoice in invoice_ids:
+      wf_service.trg_validate(uid, 'account.invoice',invoice.id,'invoice_open', cr) 
+-
+  Creating a account.invoice.pay record
+- 
+  !record {model: account.invoice.pay, id: account_invoice_pay_tst0}:
+    amount: 100000.0
+    date: '2010-05-10'
+    journal_id: sale.account_journal_bankjournal0
+    name: test
+    period_id: account.period_5
+- 
+  Performing an osv_memory action wo_check on module account.invoice.pay
+- 
+  !python {model: account.invoice.pay}: |
+    sale_order_obj = self.pool.get('sale.order')
+    so = sale_order_obj.browse(cr, uid, ref("sale_order_so0"))  
+    self.wo_check(cr, uid, [ref("account_invoice_pay_tst0")], {"lang": "en_US", "tz":
+      False, "active_model": 'account.invoice', "active_ids": [so.invoice_ids[0].id], "type":
+      "out_invoice", "active_id": so.invoice_ids[0].id})
+    
+    
+- 
+  Creating a account.invoice.pay.writeoff record
+- 
+  !record {model: account.invoice.pay.writeoff, id: account_invoice_pay_writeoff_0}:
+    analytic_id: account.analytic_customers
+    comment: Write-Off
+    writeoff_acc_id: account.a_sale
+    writeoff_journal_id: sale.account_journal_bankjournal0
+    
+    
+- 
+  Performing an osv_memory action pay_and_reconcile_writeoff on module account.invoice.pay.writeoff
+- 
+  !python {model: account.invoice.pay.writeoff}: |
+    sale_order_obj = self.pool.get('sale.order')
+    so = sale_order_obj.browse(cr, uid, ref("sale_order_so0"))   
+    self.pay_and_reconcile_writeoff(cr, uid, [ref("account_invoice_pay_writeoff_0")],
+      {"lang": 'en_US', "tz": False, "active_model": 'account.invoice', "active_ids":
+      [so.invoice_ids[0].id], "type": "out_invoice", "active_id": so.invoice_ids[0].id, })
+-
+  I verify the invoice are in paid state or not. 
+-
+  !python {model: account.invoice}: |
+    sale_order_obj = self.pool.get('sale.order')
+    so = sale_order_obj.browse(cr, uid, ref("sale_order_so0"))
+    invoice_ids = so.invoice_ids
+    for invoice in invoice_ids:
+        assert (invoice.state) =='paid', "Invoice for SO is not in done state."
+- 
+  I will verify the picking associated with the sale order sale_order_so0
+- 
+  !python {model: sale.order}: |
+    so = self.browse(cr, uid, ref("sale_order_so0"))
+    assert so.picking_ids,"Picking has not been generated for sale_order_so0"
+-
+  Creating a stock.partial.picking record
+- 
+  !python {model: stock.picking }: |
+   import time
+   picking_id = self.search(cr, uid, [('origin','=','SO001'),('type','=','out')])
+   if picking_id:
+      pick=self.browse(cr,uid,picking_id[0])
+      pick.force_assign(cr, uid)
+      partial_datas = {
+           'partner_id':pick.address_id.partner_id.id,
+            'address_id': pick.address_id.id,
+            'delivery_date' : time.strftime('%Y-%m-%d'),
+           }
+      move = pick.move_lines[0]
+      partial_datas['move%s'%(move.id)]= {
+          'product_id': move.product_id.id,
+          'product_qty': move.product_qty,
+          'product_uom': move.product_uom.id,
+      } 
+      self.do_partial(cr, uid, picking_id,partial_datas)
+-
+  I verify that picking order is in done state
+-
+  !python {model: stock.picking }: |
+   picking_id = self.search(cr, uid, [('origin','=','SO001'),('type','=','out')])
+   if picking_id:
+     pick = self.browse(cr,uid,picking_id[0])
+     assert (pick.state) =='done', "Picking for SO is not in done state." 
\ No newline at end of file

From 8738ec86f5228bca2d10a4b5347d9f66a69803cb Mon Sep 17 00:00:00 2001
From: mso <mso@mso>
Date: Wed, 12 May 2010 14:43:22 +0530
Subject: [PATCH 21/82] [ADD] sale: yml test for advance invoice has been
 added.

bzr revid: mso@mso-20100512091322-c22rzpbz1g7jxaa2
---
 addons/sale/test/advance_invoice.yml | 330 +++++++++++++++++++++++++++
 1 file changed, 330 insertions(+)
 create mode 100644 addons/sale/test/advance_invoice.yml

diff --git a/addons/sale/test/advance_invoice.yml b/addons/sale/test/advance_invoice.yml
new file mode 100644
index 00000000000..28535b2872c
--- /dev/null
+++ b/addons/sale/test/advance_invoice.yml
@@ -0,0 +1,330 @@
+-
+  In order to test the sale module in the Open-ERP, I need to configure details regarding product & customer.
+-
+  I want to sell my mobile products to the customer with name Cleartrail
+- 
+  Creating an account.account.type record
+- 
+  !record {model: account.account.type, id: account_account_type_view0}:
+    close_method: none
+    code: View
+    name: View
+    sign: 1
+    
+    
+- 
+  Creating an account.account.type record
+- 
+  !record {model: account.account.type, id: account_account_type_income0}:
+    close_method: unreconciled
+    code: Income
+    name: Income
+    sign: 1
+    
+    
+- 
+  Creating an account.account.type record
+- 
+  !record {model: account.account.type, id: account_account_type_expense0}:
+    close_method: unreconciled
+    code: Expense
+    name: Expense
+    sign: 1
+    
+    
+- 
+  Creating an account.account.type record
+- 
+  !record {model: account.account.type, id: account_account_type_cash0}:
+    close_method: balance
+    code: Cash
+    name: Cash
+    sign: 1
+    
+    
+- 
+  Creating an account.account record
+- 
+  !record {model: account.account, id: account_account_minimalchart0}:
+    code: '0'
+    company_id: base.main_company
+    currency_mode: current
+    name: Minimal Chart
+    parent_left: 1
+    parent_right: 12
+    type: view
+    user_type: account_account_type_view0
+- 
+  Creating an account.account record
+- 
+  !record {model: account.account, id: account_account_payable1}:
+    code: AP
+    company_id: base.main_company
+    currency_mode: current
+    name: Payable
+    parent_id: account_account_minimalchart0
+    parent_left: 2
+    parent_right: 3
+    reconcile: true
+    type: payable
+    user_type: account_account_type_expense0
+    
+    
+- 
+  Creating an account.account record
+- 
+  !record {model: account.account, id: account_account_receivable0}:
+    code: AR
+    company_id: base.main_company
+    currency_mode: current
+    name: Receivable
+    parent_id: account_account_minimalchart0
+    parent_left: 4
+    parent_right: 5
+    reconcile: true
+    type: receivable
+    user_type: account_account_type_income0
+    
+    
+- 
+  Creating an account.account record
+- 
+  !record {model: account.account, id: account_account_cash0}:
+    code: C
+    company_id: base.main_company
+    currency_mode: current
+    name: Cash
+    parent_id: account_account_minimalchart0
+    parent_left: 6
+    parent_right: 7
+    type: other
+    user_type: account_account_type_cash0
+    
+    
+- 
+  Creating an account.account record
+- 
+  !record {model: account.account, id: account_account_purchases0}:
+    code: P
+    company_id: base.main_company
+    currency_mode: current
+    name: Purchases
+    parent_id: account_account_minimalchart0
+    parent_left: 8
+    parent_right: 9
+    type: other
+    user_type: account_account_type_expense0
+- 
+  Creating an account.account record
+- 
+  !record {model: account.account, id: account_account_sales0}:
+    code: S
+    company_id: base.main_company
+    currency_mode: current
+    name: Sales
+    parent_id: account_account_minimalchart0
+    parent_left: 10
+    parent_right: 11
+    type: other
+    user_type: account_account_type_income0
+
+    
+- 
+  Creating an account.journal record
+- 
+  !record {model: account.journal, id: account_journal_purchasejournal0}:
+    code: PUJ
+    company_id: base.main_company
+    default_credit_account_id: account_account_purchases0
+    default_debit_account_id: account_account_purchases0
+    name: Purchase Journal
+    sequence_id: account.sequence_purchase_journal
+    type: purchase
+    view_id: account.account_journal_view
+    
+    
+- 
+  Creating an account.journal record
+- 
+  !record {model: account.journal, id: account_journal_salejournal0}:
+    code: SAJ
+    company_id: base.main_company
+    default_credit_account_id: account_account_sales0
+    default_debit_account_id: account_account_sales0
+    name: Sale Journal
+    sequence_id: account.sequence_sale_journal
+    type: sale
+    view_id: account.account_journal_view
+    
+    
+- 
+  Creating an account.journal record
+- 
+  !record {model: account.journal, id: account_journal_bankjournal0}:
+    code: BNK
+    company_id: base.main_company
+    default_credit_account_id: account_account_cash0
+    default_debit_account_id: account_account_cash0
+    name: Bank Journal
+    sequence_id: account.sequence_journal
+    type: cash
+    view_id: account.account_journal_bank_view
+    
+    
+- 
+  Creating a ir.property record
+- 
+  !record {model: ir.property, id: ir_property_propertyaccountexpensecateg0}:
+    company_id: base.main_company
+    fields_id: account.field_res_partner_property_account_payable
+    name: property_account_expense_categ
+    value_reference: account.account,5
+    
+    
+- 
+  Creating a ir.property record
+- 
+  !record {model: ir.property, id: ir_property_propertyaccountincomecateg0}:
+    company_id: base.main_company
+    fields_id: account.field_res_partner_property_account_receivable
+    name: property_account_income_categ
+    value_reference: account.account,6
+- 
+  Creating a res.partner.category record
+- 
+  !record {model: res.partner.category, id: res_partner_category_customers0}:
+    name: Customers
+-
+  Creating an res.partner record
+- 
+  !record {model: res.partner, id: res_partner_cleartrail0}:
+    category_id:
+      - res_partner_category_customers0
+    name: Cleartrail
+    
+    
+- 
+  Creating an res.partner.address record
+- 
+  !record {model: res.partner.address, id: res_partner_address_1}:
+    partner_id: res_partner_cleartrail0
+    street: onam plaza, 14 B palasia A B Road
+    type: contact
+    
+    
+- 
+  Creating an res.partner.address record
+- 
+  !record {model: res.partner.address, id: res_partner_address_2}:
+    partner_id: res_partner_cleartrail0
+    type: invoice
+    
+    
+- 
+  Creating an res.partner.address record
+- 
+  !record {model: res.partner.address, id: res_partner_address_3}:
+    partner_id: res_partner_cleartrail0
+    street: sangam house 15 B palasia, A B Road
+    type: delivery
+-
+  Customer Cleartrail has specific instrument requirements regarding the stockable products
+- 
+  Creating an product.category record
+- 
+  !record {model: product.category, id: product_category_allproductssellable0}:
+    name: Mobile Products Sellable
+    
+    
+- 
+  Creating an product.category record
+- 
+  !record {model: product.category, id: product_category_services0}:
+    name: Mobile Services
+- 
+  Creating an product.template record
+- 
+  !record {model: product.template, id: product_template_lgviewtysmart0}:
+    categ_id: product_category_allproductssellable0
+    cost_method: standard
+    list_price: 170.0
+    mes_type: fixed
+    name: LG Viewty Smart
+    procure_method: make_to_order
+    standard_price: 160.0
+    supply_method: produce
+    type: product
+    uom_id: product.product_uom_unit
+    uom_po_id: product.product_uom_unit
+    
+-    
+  Creating an product.product record
+- 
+  !record {model: product.product, id: product_product_lgviewtysmart0}:
+    categ_id: product_category_allproductssellable0
+    cost_method: standard
+    list_price: 170.0
+    mes_type: fixed
+    name: LG Viewty Smart
+    pricelist_purchase: 'Default Purchase Pricelist (0.00) : 160.00\n'
+    pricelist_sale: 'Public Pricelist (0.00) : 170.00\n'
+    procure_method: make_to_order
+    property_account_expense: sale.account_account_payable1
+    property_account_income: sale.account_account_receivable0
+    seller_delay: '1'
+    standard_price: 160.0
+    supply_method: produce
+    type: product
+    uom_id: product.product_uom_unit
+    uom_po_id: product.product_uom_unit
+-
+  Creating a sale.order record
+- 
+  !record {model: sale.order, id: sale_order_so0}:
+    date_order: '2010-05-03'
+    invoice_quantity: order
+    name: SO004
+    order_line:
+      - name: LG Viewty Smart
+        price_unit: 170.0
+        product_uom: product.product_uom_unit
+        product_uom_qty: 500.0
+        state: draft
+        delay: 7.0
+        product_id: sale.product_product_lgviewtysmart0
+        product_uos_qty: 500.0
+        th_weight: 0.0
+        type: make_to_order
+    order_policy: prepaid
+    partner_id: sale.res_partner_cleartrail0
+    partner_invoice_id: sale.res_partner_address_2
+    partner_order_id: sale.res_partner_address_1
+    partner_shipping_id: sale.res_partner_address_3
+    picking_policy: direct
+    pricelist_id: product.list0
+    shop_id: sale.shop
+    
+- 
+  Creating a sale.advance.payment.inv record
+- 
+  !record {model: sale.advance.payment.inv, id: sale_advance_payment_inv_0}:
+    amount: 1000.0
+    product_id: product.product_product_pc3
+    qtty: 3.0
+    
+    
+- 
+  Performing an osv_memory action create_invoices on module sale.advance.payment.inv
+- 
+  !python {model: sale.advance.payment.inv}: |
+    self.create_invoices(cr, uid, [ref("sale_advance_payment_inv_0")], {"lang": 'en_US',
+      "active_model": 'sale.order', "active_ids": [ref("sale_order_so0")], "tz":
+      False, "active_id": ref("sale_order_so0"), })
+-
+  I will verify whether the invoice has been generated for SO since Shipping policy is 'Payment Before Delivery'
+-
+  !python {model: sale.order}: |
+    so = self.browse(cr, uid, ref("sale_order_so0"))
+    assert so.invoice_ids, "Invoices has not been generated for sale_order_so0"    
+    
+    
\ No newline at end of file

From 0f4f4d5bdff89c6d828dce2890cba43603070f01 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.com>
Date: Wed, 12 May 2010 18:32:59 +0530
Subject: [PATCH 22/82] [ADD] mrp: Added yaml for procurement orders.

bzr revid: uco@tinyerp.com-20100512130259-trfnrvswjwzq8j4q
---
 addons/mrp/__openerp__.py           |   6 +-
 addons/mrp/test/mrp_procurement.yml | 336 ++++++++++++++++++++++++++++
 2 files changed, 341 insertions(+), 1 deletion(-)
 create mode 100644 addons/mrp/test/mrp_procurement.yml

diff --git a/addons/mrp/__openerp__.py b/addons/mrp/__openerp__.py
index 0fa66ac7bd1..39b8b907575 100644
--- a/addons/mrp/__openerp__.py
+++ b/addons/mrp/__openerp__.py
@@ -77,7 +77,11 @@
         'report/mrp_production_order_view.xml',
     ],
     'demo_xml': ['mrp_demo.xml', 'mrp_order_point.xml'],
-#    'test': ['test/mrp_phantom_bom.yml','test/mrp_production_order.yml'],
+#    'test': [
+#             'test/mrp_phantom_bom.yml',
+#             'test/mrp_production_order.yml',
+#             'test/mrp_procurement.yml'
+#    ],
     'installable': True,
     'active': False,
     'certificate': '0032052481373',
diff --git a/addons/mrp/test/mrp_procurement.yml b/addons/mrp/test/mrp_procurement.yml
new file mode 100644
index 00000000000..5f3217d45e2
--- /dev/null
+++ b/addons/mrp/test/mrp_procurement.yml
@@ -0,0 +1,336 @@
+-
+  In order to test the flow of procurement orders. I will put some orders with
+  different procurement methods. I have installed sale, mrp and purchase modules.
+-
+  I am creating products.   
+- 
+  Creating a product.product record
+- 
+  !record {model: product.product, id: product_product_shirt0}:
+    categ_id: product.cat1
+    cost_method: standard
+    list_price: 350.0
+    mes_type: fixed
+    name: Shirt
+    procure_method: make_to_stock
+    property_stock_inventory: stock.location_inventory
+    property_stock_procurement: stock.location_procurement
+    property_stock_production: stock.location_production
+    seller_delay: '1'
+    standard_price: 300.0
+    supply_method: produce
+    type: product
+    uom_id: product.product_uom_unit
+    uom_po_id: product.product_uom_unit
+    volume: 0.0
+    warranty: 0.0
+    weight: 0.0
+    weight_net: 0.0
+- 
+  Creating a product.product record
+- 
+  !record {model: product.product, id: product_product_cloth0}:
+    categ_id: product.cat1
+    cost_method: standard
+    mes_type: fixed
+    name: Cloth
+    procure_method: make_to_order
+    property_stock_inventory: stock.location_inventory
+    property_stock_procurement: stock.location_procurement
+    property_stock_production: stock.location_production
+    seller_delay: '1'
+    seller_ids:
+      - delay: 1
+        name: base.res_partner_sednacom
+        qty: 300.0
+    standard_price: 1.0
+    supply_method: buy
+    type: product
+    uom_id: product.product_uom_unit
+    uom_po_id: product.product_uom_unit
+    volume: 0.0
+    warranty: 0.0
+    weight: 0.0
+    weight_net: 0.0
+- 
+  Creating a product.product record
+- 
+  !record {model: product.product, id: product_product_buttons0}:
+    categ_id: product.cat1
+    cost_method: standard
+    mes_type: fixed
+    name: Buttons
+    procure_method: make_to_stock
+    property_stock_inventory: stock.location_inventory
+    property_stock_procurement: stock.location_procurement
+    property_stock_production: stock.location_production
+    seller_delay: '1'
+    seller_ids:
+      - delay: 1
+        name: base.res_partner_asus
+        qty: 100.0
+    standard_price: 1.0
+    supply_method: buy
+    type: product
+    uom_id: product.product_uom_kgm
+    uom_po_id: product.product_uom_kgm
+    volume: 0.0
+    warranty: 0.0
+    weight: 0.0
+    weight_net: 0.0
+-
+  I am creating bills of material for 'Shirt'.      
+- 
+  Creating a mrp.bom record
+- 
+  !record {model: mrp.bom, id: mrp_bom_shirt0}:
+    bom_lines:
+      - company_id: base.main_company
+        name: Cloth
+        product_efficiency: 1.0
+        product_id: product_product_cloth0
+        product_qty: 1.0
+        product_uom: product.product_uom_unit
+        product_uos_qty: 0.0
+        sequence: 0.0
+        type: normal
+      - company_id: base.main_company
+        name: Buttons
+        product_efficiency: 1.0
+        product_id: product_product_buttons0
+        product_qty: 8.0
+        product_uom: product.product_uom_unit
+        product_uos_qty: 0.0
+        sequence: 0.0
+        type: normal
+    company_id: base.main_company
+    name: Shirt
+    product_efficiency: 1.0
+    product_id: product_product_shirt0
+    product_qty: 1.0
+    product_uom: product.product_uom_unit
+    product_uos_qty: 0.0
+    sequence: 0.0
+    type: normal
+-
+  I create minimum stock rule for product Buttons
+-
+  !record {model: stock.warehouse.orderpoint, id: stock_warehouse_orderpoint_op0}:
+    company_id: base.main_company
+    location_id: stock.stock_location_stock
+    logic: max
+    name: OP/00007
+    product_id: mrp.product_product_buttons0
+    product_max_qty: 50.0
+    product_min_qty: 10.0
+    product_uom: product.product_uom_unit
+    qty_multiple: 1
+    warehouse_id: stock.warehouse0
+-
+  I create a procurement order for product Shirt.
+-
+  !record {model: mrp.procurement, id: mrp_procurement_shirt0}:
+    name: 'PROC: Shirt'
+    product_id: product_product_shirt0
+    product_qty: 5.00
+    location_id: stock.stock_location_stock
+    product_uom: product.product_uom_unit
+-
+  I confirm the procurement order.
+-
+  !workflow {model: mrp.procurement, action: button_confirm, ref: mrp_procurement_shirt0}
+-
+  I run the procurement.
+-
+  !workflow {model: mrp.procurement, action: button_check, ref: mrp_procurement_shirt0} 
+-
+  I see that there is a manufacturing order for Shirt.
+-
+  !python {model: mrp.production}: |
+    from tools.translate import _
+    order_ids = self.search(cr, uid, [('product_id','=',ref('product_product_shirt0'))])
+    assert order_ids, 'No Manufacturing Order.'
+-
+  I also check that there are two more procurement orders for sub products Cloth and Buttons.
+-
+  !python {model: mrp.procurement}: |
+    from tools.translate import _
+    proc_ids = self.search(cr, uid, [('product_id','in',[ref('product_product_cloth0'),ref('product_product_buttons0')])])
+    assert proc_ids, 'No Procurements.'
+-
+  The scheduler runs.
+-
+  !function {model: mrp.procurement, name: run_scheduler}:
+    - model: mrp.procurement
+      search: "[]"
+-
+  I check that there is one purchase order for Cloth.
+-
+  !python {model: purchase.order}: |
+    purch_ids = self.search(cr, uid, [('partner_id.name','=','Syleam')])
+    assert purch_ids, 'No Purchase Orders.'
+-
+  I confirm purchase order for Cloth.
+-
+  !python {model: purchase.order}: |
+    import netsvc
+    purch_ids = self.search(cr, uid, [('partner_id.name','=','Syleam')])
+    wf_service = netsvc.LocalService("workflow")
+    for p_id in purch_ids:
+    	wf_service.trg_validate(uid, 'purchase.order', p_id, 'purchase_confirm', cr)
+-
+  I get the approval from the supplier. So I approve my purchase orders.
+-
+  !python {model: purchase.order}: |
+    from tools.translate import _
+    import netsvc
+    purch_ids = self.search(cr, uid, [('state','=','confirmed')])
+    assert purch_ids, _('No Confirmed Purchase Orders found!')
+    wf_service = netsvc.LocalService("workflow")
+    for p_id in purch_ids:
+    	wf_service.trg_validate(uid, 'purchase.order', p_id, 'purchase_approve', cr)
+-
+  I confirm purchase order for Buttons.
+-
+  !python {model: purchase.order}: |
+    import netsvc
+    purch_ids = self.search(cr, uid, [('partner_id.name','=','ASUStek')])
+    wf_service = netsvc.LocalService("workflow")
+    for p_id in purch_ids:
+    	wf_service.trg_validate(uid, 'purchase.order', p_id, 'purchase_confirm', cr)
+-
+  I get the approval from the supplier. So I approve my purchase orders.
+-
+  !python {model: purchase.order}: |
+    from tools.translate import _
+    import netsvc
+    purch_ids = self.search(cr, uid, [('state','=','confirmed')])
+    assert purch_ids, _('No Confirmed Purchase Orders found!')
+    wf_service = netsvc.LocalService("workflow")
+    for p_id in purch_ids:
+    	wf_service.trg_validate(uid, 'purchase.order', p_id, 'purchase_approve', cr)
+-
+  I Check incoming shipments for cloth. And receive products.
+-
+  !python {model: stock.picking}: |
+    from tools.translate import _
+    pick_ids = self.search(cr, uid, [('address_id.name','=','Sebastien LANGE'),('state','=','assigned')])
+    assert pick_ids, _('No Incoming Shipments found!')
+-
+  !record {model: stock.partial.picking, id: stock_partial_picking0}:
+    date: '2010-04-30 16:53:36'
+    partner_id: base.res_partner_sednacom
+    address_id: base.res_partner_address_11
+-
+  !python {model: stock.partial.picking}: |
+     pick_obj = self.pool.get('stock.picking')
+     picking_ids = pick_obj.search(cr, uid, [('address_id.name','=','Sebastien LANGE'),('state','=','assigned')])
+     partial = self.browse(cr, uid, 1, 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):
+        for m in pick.move_lines:
+           partial_datas['move%s'%(m.id)] = {
+                    'product_id' : m.product_id.id,
+                    'product_qty' : m.product_qty,
+                    'product_uom' : m.product_uom.id
+           }
+           if (pick.type == 'in') and (m.product_id.cost_method == 'average'):   
+                    partial_datas['move%s'%(m.id)].update({             
+                        'product_price' : m.product_price,
+                        'product_currency': m.product_currency
+                    })
+     pick_obj.do_partial(cr, uid, picking_ids, partial_datas, context=context)
+-
+  I Check incoming shipments for buttons. And receive products.
+-
+  !python {model: stock.picking}: |
+    from tools.translate import _
+    pick_ids = self.search(cr, uid, [('address_id.name','=','Tang'),('state','=','assigned')])
+    assert pick_ids, _('No Incoming Shipments found!')
+-
+  !record {model: stock.partial.picking, id: stock_partial_picking0}:
+    date: '2010-04-30 16:53:36'
+    partner_id: base.res_partner_sednacom
+    address_id: base.res_partner_address_11
+-
+  !python {model: stock.partial.picking}: |
+     pick_obj = self.pool.get('stock.picking')
+     picking_ids = pick_obj.search(cr, uid, [('address_id.name','=','Tang'),('state','=','assigned')])
+     partial = self.browse(cr, uid, 1, 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):
+        for m in pick.move_lines:
+           partial_datas['move%s'%(m.id)] = {
+                    'product_id': m.product_id.id,
+                    'product_qty': m.product_qty,
+                    'product_uom': m.product_uom.id
+           }
+           if (pick.type == 'in') and (m.product_id.cost_method == 'average'):   
+                    partial_datas['move%s'%(m.id)].update({             
+                        'product_price': m.product_price,
+                        'product_currency': m.product_currency
+                    })
+     pick_obj.do_partial(cr, uid, picking_ids, partial_datas, context=context)
+-
+  Run scheduler again.
+-
+  !function {model: mrp.procurement, name: run_scheduler}:
+    - model: mrp.procurement
+      search: "[]"
+-
+  Check state of manufacturing order for Shirt.
+-
+  !python {model: mrp.production}: |
+    from tools.translate import _
+    order_ids = self.search(cr, uid, [('product_id','=',ref('product_product_shirt0')),('state','=','ready')])
+    assert order_ids, 'No Manufacturing Order in Ready state.'
+-
+  I start production order for Shirt.
+-
+  !python {model: mrp.production}: |
+    from tools.translate import _
+    import netsvc
+    prod_ids = self.search(cr, uid, [('state','=','ready')])
+    assert prod_ids, _('No Ready Manufacturing Orders found!')
+    wf_service = netsvc.LocalService("workflow")
+    for p_id in prod_ids:
+    	wf_service.trg_validate(uid, 'mrp.production', p_id, 'button_produce', cr)
+-
+  !record {model: mrp.product.produce, id: mrp_product_produce0}:
+    product_qty: 5.00
+    mode: 'consume_produce'
+-
+  !python {model: mrp.product.produce}: |
+    from tools.translate import _
+    prod_obj = self.pool.get('mrp.production')
+    prod_ids = prod_obj.search(cr, uid, [('product_id.name','=','Shirt')])
+    self.do_produce(cr, uid, [1], context={'active_ids': prod_ids})
+-
+  !record {model: stock.move.consume, id: stock_move_consume0}:
+    product_id: product_product_buttons0
+    product_qty: 35.00
+    product_uom: product.product_uom_unit
+    location_id: stock.stock_location_stock
+-
+  !python {model: stock.move.consume}: |
+    from tools.translate import _
+    stock_obj = self.pool.get('stock.move')
+    stock_ids = stock_obj.search(cr, uid, [('product_id.name','=','Buttons')])
+    self.do_move_consume(cr, uid, [1], context={'active_ids': stock_ids})
+-
+  And finally production order is done.
+-
+  !python {model: mrp.product.produce}: |
+    from tools.translate import _
+    prod_obj = self.pool.get('mrp.production')
+    prod_ids = prod_obj.search(cr, uid, [('product_id.name','=','Shirt')])
+    self.do_produce(cr, uid, [1], context={'active_ids': prod_ids})
+    
\ No newline at end of file

From 236e0e35d74af3f7e0b707748e0f165c4c1c7baf Mon Sep 17 00:00:00 2001
From: mso <mso@mso>
Date: Thu, 13 May 2010 12:01:20 +0530
Subject: [PATCH 23/82] [FIX] stock:bug fixed related to tracking_id in context
 while loading of demo data & few optiizations

bzr revid: mso@mso-20100513063120-ycya5whxoq2wef0q
---
 addons/stock/stock.py | 38 ++++++++++++++++++++++----------------
 1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 08494e4d818..3caad46d8f7 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1508,9 +1508,12 @@ class stock_move(osv.osv):
         #self.action_cancel(cr,uid, ids2, context)
         return True
 
-    def action_done(self, cr, uid, ids, context=None):
+    def action_done(self, cr, uid, ids, context={}):
         track_flag = False
         picking_ids = []
+        product_uom_obj = self.pool.get('product.uom')
+        price_type_obj = self.pool.get('product.price.type')
+        move_obj = self.pool.get('account.move')
         for move in self.browse(cr, uid, ids):
             if move.picking_id: picking_ids.append(move.picking_id.id)
             if move.move_dest_id.id and (move.state != 'done'):
@@ -1572,7 +1575,6 @@ class stock_move(osv.osv):
                 journal_id = move.product_id.categ_id.property_stock_journal.id
                 if acc_src != acc_dest:
                     ref = move.picking_id and move.picking_id.name or False
-                    product_uom_obj = self.pool.get('product.uom')
                     default_uom = move.product_id.uom_id.id
                     date = time.strftime('%Y-%m-%d')
                     q = product_uom_obj._compute_qty(cr, uid, move.product_uom.id, move.product_qty, default_uom)
@@ -1580,11 +1582,11 @@ class stock_move(osv.osv):
                         amount = q * move.price_unit
                     # Base computation on valuation price type
                     else:
-                        company_id=move.company_id.id
-                        context['currency_id']=move.company_id.currency_id.id
-                        pricetype=self.pool.get('product.price.type').browse(cr,uid,move.company_id.property_valuation_price_type.id)
-                        amount_unit=move.product_id.price_get(pricetype.field, context)[move.product_id.id]
-                        amount=amount_unit * q or 1.0
+                        company_id = move.company_id.id
+                        context['currency_id'] = move.company_id.currency_id.id
+                        pricetype = price_type_obj.browse(cr,uid,move.company_id.property_valuation_price_type.id)
+                        amount_unit = move.product_id.price_get(pricetype.field, context)[move.product_id.id]
+                        amount = amount_unit * q or 1.0
                         # amount = q * move.product_id.standard_price
 
                     partner_id = False
@@ -1610,21 +1612,25 @@ class stock_move(osv.osv):
                                 'date': date,
                                 'partner_id': partner_id})
                     ]
-                    self.pool.get('account.move').create(cr, uid, {
+                    move_obj.create(cr, uid, {
                         'name': move.name,
                         'journal_id': journal_id,
                         'line_id': lines,
                         'ref': ref,
                     })
-        tracking_id = context.get('tracking_id', False)
-        if tracking_id:
-            tracking = self.pool.get('stock.tracking')
-            tracking_id = tracking.get_create_tracking_lot(cr, uid,[rec_id], context=context )        
-             
-        self.write(cr, uid, ids, {'state': 'done', 'date_planned': time.strftime('%Y-%m-%d %H:%M:%S'), 'tracking_id': tracking_id})
-        for pick in self.pool.get('stock.picking').browse(cr, uid, picking_ids):
+        tracking_id = False                    
+        if context:
+            tracking_id = context.get('tracking_id', False)
+            if tracking_id:
+                rec_id = context and context.get('active_id', False)
+                tracking = self.pool.get('stock.tracking')
+                tracking_id = tracking.get_create_tracking_lot(cr, uid,[rec_id], context=context )        
+                 
+        self.write(cr, uid, ids, {'state': 'done', 'date_planned': time.strftime('%Y-%m-%d %H:%M:%S'), 'tracking_id': tracking_id or False})
+        picking_obj = self.pool.get('stock.picking')
+        for pick in picking_obj.browse(cr, uid, picking_ids):
             if all(move.state == 'done' for move in pick.move_lines):
-                self.pool.get('stock.picking').action_done(cr, uid, [pick.id])
+                picking_obj.action_done(cr, uid, [pick.id])
 
         wf_service = netsvc.LocalService("workflow")
         for id in ids:

From 37da9f84b4a19966385357519c1acfe41557629a Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.com>
Date: Thu, 13 May 2010 12:16:54 +0530
Subject: [PATCH 24/82] [IMP] mrp: Improved yaml for procurement as partner
 should be a supplier in purchase order.

bzr revid: uco@tinyerp.com-20100513064654-fj7vn7hvxrv35qaa
---
 addons/mrp/test/mrp_procurement.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/addons/mrp/test/mrp_procurement.yml b/addons/mrp/test/mrp_procurement.yml
index 5f3217d45e2..37d0de5c5a9 100644
--- a/addons/mrp/test/mrp_procurement.yml
+++ b/addons/mrp/test/mrp_procurement.yml
@@ -41,7 +41,7 @@
     seller_delay: '1'
     seller_ids:
       - delay: 1
-        name: base.res_partner_sednacom
+        name: base.res_partner_maxtor
         qty: 300.0
     standard_price: 1.0
     supply_method: buy
@@ -167,14 +167,14 @@
   I check that there is one purchase order for Cloth.
 -
   !python {model: purchase.order}: |
-    purch_ids = self.search(cr, uid, [('partner_id.name','=','Syleam')])
+    purch_ids = self.search(cr, uid, [('partner_id.name','=','Maxtor')])
     assert purch_ids, 'No Purchase Orders.'
 -
   I confirm purchase order for Cloth.
 -
   !python {model: purchase.order}: |
     import netsvc
-    purch_ids = self.search(cr, uid, [('partner_id.name','=','Syleam')])
+    purch_ids = self.search(cr, uid, [('partner_id.name','=','Maxtor')])
     wf_service = netsvc.LocalService("workflow")
     for p_id in purch_ids:
     	wf_service.trg_validate(uid, 'purchase.order', p_id, 'purchase_confirm', cr)
@@ -214,17 +214,17 @@
 -
   !python {model: stock.picking}: |
     from tools.translate import _
-    pick_ids = self.search(cr, uid, [('address_id.name','=','Sebastien LANGE'),('state','=','assigned')])
+    pick_ids = self.search(cr, uid, [('address_id.name','=','Wong'),('state','=','assigned')])
     assert pick_ids, _('No Incoming Shipments found!')
 -
   !record {model: stock.partial.picking, id: stock_partial_picking0}:
     date: '2010-04-30 16:53:36'
-    partner_id: base.res_partner_sednacom
-    address_id: base.res_partner_address_11
+    partner_id: base.res_partner_maxtor
+    address_id: base.res_partner_address_wong
 -
   !python {model: stock.partial.picking}: |
      pick_obj = self.pool.get('stock.picking')
-     picking_ids = pick_obj.search(cr, uid, [('address_id.name','=','Sebastien LANGE'),('state','=','assigned')])
+     picking_ids = pick_obj.search(cr, uid, [('address_id.name','=','Wong'),('state','=','assigned')])
      partial = self.browse(cr, uid, 1, context)
      partial_datas = {
             'partner_id' : partial.partner_id and partial.partner_id.id or False,
@@ -254,8 +254,8 @@
 -
   !record {model: stock.partial.picking, id: stock_partial_picking0}:
     date: '2010-04-30 16:53:36'
-    partner_id: base.res_partner_sednacom
-    address_id: base.res_partner_address_11
+    partner_id: base.res_partner_maxtor
+    address_id: base.res_partner_address_wong
 -
   !python {model: stock.partial.picking}: |
      pick_obj = self.pool.get('stock.picking')

From c1eb9abf86ab548491eb27c4659e560baa0378b7 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 13 May 2010 12:18:32 +0530
Subject: [PATCH 25/82] [IMP]: Improve the yml for purchase_requisition and
 delivery

bzr revid: sbh@tinyerp.com-20100513064832-rbv0erf9aujoj42n
---
 addons/delivery/test/delivery_test.yml                |  6 +++---
 .../test/purchase_requisition.yml                     | 11 +++++++----
 .../test/purchase_requisition_exclusive.yml           | 10 +++++++---
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/addons/delivery/test/delivery_test.yml b/addons/delivery/test/delivery_test.yml
index 3597ca523fa..36bc6ec7e19 100644
--- a/addons/delivery/test/delivery_test.yml
+++ b/addons/delivery/test/delivery_test.yml
@@ -1,5 +1,5 @@
 -
-  In order to test the delivery module, I will do Configuration ‣ Delivery ‣ Delivery Method 
+  In order to test the delivery module, I will do Configuration -> Delivery -> Delivery Method 
   And there are two methods for doing that 
      Delivery based on order quantities,
      Delivery based on delivered quantities.
@@ -37,14 +37,14 @@
     
 -    
 
-  Creating a Delivery Method
+  I create the Delivery Method
 - 
   !record {model: delivery.carrier, id: delivery_carrier_theopenerpexperss0}:
     name: The OpenERP Experss
     partner_id: res_partner_thepost0
     product_id: product_product_deliverybypost0
 - 
-  Creating a delivery.grid record and define the region for which the tariffs in the grid will be applicable.
+  I Create a delivery grid record and define the region for which the tariffs in the grid will be applicable.
   Then set the condition for which this rule is applicable
 - 
   !record {model: delivery.grid, id: delivery_grid_weight0}:
diff --git a/addons/purchase_requisition/test/purchase_requisition.yml b/addons/purchase_requisition/test/purchase_requisition.yml
index ef2331a3518..6a8d52ed201 100644
--- a/addons/purchase_requisition/test/purchase_requisition.yml
+++ b/addons/purchase_requisition/test/purchase_requisition.yml
@@ -1,6 +1,6 @@
 
 -
-  In order to test the purchase requicisition module, I will do a sale order -> purchase_requisition ->
+  In order to test the purchase requisition module, I will do a sale order -> purchase_requisition ->
   purchase flow and I will buy the required products at two different suppliers.
 - 
   I start by creating a new product 'Laptop ACER', which is purchased at Asustek, in MTO,
@@ -109,10 +109,12 @@
   !python {model: purchase.order}: |
     line_obj=self.pool.get('purchase.order.line')  
     partner_obj=self.pool.get('res.partner')    
+    requistion_obj=self.pool.get('purchase.requisition')
+    requistion_ids =requistion_obj.search(cr, uid, [('origin','=','TEST/TENDER/0001')])    
     partner_id1=partner_obj.search(cr,uid,[('name','=','ASUStek')])[0] 
-    partner_id2=self.pool.get('res.partner').search(cr,uid,[('name','=','Distrib PC')])[0]   
-    purchase_id1= self.search(cr, uid, [('partner_id','=',partner_id1)])
-    purchase_id2= self.search(cr, uid, [('partner_id','=',partner_id2)])
+    partner_id2=partner_obj.search(cr,uid,[('name','=','Distrib PC')])[0]   
+    purchase_id1= self.search(cr, uid, [('partner_id','=',partner_id1),('requisition_id','in',requistion_ids)])
+    purchase_id2= self.search(cr, uid, [('partner_id','=',partner_id2),('requisition_id','in',requistion_ids)])
     order_line1=self.browse(cr, uid, purchase_id1, context)[0].order_line[0].id
     order_line2=self.browse(cr, uid, purchase_id2, context)[0].order_line[0].id
     line_obj.write(cr, uid, order_line1, {'product_qty':2})
@@ -147,6 +149,7 @@
   !python {model: stock.picking }: |
    import time
    partner_obj=self.pool.get('res.partner')    
+   order_obj=self.pool.get('purchase.order')
    partner_id=partner_obj.search(cr,uid,[('name','=','ASUStek')])[0]    
    picking_id = self.search(cr, uid, [('address_id.partner_id','=',partner_id),('type','=','in')])
    if picking_id:
diff --git a/addons/purchase_requisition/test/purchase_requisition_exclusive.yml b/addons/purchase_requisition/test/purchase_requisition_exclusive.yml
index cc59649577e..030b80b2260 100644
--- a/addons/purchase_requisition/test/purchase_requisition_exclusive.yml
+++ b/addons/purchase_requisition/test/purchase_requisition_exclusive.yml
@@ -1,5 +1,5 @@
 -
-  In order to test the purchase requicisition module, I will do a sale order -> purchase_requisition ->
+  In order to test the purchase requisition module, I will do a sale order -> purchase_requisition ->
   purchase flow and I will buy the required products at two different suppliers.
   
 -
@@ -99,7 +99,9 @@
 -
  !python {model: purchase.order}: |
     partner_id=self.pool.get('res.partner').search(cr,uid,[('name','=','ASUStek')])[0]
-    purchase_id= self.search(cr, uid, [('partner_id','=',partner_id)])[0]
+    req_obj = self.pool.get('purchase.requisition')
+    ids =req_obj.search(cr, uid, [('origin','=','TEST/TENDER/0002')])    
+    purchase_id= self.search(cr, uid, [('partner_id','=',partner_id),('requisition_id','in',ids)])[0]
     import netsvc
     wf_service = netsvc.LocalService("workflow")  
     if purchase_id:
@@ -110,6 +112,8 @@
 -        
   !python {model: purchase.order}: |
    partner_id=self.pool.get('res.partner').search(cr,uid,[('name','=','Distrib PC')])[0]
-   purchase_id= self.search(cr, uid, [('partner_id','=',partner_id)])[0]  
+   req_obj = self.pool.get('purchase.requisition')
+   ids =req_obj.search(cr, uid, [('origin','=','TEST/TENDER/0002')])     
+   purchase_id= self.search(cr, uid, [('partner_id','=',partner_id),('requisition_id','in',ids)])[0]
    state=self.browse(cr,uid,purchase_id).state
    assert (state=='cancel')
\ No newline at end of file

From 869a83bf30c7301797ef1aa1277c963433f71140 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 13 May 2010 13:34:59 +0530
Subject: [PATCH 26/82] [Fix] point_of_sale: Fix the probelm of company_ids

bzr revid: sbh@tinyerp.com-20100513080459-j4rr6kr2j42s2cxj
---
 addons/point_of_sale/pos_demo.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/point_of_sale/pos_demo.xml b/addons/point_of_sale/pos_demo.xml
index b75f4362578..b548f12d8e7 100644
--- a/addons/point_of_sale/pos_demo.xml
+++ b/addons/point_of_sale/pos_demo.xml
@@ -46,6 +46,7 @@
 			<field eval="&quot;&quot;&quot;en_US&quot;&quot;&quot;" name="context_lang"/>
 			<field eval="&quot;&quot;&quot;Shop 3&quot;&quot;&quot;" name="name"/>
 			<field name="company_id" ref="res_company_shop0"/>
+ 			<field name="company_ids" eval="[(4, ref('res_company_shop0'))]"/>			
 			<field eval="&quot;&quot;&quot;shop3&quot;&quot;&quot;" name="login"/>
 			<field model="ir.actions.actions" name="action_id" search="[('name','=','Menu')]"/>
 		</record>

From 1aa1cc8dcd02ba5dcf96e0576adfb2db43a4988b Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 13 May 2010 13:51:42 +0530
Subject: [PATCH 27/82] Task ID-578: Rename the field of last_out_picking with
 picking_id

bzr revid: sbh@tinyerp.com-20100513082142-kr3r5sqp9hg01y4j
---
 addons/point_of_sale/pos.py                 | 10 +++++-----
 addons/point_of_sale/wizard/pos_get_sale.py |  2 +-
 addons/point_of_sale/wizard/pos_return.py   |  6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/addons/point_of_sale/pos.py b/addons/point_of_sale/pos.py
index 6a1e78ecbe0..61a937b7439 100644
--- a/addons/point_of_sale/pos.py
+++ b/addons/point_of_sale/pos.py
@@ -237,7 +237,7 @@ class pos_order(osv.osv):
             'partner_id': False,
             'invoice_id': False,
             'account_move': False,
-            'last_out_picking': False,
+            'picking_id': False,
             'nb_print': 0,
             'pickings': []
         })
@@ -308,7 +308,7 @@ class pos_order(osv.osv):
         'invoice_id': fields.many2one('account.invoice', 'Invoice'),
         'account_move': fields.many2one('account.move', 'Account Entry', readonly=True),
         'pickings': fields.one2many('stock.picking', 'pos_order', 'Picking', readonly=True),
-        'last_out_picking': fields.many2one('stock.picking', 'Last Output Picking', readonly=True),
+        'picking_id': fields.many2one('stock.picking', 'Last Output Picking', readonly=True),
         'first_name': fields.char('First Name', size=64),
         'state_2': fields.function(_get_v,type='selection',selection=[('to_verify', 'To Verify'), ('accepted', 'Accepted'),
             ('refused', 'Refused')], string='State', readonly=True, method=True, store=True),
@@ -467,7 +467,7 @@ class pos_order(osv.osv):
 
         orders = self.browse(cr, uid, ids, context)
         for order in orders:
-            if not order.last_out_picking:
+            if not order.picking_id:
                 new = True
                 picking_id = picking_obj.create(cr, uid, {
                     'origin': order.name,
@@ -479,9 +479,9 @@ class pos_order(osv.osv):
                     'auto_picking': True,
                     'pos_order': order.id,
                     })
-                self.write(cr, uid, [order.id], {'last_out_picking': picking_id})
+                self.write(cr, uid, [order.id], {'picking_id': picking_id})
             else:
-                picking_id = order.last_out_picking.id
+                picking_id = order.picking_id.id
                 picking_obj.write(cr, uid, [picking_id], {'auto_picking': True})
                 picking = picking_obj.browse(cr, uid, [picking_id], context)[0]
                 new = False
diff --git a/addons/point_of_sale/wizard/pos_get_sale.py b/addons/point_of_sale/wizard/pos_get_sale.py
index 918705440c8..dd2752c3dea 100644
--- a/addons/point_of_sale/wizard/pos_get_sale.py
+++ b/addons/point_of_sale/wizard/pos_get_sale.py
@@ -55,7 +55,7 @@ class pos_get_sale(osv.osv_memory):
 
             for pick in proxy_pick.browse(cr, uid, [this.picking_id.id], context):
                 proxy_pos.write(cr, uid, record_id, {
-                    'last_out_picking': this.picking_id.id,
+                    'picking_id': this.picking_id.id,
                     'partner_id': pick.address_id and pick.address_id.partner_id.id
                 })
 
diff --git a/addons/point_of_sale/wizard/pos_return.py b/addons/point_of_sale/wizard/pos_return.py
index bdb6f46e71e..8d8669751ff 100644
--- a/addons/point_of_sale/wizard/pos_return.py
+++ b/addons/point_of_sale/wizard/pos_return.py
@@ -158,14 +158,14 @@ class pos_return(osv.osv_memory):
                 location_id=res and res[0] or None
                 stock_dest_id = val.id
                                     
-                new_picking=picking_obj.copy(cr, uid, order_id.last_out_picking.id, {'name':'%s (return)' % order_id.name,
+                new_picking=picking_obj.copy(cr, uid, order_id.picking_id.id, {'name':'%s (return)' % order_id.name,
                                                                                     'move_lines':[], 'state':'draft', 'type':'in',
                                                                                     'type':'in',
                                                                                     'date':date_cur})
                 new_order=order_obj.copy(cr,uid,order_id.id, {'name': 'Refund %s'%order_id.name,
                                                               'lines':[],
                                                               'statement_ids':[],
-                                                              'last_out_picking':[]})
+                                                              'picking_id':[]})
                 for line in order_id.lines:
                     if line.id  and (data['return%s' %line.id]!=0.0):
                         new_move=stock_move_obj.create(cr, uid,{
@@ -262,7 +262,7 @@ class add_product(osv.osv_memory):
         
                 wf_service.trg_validate(uid, 'stock.picking',new_picking,'button_confirm', cr)
                 picking_obj.force_assign(cr, uid, [new_picking], context)
-                order_obj.write(cr,uid,active_id,{'last_out_picking':new_picking})
+                order_obj.write(cr,uid,active_id,{'picking_id':new_picking})
                 
              
         return {            

From 61ce0995704862e3efbaaa16153c8d416ee15094 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.com>
Date: Thu, 13 May 2010 13:54:27 +0530
Subject: [PATCH 28/82] [FIX] auction: Changed object name in default_get.

bzr revid: uco@tinyerp.com-20100513082427-c0ut74pzc6wh998s
---
 addons/auction/wizard/auction_lots_numerotate.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/auction/wizard/auction_lots_numerotate.py b/addons/auction/wizard/auction_lots_numerotate.py
index 79163146529..b464ba49a28 100644
--- a/addons/auction/wizard/auction_lots_numerotate.py
+++ b/addons/auction/wizard/auction_lots_numerotate.py
@@ -48,7 +48,7 @@ class auction_lots_numerotate_per_lot(osv.osv_memory):
          @param context: A standard dictionary 
          @return: A dictionary which of fields with values. 
         """
-        res = super(wiz_auc_lots_numerotate_per_lot, self).default_get(cr, uid, fields, context=context)
+        res = super(auction_lots_numerotate_per_lot, self).default_get(cr, uid, fields, context=context)
         active_id = context.get('active_id',False)
         active_model = context.get('active_model')
         if active_id and (active_model and active_model!='auction.lots'):

From 9faa1e5e0e97038b6c6d415a867e04f21099d274 Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Thu, 13 May 2010 14:34:47 +0530
Subject: [PATCH 29/82] [IMP] point_of_sale sale_crm stock: Task ID-595:remove
 select=1 from all search views and all form view having a search view defined
 for the same object

bzr revid: mtr@mtr-20100513090447-113eqht4bw7o17lv
---
 addons/point_of_sale/pos_view.xml             | 24 +++++++++----------
 addons/sale_crm/sale_crm_view.xml             |  4 ++--
 .../stock/report/report_stock_move_view.xml   |  4 ++--
 addons/stock/stock_view.xml                   | 23 ++++++++----------
 4 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/addons/point_of_sale/pos_view.xml b/addons/point_of_sale/pos_view.xml
index c36420da08a..be838e1e11e 100644
--- a/addons/point_of_sale/pos_view.xml
+++ b/addons/point_of_sale/pos_view.xml
@@ -13,7 +13,7 @@
                             <group colspan="4" col="6">
                                 <field name="user_salesman_id" />
                                 <field name="partner_id" on_change="onchange_partner_pricelist(partner_id)"/>
-                                <field name="contract_number" select="1" groups="base.group_extended"/>
+                                <field name="contract_number" groups="base.group_extended"/>
                             </group>
                             <field name="lines" colspan="4" nolabel="1">
                                 <tree string="Order lines" editable="bottom">
@@ -60,7 +60,7 @@
                               </group>
                             <separator colspan="4" string="Actions"/>
                             <group colspan="4" col="6">
-                                <field name="state" select="1"/>
+                                <field name="state"/>
                                 <button name="%(action_pos_payment)d" string="Ma_ke Payment" icon="gtk-ok" type="action" states="draft,advance" />
                                 <button name="%(action_report_pos_receipt)d" string="_Reprint" icon="gtk-print" type="action" states="paid,done,invoiced"/>
                                 <button name="set_to_draft" string="Set to draft" states="paid" icon="gtk-execute" type="object" />
@@ -74,16 +74,16 @@
                                 <separator string="Order Information" colspan="4"/>
                                 <field name="company_id"/>
                                 <field name="shop_id" widget="selection"  />
-                                <field name="name" select="1"/>
+                                <field name="name"/>
                                 <field name="user_id" />
                                 <field name="sale_manager" />
                                 <field name="price_type" />
                             </group>
                             <group colspan="2" col="2" name="Type">
                                 <separator string="Dates" colspan="4"/>
-                                <field name="date_order" select="1" />
-                                <field name="date_validation" select="1"  />
-                                <field name="date_payment" select="1"  groups="base.group_extended"/>
+                                <field name="date_order"/>
+                                <field name="date_validation" />
+                                <field name="date_payment" groups="base.group_extended"/>
                             </group>
                             <group colspan="4">
                                 <separator string="Invoicing" colspan="4"/>
@@ -135,12 +135,12 @@
             <field name="arch" type="xml">
                 <tree string="POS Orders">
                     <field name="name"/>
-                    <field name="date_order" select="1"/>
+                    <field name="date_order"/>
                     <field name="date_validation"/>
                     <field name="date_payment"/>
                     <field name="user_id"/>
                     <field name="invoice_id"/>
-                    <field name="state" select="1"/>
+                    <field name="state" />
                     <field name="amount_total" sum="Amount total"/>
                     <field name="company_id"/>
                 </tree>
@@ -155,12 +155,12 @@
                     <filter icon="terp-sale" string="Quotations" domain="[('state','=','draft')]"/>
                     <filter icon="terp-sale" string="Running" domain="[('state','in',('payment','advance'))]"/>
                     <separator orientation="vertical"/>
-                    <field name="name" select="1"/>
-                    <field name="partner_id" select="1"/>
-                    <field name="user_id" select="1" widget="selection">
+                    <field name="name"/>
+                    <field name="partner_id"/>
+                    <field name="user_id" widget="selection">
                         <filter icon="terp-partner" string="My Sale" domain="[('user_id','=',uid)]" help="My Sale Orders" />
                     </field>
-                    <field name="date_order" select="1" string="Order date" />
+                    <field name="date_order" string="Order date" />
                     <newline/>
                     <group expand="1" string="Group By..." colspan="11" col="11">
                         <filter string="Customer" icon="terp-sale" domain="[]" context="{'group_by':'partner_id'}"/>
diff --git a/addons/sale_crm/sale_crm_view.xml b/addons/sale_crm/sale_crm_view.xml
index 9c5ed8d1176..e6b7ef44136 100644
--- a/addons/sale_crm/sale_crm_view.xml
+++ b/addons/sale_crm/sale_crm_view.xml
@@ -22,7 +22,7 @@
         <field name="inherit_id" ref="sale.view_order_form"/>
         <field name="arch" type="xml">
             <field name="user_id" position="after">
-                <field name="section_id" widget="selection" groups="base.group_extended"/>
+            <field name="section_id" widget="selection" groups="base.group_extended"/>
             </field>
         </field>
     </record>
@@ -34,7 +34,7 @@
         <field name="inherit_id" ref="sale.view_sales_order_filter"/>
         <field name="arch" type="xml">
             <field name="date_order" position="after">
-            <field name="section_id" default="context.get('section_id', False)" select="1" widget="selection" string="Section" groups="base.group_extended">
+            <field name="section_id" default="context.get('section_id', False)" widget="selection" string="Section" groups="base.group_extended">
 
                     <filter icon="terp-crm"
                             domain="[('section_id','=',context.get('section_id',False))]"
diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index 79657da0fc7..69988444909 100755
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -69,8 +69,8 @@
                     	help = "Completed Stock-Moves"/>
                 
                 <separator orientation="vertical"/>                                        
-                <field name="product_id" select="1" widget="selection"/>
-                <field name="location_id" select="1" widget="selection"/>
+                <field name="product_id" widget="selection"/>
+                <field name="location_id" widget="selection"/>
                 </group>
                 <newline/>
                 <group expand="1" string="Group By..." >
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index d4bff0398f7..d07edc93510 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -600,13 +600,13 @@
                 <form string="Picking list">
                     <group colspan="4" col="6">
 
-                        <field name="name" select="1" readonly="1"/>
-<!--                    <field name="address_id" select="1" context="{'contact_display' : 'partner'}" groups="base.group_extended"/>-->
+                        <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" select="1"/>
+                        <field name="min_date"/>
                         <field name="type"/>
                         <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     </group>
@@ -734,7 +734,7 @@
             <field name="arch" type="xml">
                 <tree colors="blue:state in ('draft');grey:state in ('cancel', 'done');red:state not in ('cancel', 'done') and date &lt; current_date" string="Picking list">
                     <field name="name"/>
-		    <field name="address_id" select="1"/>
+		    		<field name="address_id"/>
                     <field name="backorder_id" groups="base.group_extended"/>
                     <field name="origin"/>
                     <field name="date"/>
@@ -1036,9 +1036,9 @@
                         <filter icon="terp-stock" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Outgoing Orders"/>
                         <separator orientation="vertical"/>
 
-                        <field name="name" select="1"/>
-                        <field name="address_id" select="1"/>
-<!--                        <field name="company_id" select="1" widget="selection"/>-->
+                        <field name="name"/>
+                        <field name="address_id" />
+<!--                        <field name="company_id" widget="selection"/>-->
 
                    </group>
                     <newline/>
@@ -1108,9 +1108,8 @@
                 <form string="Input Picking List">
                     <group colspan="4" col="6">
 
-                        <field name="name" readonly="1" select="1"/>
+                        <field name="name" readonly="1"/>
                         <field name="address_id" on_change="onchange_partner_in(address_id)" context="{'contact_display':'partner'}" />
-
                         <field name="origin"/>
                         <field name="backorder_id" readonly="1" groups="base.group_extended"/>
                         <field name="date"/>
@@ -1342,10 +1341,8 @@
 
                             <group colspan="2" col="2">
                                 <separator string="Locations &amp; Picking" colspan="2" />
-
-                                <field name="location_id" select="1" widget="selection"/>
-                                <field name="location_dest_id" select="1" widget="selection"/>
-
+                                <field name="location_id" widget="selection"/>
+                                <field name="location_dest_id" widget="selection"/>
                                 <field name="picking_id"/>
                                 <field name="address_id" context="{'contact_display':'partner'}"/>
                                 <field name="company_id" groups="base.group_multi_company" widget="selection"/>

From 8e7fd8326736ba1860377e92e54f9b9930a32f69 Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Thu, 13 May 2010 15:48:59 +0530
Subject: [PATCH 30/82] [IMP] removed test from purchase

bzr revid: mtr@mtr-20100513101859-p14mir5p0ogpov92
---
 addons/purchase/__openerp__.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/addons/purchase/__openerp__.py b/addons/purchase/__openerp__.py
index 9dfb641d695..909b785fe72 100644
--- a/addons/purchase/__openerp__.py
+++ b/addons/purchase/__openerp__.py
@@ -51,10 +51,7 @@
         'process/purchase_process.xml',
         'report/purchase_report_view.xml',
     ],
-#    'demo_xml': ['purchase_demo.xml'],
-    'test':['test/yaml_main.yml',],
-            #'test/yaml_main1.yml',
-#            'test/yaml_manual.yml',
+    'demo_xml': ['purchase_demo.xml'],
     'installable': True,
     'active': False,
     'certificate': '0057234283549',

From f06c15b364203bf9b749cce1bb9be87484c3773c Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 14 May 2010 12:58:23 +0530
Subject: [PATCH 31/82] Task-ID 527: Add the yml for point_of_sale and fix the
 bug in retrun wizard

bzr revid: sbh@tinyerp.com-20100514072823-pfer1lrt64botvi3
---
 addons/point_of_sale/__openerp__.py        |   1 +
 addons/point_of_sale/pos.py                |  15 +-
 addons/point_of_sale/test/pos_test.yml     | 465 +++++++++++++++++++++
 addons/point_of_sale/wizard/pos_payment.py |  74 ++--
 addons/point_of_sale/wizard/pos_return.py  |  12 +-
 5 files changed, 520 insertions(+), 47 deletions(-)
 create mode 100644 addons/point_of_sale/test/pos_test.yml

diff --git a/addons/point_of_sale/__openerp__.py b/addons/point_of_sale/__openerp__.py
index 111702c2e74..27707bcf0e0 100644
--- a/addons/point_of_sale/__openerp__.py
+++ b/addons/point_of_sale/__openerp__.py
@@ -75,6 +75,7 @@ Main features :
         'statement_data.xml',
     ],
     'demo_xml': ['pos_demo.xml','singer_statement_demo.xml','multi_company_stock_data.xml'],
+    'test':['test/pos_test.yml',],
     'installable': True,
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/point_of_sale/pos.py b/addons/point_of_sale/pos.py
index ff1197aecac..7a8d64899fa 100644
--- a/addons/point_of_sale/pos.py
+++ b/addons/point_of_sale/pos.py
@@ -1088,13 +1088,14 @@ class pos_order_line(osv.osv):
                 'Please set one before choosing a product.'))
         p_obj = self.pool.get('product.product').browse(cr,uid,product_id).list_price
         price = self.pool.get('product.pricelist').price_get(cr, uid,
-            [pricelist], product_id, qty or 1.0, partner_id)[pricelist] 
-        if price is False:
-            raise osv.except_osv(_('No valid pricelist line found !'),
-                _("Couldn't find a pricelist line matching this product" \
-                " and quantity.\nYou have to change either the product," \
-                " the quantity or the pricelist."))
-        return price
+            [pricelist], product_id, qty or 1.0, partner_id)[pricelist]
+        # Todo need to check     
+#        if price is False:
+#            raise osv.except_osv(_('No valid pricelist line found !'),
+#                _("Couldn't find a pricelist line matching this product" \
+#                " and quantity.\nYou have to change either the product," \
+#                " the quantity or the pricelist."))
+        return price or p_obj
 
     def onchange_product_id(self, cr, uid, ids, pricelist, product_id, qty=0, partner_id=False):
         price = self.price_by_product(cr, uid, ids, pricelist, product_id, qty, partner_id)
diff --git a/addons/point_of_sale/test/pos_test.yml b/addons/point_of_sale/test/pos_test.yml
new file mode 100644
index 00000000000..42bcc515ca4
--- /dev/null
+++ b/addons/point_of_sale/test/pos_test.yml
@@ -0,0 +1,465 @@
+-
+ In order to test the POS in module,  To gives business owners a convenient way of checking out customers and of recording sales.
+
+-
+ I  configure all details for the customer,Salesman  and  Product ,Account.
+- 
+  Creating an account.account.type record
+- 
+  !record {model: account.account.type, id: account_account_type_view0}:
+    close_method: none
+    code: View
+    name: View
+    sign: 1
+    
+    
+- 
+  Creating an account.account.type record
+- 
+  !record {model: account.account.type, id: account_account_type_income0}:
+    close_method: unreconciled
+    code: Income
+    name: Income
+    sign: 1
+    
+    
+- 
+  Creating an account.account.type record
+- 
+  !record {model: account.account.type, id: account_account_type_expense0}:
+    close_method: unreconciled
+    code: Expense
+    name: Expense
+    sign: 1
+    
+    
+- 
+  Creating an account.account.type record
+- 
+  !record {model: account.account.type, id: account_account_type_cash0}:
+    close_method: balance
+    code: Cash
+    name: Cash
+    sign: 1
+    
+    
+- 
+  Creating an account.account record
+- 
+  !record {model: account.account, id: account_account_minimalchart0}:
+    code: '0'
+    company_id: base.main_company
+    currency_mode: current
+    name: Minimal Chart
+    parent_left: 1
+    parent_right: 12
+    type: view
+    user_type: account_account_type_view0
+- 
+  Creating an account.account record
+- 
+  !record {model: account.account, id: account_account_payable1}:
+    code: AP
+    company_id: base.main_company
+    currency_mode: current
+    name: Payable
+    parent_id: account_account_minimalchart0
+    parent_left: 2
+    parent_right: 3
+    reconcile: true
+    type: payable
+    user_type: account_account_type_expense0
+    
+    
+- 
+  Creating an account.account record
+- 
+  !record {model: account.account, id: account_account_receivable0}:
+    code: AR
+    company_id: base.main_company
+    currency_mode: current
+    name: Receivable
+    parent_id: account_account_minimalchart0
+    parent_left: 4
+    parent_right: 5
+    reconcile: true
+    type: receivable
+    user_type: account_account_type_income0
+    
+    
+- 
+  Creating an account.account record
+- 
+  !record {model: account.account, id: account_account_cash0}:
+    code: C
+    company_id: base.main_company
+    currency_mode: current
+    name: Cash
+    parent_id: account_account_minimalchart0
+    parent_left: 6
+    parent_right: 7
+    type: other
+    user_type: account_account_type_cash0
+    
+    
+- 
+  Creating an account.account record
+- 
+  !record {model: account.account, id: account_account_purchases0}:
+    code: P
+    company_id: base.main_company
+    currency_mode: current
+    name: Purchases
+    parent_id: account_account_minimalchart0
+    parent_left: 8
+    parent_right: 9
+    type: other
+    user_type: account_account_type_expense0
+- 
+  Creating an account.account record
+- 
+  !record {model: account.account, id: account_account_sales0}:
+    code: S
+    company_id: base.main_company
+    currency_mode: current
+    name: Sales
+    parent_id: account_account_minimalchart0
+    parent_left: 10
+    parent_right: 11
+    type: other
+    user_type: account_account_type_income0
+
+- 
+  Creating an account.journal record
+- 
+  !record {model: account.journal, id: account_journal_purchasejournal0}:
+    code: PUJ
+    company_id: base.main_company
+    default_credit_account_id: account_account_purchases0
+    default_debit_account_id: account_account_purchases0
+    name: Purchase Journal
+    sequence_id: account.sequence_purchase_journal
+    type: purchase
+    view_id: account.account_journal_view
+    
+    
+- 
+  Creating an account.journal record
+- 
+  !record {model: account.journal, id: account_journal_salejournal0}:
+    code: SAJ
+    company_id: base.main_company
+    default_credit_account_id: account_account_sales0
+    default_debit_account_id: account_account_sales0
+    name: Sale Journal
+    sequence_id: account.sequence_sale_journal
+    type: sale
+    view_id: account.account_journal_view
+    
+    
+- 
+  Creating an account.journal record
+- 
+  !record {model: account.journal, id: account_journal_bankjournal0}:
+    code: BNK
+    company_id: base.main_company
+    default_credit_account_id: account_account_cash0
+    default_debit_account_id: account_account_cash0
+    name: Bank Journal
+    sequence_id: account.sequence_journal
+    type: cash
+    view_id: account.account_journal_bank_view
+    
+    
+- 
+  Creating a ir.property record
+- 
+  !record {model: ir.property, id: ir_property_propertyaccountexpensecateg0}:
+    company_id: base.main_company
+    fields_id: account.field_res_partner_property_account_payable
+    name: property_account_expense_categ
+    value_reference: account.account,5
+    
+    
+- 
+  Creating a ir.property record
+- 
+  !record {model: ir.property, id: ir_property_propertyaccountincomecateg0}:
+    company_id: base.main_company
+    fields_id: account.field_res_partner_property_account_receivable
+    name: property_account_income_categ
+    value_reference: account.account,6
+- 
+  Creating a res.partner.category record
+- 
+  !record {model: res.partner.category, id: res_partner_category_customers0}:
+    name: Customers
+-
+  Creating an res.partner record
+- 
+  !record {model: res.partner, id: res_partner_cleartrail0}:
+    category_id:
+      - res_partner_category_customers0
+    name: Cleartrail
+    
+    
+- 
+  Creating an res.partner.address record
+- 
+  !record {model: res.partner.address, id: res_partner_address_1}:
+    partner_id: res_partner_cleartrail0
+    street: onam plaza, 14 B palasia A B Road
+    type: contact
+    
+    
+- 
+  Creating an res.partner.address record
+- 
+  !record {model: res.partner.address, id: res_partner_address_2}:
+    partner_id: res_partner_cleartrail0
+    type: invoice
+    
+    
+- 
+  Creating an res.partner.address record
+- 
+  !record {model: res.partner.address, id: res_partner_address_3}:
+    partner_id: res_partner_cleartrail0
+    street: sangam house 15 B palasia, A B Road
+    type: delivery
+-
+  Customer Cleartrail has specific instrument requirements regarding the stockable products
+- 
+  Creating an product.category record
+- 
+  !record {model: product.category, id: product_category_allproductssellable0}:
+    name: Mobile Products Sellable
+-
+  Creating a res.partner record
+- 
+  !record {model: res.partner, id: res_partner_microlinktechnologies0}:
+    address:
+      - street: Kailash Vaibhav, Parksite
+    name: Micro Link Technologies
+    property_account_payable: account_account_payable1
+    property_account_receivable: account_account_receivable0   
+    supplier: true        
+    
+-
+  Creating a res.partner.address record
+- 
+  !record {model: res.partner.address, id: res_partner_address_0}:
+    country_id: base.in
+    partner_id: res_partner_microlinktechnologies0
+    street: Ash House, Ash Road
+    title: Ms.
+    
+                   
+    
+- 
+  Creating an product.category record
+- 
+  !record {model: product.category, id: product_category_services0}:
+    name: Mobile Services
+- 
+  Creating an product.template record
+- 
+  !record {model: product.template, id: product_template_lgviewtysmart0}:
+    categ_id: product_category_allproductssellable0
+    cost_method: standard
+    list_price: 170.0
+    mes_type: fixed
+    name: LG Viewty Smart
+    procure_method: make_to_order
+    standard_price: 160.0
+    supply_method: produce
+    type: product
+    uom_id: product.product_uom_unit
+    uom_po_id: product.product_uom_unit
+    
+-    
+  Creating an product.product record
+- 
+  !record {model: product.product, id: product_product_lgviewtysmart0}:
+    categ_id: product_category_allproductssellable0
+    cost_method: standard
+    list_price: 170.0
+    mes_type: fixed
+    name: LG Viewty Smart
+    pricelist_purchase: 'Default Purchase Pricelist (0.00) : 160.00\n'
+    pricelist_sale: 'Public Pricelist (0.00) : 170.00\n'
+    procure_method: make_to_order
+    property_account_expense: account_account_payable1
+    property_account_income: account_account_receivable0
+    seller_delay: '1'
+    standard_price: 160.0
+    supply_method: produce
+    type: product
+    uom_id: product.product_uom_unit
+    uom_po_id: product.product_uom_unit    
+-
+  !record {model: product.category, id: product_category_computer0}:
+    name: Computer
+
+- 
+  Creating a product.product record
+- 
+  !record {model: product.product, id: product_product_hppaviliondesktoppcs0}:
+    categ_id: product_category_computer0
+    cost_method: standard
+    mes_type: fixed
+    list_price: 1000.0    
+    name: HP Pavilion Desktop PCs
+    procure_method: make_to_stock
+    seller_ids:
+      - delay: 1
+        name: res_partner_microlinktechnologies0
+        qty: 5.0
+    supply_method: buy
+    type: product
+    uom_id: product.product_uom_unit
+    uom_po_id: product.product_uom_unit
+    property_account_expense: account_account_payable1
+    property_account_income: account_account_receivable0
+- 
+  Creating a pos.order record
+- 
+  !record {model: pos.order, id: pos_order_pos0}:
+    company_id: base.main_company
+    date_order: '2010-05-13 15:02:48'
+    date_validity: '2010-11-13'
+    lines:
+      - company_id: base.main_company
+        name: Order Line/01
+        notice: No Discount
+        product_id: product_product_lgviewtysmart0
+        qty: 10.0
+        qty_rfd: 0.0
+    name: POS/001
+    price_type: tax_excluded
+    pricelist_id: product.list0
+    sale_journal: account.sales_journal
+    shop_id: sale.shop
+    user_salesman_id: base.user_root
+- 
+  I have add discount 
+- 
+  !record {model: pos.discount, id: pos_discount_0}:
+    discount: 5.0
+    discount_notes: More then 5 product
+- 
+   Apply the discount 
+- 
+  !python {model: pos.discount}: |
+    self.apply_discount(cr, uid, [ref("pos_discount_0")], {"lang": "en_US", "active_model":
+      "pos.order", "active_ids": [ref("pos_order_pos0")], "tz": False, "active_id":
+      ref("pos_order_pos0"), })
+    
+- 
+  Creating a pos.open.statement record
+- 
+  !record {model: pos.open.statement, id: pos_open_statement_0}:
+    {}
+    
+- 
+  Performing an osv_memory action open_statement on module pos.open.statement
+- 
+  !python {model: pos.open.statement}: |
+    self.open_statement(cr, uid, [ref("pos_open_statement_0")], {"lang": "en_US", "active_model":
+      "ir.ui.menu", "active_ids": [ref("point_of_sale.menu_open_statement")], "tz":
+      False, "active_id": ref("point_of_sale.menu_open_statement"), })
+     
+-
+ Creating a pos.make.payment record
+- 
+  !record {model: pos.make.payment, id: pos_make_payment_0}:
+    amount: 1615.0
+    journal: 5
+    payment_date: 2010-05-13
+    payment_name: Payment
+    product_id: product_product_hppaviliondesktoppcs0
+    
+- 
+   For payment  I click on  Make Payment. 
+- 
+  !python {model: pos.make.payment}: |
+    self.check(cr, uid, [ref("pos_make_payment_0")], {"lang": "en_US", "active_model":
+      "pos.order", "active_ids": [ref("point_of_sale.pos_order_pos0")], "tz":
+      False, "active_id": ref("point_of_sale.pos_order_pos0"), })
+-
+  I have check the Statement lines are created automatically when payment are done.
+-
+  !python {model: pos.order}: |
+   order=self.browse(cr,uid,ref("pos_order_pos0"))
+   assert(order.statement_ids!=[]), "Statement lines not created"    
+                                            
+-
+  When i click on Return picking button , i get three option.
+-
+  1. Cancel 2.Return Goods and Exchange 3.Return without Refund
+-
+  When i click on  Return Goods and Exchange   
+-  
+  Then allows me to define the quantity of products, which will return to the stock. 
+- 
+  Creating a pos.return record
+- 
+  !record {model: pos.return, id: pos_return_0}:
+   {}
+- 
+  Performing an osv_memory action create_returns on module pos.return
+- 
+  !python {model: pos.return}: |
+    self.create_returns(cr, uid, [ref("pos_return_0")], {"lang": "en_US", "active_model":
+      "pos.order", "active_ids": [ref("point_of_sale.pos_order_pos0")], "tz":
+      False, "active_id": ref("point_of_sale.pos_order_pos0"), })
+    
+    
+- 
+  Then allows me to define the quantity of products, which will return to the stock.
+-
+  I have select the  HP Pavilion Desktop PCs for exchange   
+- 
+  !record {model: pos.add.product, id: pos_add_product_0}:
+    product_id: product_product_hppaviliondesktoppcs0
+    quantity: 5.0
+-    
+  I click on close on button.
+- 
+  !python {model: pos.add.product}: |
+    self.close_action(cr, uid, [ref("pos_add_product_0")], {"lang": "en_US", "active_model":
+      "pos.order", "active_ids": [ref("pos_order_pos0")], "tz": False, "active_id": ref("pos_order_pos0"),
+      })
+       
+-    
+  Creating a pos.make.payment record
+- 
+  !record {model: pos.make.payment, id: pos_make_payment_1}:
+    amount: 680.0
+    journal: '5'
+    payment_date: '2010-05-13'
+    payment_name: Payment
+    product_id: product_product_hppaviliondesktoppcs0
+
+- 
+   For payment  I click on  Make Payment. 
+- 
+  !python {model: pos.make.payment}: |
+    self.check(cr, uid, [ref("pos_make_payment_1")], {"lang": "en_US", "active_model":
+      "pos.order", "active_ids": [ref("pos_order_pos0")], "tz":
+      False, "active_id": ref("pos_order_pos0"), })    
+
+- 
+  Creating a pos.return record
+- 
+  !record {model: pos.return, id: pos_return_0}:
+   {}
+- 
+  To check the Return without Refund . I click button "Return without Refund ".
+-
+  The quantity which are selected in Return lines wizard are refunded..
+- 
+  !python {model: pos.return}: |
+    self.create_returns2(cr, uid, [ref("pos_return_0")], {"lang": "en_US", "active_model":
+      "pos.order", "active_ids": [ref("point_of_sale.pos_order_pos0")], "tz":
+      False, "active_id": ref("point_of_sale.pos_order_pos0"), })
diff --git a/addons/point_of_sale/wizard/pos_payment.py b/addons/point_of_sale/wizard/pos_payment.py
index f59d814522c..b20d3db8b5e 100644
--- a/addons/point_of_sale/wizard/pos_payment.py
+++ b/addons/point_of_sale/wizard/pos_payment.py
@@ -44,48 +44,50 @@ class pos_make_payment(osv.osv_memory):
         """
         res = super(pos_make_payment, self).default_get(cr, uid, fields, context=context)
         
-        active_id = context and context.get('active_id',False)  
-        j_obj = self.pool.get('account.journal')
-        company_id = self.pool.get('res.users').browse(cr,uid,uid).company_id.id
-        journal = j_obj.search(cr, uid, [('type', '=', 'cash'), ('company_id', '=', company_id)])
-        
-        if journal:
-            journal = journal[0]
-        else:
-            journal = None
-        wf_service = netsvc.LocalService("workflow")
-
-        order_obj=self.pool.get('pos.order')
-        order = order_obj.browse(cr, uid, active_id, context)
-        #get amount to pay
-        amount = order.amount_total - order.amount_paid
-        if amount <= 0.0:
-            context.update({'flag': True})
-            order_obj.action_paid(cr, uid, [active_id], context)
-        elif order.amount_paid > 0.0:
-            order_obj.write(cr, uid, [active_id], {'state': 'advance'})
-        invoice_wanted_checked = False
-    
-        current_date = time.strftime('%Y-%m-%d')
+        active_id = context and context.get('active_id',False) 
+        if active_id: 
+            j_obj = self.pool.get('account.journal')
+            company_id = self.pool.get('res.users').browse(cr,uid,uid).company_id.id
+            journal = j_obj.search(cr, uid, [('type', '=', 'cash'), ('company_id', '=', company_id)])
             
-        if 'journal' in fields:
-            res.update({'journal':journal})         
-        if 'amount' in fields:
-            res.update({'amount':amount})   
-        if 'invoice_wanted' in fields:
-            res.update({'invoice_wanted':invoice_wanted_checked})               
-        if 'payment_date' in fields:
-            res.update({'payment_date':current_date})
-        if 'payment_name'  in fields: 
-            res.update({'payment_name':'Payment'})    
+            if journal:
+                journal = journal[0]
+            else:
+                journal = None
+            wf_service = netsvc.LocalService("workflow")
+    
+            order_obj=self.pool.get('pos.order')
+            order = order_obj.browse(cr, uid, active_id, context)
+            #get amount to pay
+            amount = order.amount_total - order.amount_paid
+            if amount <= 0.0:
+                context.update({'flag': True})
+                order_obj.action_paid(cr, uid, [active_id], context)
+            elif order.amount_paid > 0.0:
+                order_obj.write(cr, uid, [active_id], {'state': 'advance'})
+            invoice_wanted_checked = False
+        
+            current_date = time.strftime('%Y-%m-%d')
+                
+            if 'journal' in fields:
+                res.update({'journal':journal})         
+            if 'amount' in fields:
+                res.update({'amount':amount})   
+            if 'invoice_wanted' in fields:
+                res.update({'invoice_wanted':invoice_wanted_checked})               
+            if 'payment_date' in fields:
+                res.update({'payment_date':current_date})
+            if 'payment_name'  in fields: 
+                res.update({'payment_name':'Payment'})    
         return res
         
     def view_init(self, cr, uid, fields_list, context=None):
         res = super(pos_make_payment, self).view_init(cr, uid, fields_list, context=context)
         active_id = context and context.get('active_id', False) or False        
-        order = self.pool.get('pos.order').browse(cr, uid, active_id)
-        if not order.lines:
-            raise osv.except_osv('Error!','No order lines defined for this sale ')
+        if active_id:
+            order = self.pool.get('pos.order').browse(cr, uid, active_id)
+            if not order.lines:
+                raise osv.except_osv('Error!','No order lines defined for this sale ')
         return True
     
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
diff --git a/addons/point_of_sale/wizard/pos_return.py b/addons/point_of_sale/wizard/pos_return.py
index 8d8669751ff..31d18ef09a5 100644
--- a/addons/point_of_sale/wizard/pos_return.py
+++ b/addons/point_of_sale/wizard/pos_return.py
@@ -167,10 +167,14 @@ class pos_return(osv.osv_memory):
                                                               'statement_ids':[],
                                                               'picking_id':[]})
                 for line in order_id.lines:
-                    if line.id  and (data['return%s' %line.id]!=0.0):
+                    if line.id  :
+                        try:
+                            qty= data['return%s' %line.id]
+                        except :
+                            qty= line.qty
                         new_move=stock_move_obj.create(cr, uid,{
-                            'product_qty': data['return%s' %line.id],
-                            'product_uos_qty': uom_obj._compute_qty(cr, uid,data['return%s' %line.id] ,line.product_id.uom_id.id),
+                            'product_qty': qty ,
+                            'product_uos_qty': uom_obj._compute_qty(cr, uid,qty ,line.product_id.uom_id.id),
                             'picking_id':new_picking,
                             'product_uom':line.product_id.uom_id.id,
                             'location_id':location_id,
@@ -179,7 +183,7 @@ class pos_return(osv.osv_memory):
                             'name':'%s (return)' %order_id.name,
                             'date':date_cur,
                             'date_planned':date_cur,})
-                        line_obj.copy(cr,uid,line.id,{'qty':-data['return%s' %line.id],
+                        line_obj.copy(cr,uid,line.id,{'qty':-qty  ,
                                                     'order_id': new_order,
                         })
                 order_obj.write(cr,uid, new_order, {'state':'done'})

From 3cb540be3962a3415db094e165af4c675201a94a Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 14 May 2010 15:02:50 +0530
Subject: [PATCH 32/82] [IMP] point_of_sale: improve the yml

bzr revid: sbh@tinyerp.com-20100514093250-g60bdqefpwp7bcsx
---
 addons/point_of_sale/test/pos_test.yml     | 19 +++++++++++++++++--
 addons/point_of_sale/wizard/pos_payment.py |  2 +-
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/addons/point_of_sale/test/pos_test.yml b/addons/point_of_sale/test/pos_test.yml
index 42bcc515ca4..b61de0613d4 100644
--- a/addons/point_of_sale/test/pos_test.yml
+++ b/addons/point_of_sale/test/pos_test.yml
@@ -335,6 +335,7 @@
         product_id: product_product_lgviewtysmart0
         qty: 10.0
         qty_rfd: 0.0
+    partner_id: base.res_partner_agrolait
     name: POS/001
     price_type: tax_excluded
     pricelist_id: product.list0
@@ -461,5 +462,19 @@
 - 
   !python {model: pos.return}: |
     self.create_returns2(cr, uid, [ref("pos_return_0")], {"lang": "en_US", "active_model":
-      "pos.order", "active_ids": [ref("point_of_sale.pos_order_pos0")], "tz":
-      False, "active_id": ref("point_of_sale.pos_order_pos0"), })
+      "pos.order", "active_ids": [ref("pos_order_pos0")], "tz":
+      False, "active_id": ref("pos_order_pos0"), })
+- 
+  Creating a pos.confirm record
+- 
+  !record {model: pos.confirm, id: pos_confirm_0}:
+    {}
+    
+- 
+ I have close this order
+- 
+  !python {model: pos.confirm}: |
+    self.action_confirm(cr, uid, [ref("pos_confirm_0")], {"lang": "en_US", "active_model":
+      "pos.order", "active_ids": [ref("pos_order_pos0")], "tz": False, "active_id": ref("pos_order_pos0"),
+      })
+    
diff --git a/addons/point_of_sale/wizard/pos_payment.py b/addons/point_of_sale/wizard/pos_payment.py
index b20d3db8b5e..d7cb3414814 100644
--- a/addons/point_of_sale/wizard/pos_payment.py
+++ b/addons/point_of_sale/wizard/pos_payment.py
@@ -112,7 +112,7 @@ class pos_make_payment(osv.osv_memory):
                  
         order = self.pool.get('pos.order').browse(cr, uid, active_id)
         if order.amount_total == order.amount_paid:
-            res['arch'] = """ <form string="Make Payment" colspan="4">
+            result['arch'] = """ <form string="Make Payment" colspan="4">
                             <group col="2" colspan="2">
                                 <label string="Do you want to print the Receipt?" colspan="4"/>
                                 <separator colspan="4"/>

From 68f36bc5985065abd866738c1a97539d0891f2f6 Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Fri, 14 May 2010 17:50:18 +0530
Subject: [PATCH 33/82] [IMP] purchase : renamed wizard-Control Invoices of
 Lines to Invoice to Create Invoices

bzr revid: mtr@mtr-20100514122018-oj7w3mhjr4dv4byp
---
 addons/purchase/wizard/purchase_line_invoice_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/purchase/wizard/purchase_line_invoice_view.xml b/addons/purchase/wizard/purchase_line_invoice_view.xml
index c5855e5d448..57f4ebce8e5 100644
--- a/addons/purchase/wizard/purchase_line_invoice_view.xml
+++ b/addons/purchase/wizard/purchase_line_invoice_view.xml
@@ -5,7 +5,7 @@
         <!--  Make the invoice-->
         
 		<record id="view_purchase_line_invoice" model="ir.ui.view">
-            <field name="name">Control invoices</field>
+            <field name="name">Create invoices</field>
             <field name="model">purchase.order.line_invoice</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
@@ -21,7 +21,7 @@
             </field>
         </record>
 
-	<act_window name="Control invoices"		    
+	<act_window name="Create invoices"		    
 		    res_model="purchase.order.line_invoice"
 		    src_model="purchase.order.line"
 		    view_mode="form"

From b478dd983d8aa026bd5314d718c6eb9cd875f920 Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Fri, 14 May 2010 18:14:50 +0530
Subject: [PATCH 34/82] [ADD] purchase: Added yaml for purchase orders

bzr revid: mtr@mtr-20100514124450-6wzlnle6z5gjhrlf
---
 addons/purchase/__openerp__.py                |   5 +
 addons/purchase/test/purchase_from_manual.yml | 148 +++++++++++++++
 addons/purchase/test/purchase_from_order.yml  | 154 ++++++++++++++++
 .../purchase/test/purchase_from_picking.yml   | 174 ++++++++++++++++++
 4 files changed, 481 insertions(+)
 create mode 100644 addons/purchase/test/purchase_from_manual.yml
 create mode 100644 addons/purchase/test/purchase_from_order.yml
 create mode 100644 addons/purchase/test/purchase_from_picking.yml

diff --git a/addons/purchase/__openerp__.py b/addons/purchase/__openerp__.py
index 909b785fe72..553d0342f7a 100644
--- a/addons/purchase/__openerp__.py
+++ b/addons/purchase/__openerp__.py
@@ -52,6 +52,11 @@
         'report/purchase_report_view.xml',
     ],
     'demo_xml': ['purchase_demo.xml'],
+    'test': [
+             'test/purchase_from_order.yml',
+             'test/purchase_from_manual.yml',
+#             'test/purchase_from_picking.yml',
+    ],
     'installable': True,
     'active': False,
     'certificate': '0057234283549',
diff --git a/addons/purchase/test/purchase_from_manual.yml b/addons/purchase/test/purchase_from_manual.yml
new file mode 100644
index 00000000000..e0b1a8b806c
--- /dev/null
+++ b/addons/purchase/test/purchase_from_manual.yml
@@ -0,0 +1,148 @@
+-
+ In order to test the purchase flow,I start by creating a new product 'iPod'
+-
+ !record {model: product.product, id: product_product_ipod0}:
+    categ_id: 'product.product_category_3'
+    cost_method: standard
+    mes_type: fixed
+    name: iPod
+    price_margin: 2.0
+    procure_method: make_to_stock
+    property_stock_inventory: stock.location_inventory
+    property_stock_procurement: stock.location_procurement
+    property_stock_production: stock.location_production
+    seller_delay: '1'
+    standard_price: 100.0
+    supply_method: buy
+    type: product
+    uom_id: product.product_uom_unit
+    uom_po_id: product.product_uom_unit
+    volume: 0.0
+    warranty: 0.0
+    weight: 0.0
+    weight_net: 0.0
+- 
+ In order to test the purchase flow,I create a new record where "invoice_method" is From Manual
+-
+ Creating an purchase.order record
+- 
+  !record {model: purchase.order, id: purchase_order_po1}:
+    company_id: base.main_company
+    date_order: '2010-05-11'
+    invoice_method: order
+    location_id: stock.stock_location_stock
+    name: PO00010
+    order_line:
+      - date_planned: '2010-05-13'
+        name: iPod
+        price_unit: 100.0
+        product_id: 'product_product_ipod0'
+        product_qty: 10.0
+        product_uom: product.product_uom_unit
+        state: draft
+    partner_address_id: base.res_partner_address_7
+    partner_id: base.res_partner_4
+    pricelist_id: purchase.list0
+-
+ Initially purchase order is in the draft state
+-
+  !assert {model: purchase.order, id: purchase_order_po1}:
+    - state == 'draft'  
+-
+ Then an order is confirmed by clicking on the "Confirm Purchase Order" button
+-
+  !python {model: purchase.order}: |
+    self.wkf_confirm_order(cr, uid, [ref("purchase_order_po1")])  
+-
+ Performing a workflow action purchase_confirm on module purchase.order
+-
+  !workflow {model: purchase.order, action: purchase_confirm, ref: purchase_order_po1}
+-  
+ I check that the order which was initially in the draft state has transit to confirm state.
+-
+  !assert {model: purchase.order, id: purchase_order_po1}:
+    - state == 'confirmed'  
+-
+ I check that an entry gets created in the "Lines to Invoice" of Invoice Control on the basis of purchase order line
+-
+  !python {model: purchase.order}: |
+    from tools.translate import _
+    pur_order_obj=self.browse(cr, uid, ref("purchase_order_po1"))
+    pur_line=self.pool.get( 'purchase.order.line')
+    search_ids=pur_line.search(cr, uid, [('order_id', '=', pur_order_obj.name) ])
+    assert search_ids, _('Purchase order line is not created!')
+-
+ To check that wizard "Create Invoices" gets opened
+- 
+ Creating a purchase.order.line_invoice record
+-
+  !record {model: purchase.order.line_invoice, id: purchase_order_line_invoice_0}:
+    {}
+-
+ Performing an osv_memory action makeInvoices on module purchase.order.line_invoice
+-
+  !python {model: purchase.order.line_invoice}: |
+    pur_obj=self.pool.get('purchase.order')  
+    ids = []
+    pur_id1=pur_obj.browse(cr, uid, ref("purchase_order_po1"))
+    for line in pur_id1.order_line:
+        ids.append(line.id)
+    self.makeInvoices(cr, uid, [1], context={'active_ids': ids})
+-
+ I check that invoice gets created
+-
+  !python {model: purchase.order}: |
+    from tools.translate import _
+    pur_order_obj=self.browse(cr, uid, ref("purchase_order_po1"))
+    pur_line=self.pool.get( 'purchase.order.line')
+    search_ids=pur_line.search(cr, uid, [('order_id', '=', pur_order_obj.name),('invoiced', '=', '1') ])
+    assert search_ids, _('Invoice is not created!')
+-
+ I check that a record gets created in the Pending Invoices
+-
+  !python {model: purchase.order}: |
+    from tools.translate import _
+    pur_id1=self.browse(cr, uid, ref("purchase_order_po1"))
+    account_obj = self.pool.get('account.invoice')
+    ids = account_obj.search(cr, uid, [('origin', '=', pur_id1.name)])
+    assert ids, _('Pending Invoice is not created!')
+-
+ Then an order is approved by clicking on the "Approved by Supplier" button
+-
+  !python {model: purchase.order}: |
+    self.wkf_approve_order(cr, uid, [ref("purchase_order_po1")]) 
+-
+ Performing a workflow action purchase_approve on module purchase.order
+-
+  !workflow {model: purchase.order, action: purchase_approve, ref: purchase_order_po1}
+-
+ I check that the order which was initially in the confirmed state has transit to approved state.
+-
+  !assert {model: purchase.order, id: purchase_order_po1}:
+    - state == 'approved' 
+-
+ I check that date_approve field of Delivery&Invoices gets bind with the date on which it has been approved 
+-
+  !python {model: purchase.order}: |
+    pur_id=self.browse(cr, uid, ref("purchase_order_po1"))
+    assert(pur_id.date_approve)
+-
+ I check that an entry gets created in the stock.picking 
+-
+  !python {model: purchase.order}: |
+    pur_id=self.browse(cr, uid, ref("purchase_order_po1"))
+    assert(pur_id.picking_ids)
+-
+ I check that an entry gets created in the stock.move
+-
+  !python {model: purchase.order}: |
+    from tools.translate import _
+    pur_id1=self.browse(cr, uid, ref("purchase_order_po1"))
+    picking_obj = self.pool.get('stock.picking')
+    ids = picking_obj.search(cr, uid, [('origin', '=', pur_id1.name)])
+    pick_id = picking_obj.browse(cr, uid, ids)[0]
+    move_obj = self.pool.get('stock.move')
+    search_id = move_obj.search(cr, uid, [('picking_id', '=', pick_id.name)])
+    assert search_id, _('No Incoming Product!')
+-
+ I check that Traceability moves are created
diff --git a/addons/purchase/test/purchase_from_order.yml b/addons/purchase/test/purchase_from_order.yml
new file mode 100644
index 00000000000..3e83fc7dfda
--- /dev/null
+++ b/addons/purchase/test/purchase_from_order.yml
@@ -0,0 +1,154 @@
+-
+ In order to test the purchase flow,I start by creating a new product 'iPod'
+-
+ !record {model: product.product, id: product_product_ipod0}:
+    categ_id: 'product.product_category_3'
+    cost_method: standard
+    mes_type: fixed
+    name: iPod
+    price_margin: 2.0
+    procure_method: make_to_stock
+    property_stock_inventory: stock.location_inventory
+    property_stock_procurement: stock.location_procurement
+    property_stock_production: stock.location_production
+    seller_delay: '1'
+    standard_price: 100.0
+    supply_method: buy
+    type: product
+    uom_id: product.product_uom_unit
+    uom_po_id: product.product_uom_unit
+    volume: 0.0
+    warranty: 0.0
+    weight: 0.0
+    weight_net: 0.0
+-
+ In order to test the purchase flow,I create a new record where "invoice_method" is From Order
+- 
+ Creating a purchase.order record
+- 
+  !record {model: purchase.order, id: purchase_order_po0}:
+    company_id: base.main_company
+    date_order: '2010-05-11'
+    invoice_method: order
+    location_id: stock.stock_location_stock
+    name: PO00003
+    order_line:
+      - date_planned: '2010-05-13'
+        name: iPod
+        price_unit: 100.0
+        product_id: 'product_product_ipod0'
+        product_qty: 10.0
+        product_uom: product.product_uom_unit
+        state: draft
+    partner_address_id: base.res_partner_address_7
+    partner_id: base.res_partner_4
+    pricelist_id: purchase.list0
+- 
+ Initially purchase order is in the draft state
+-
+  !assert {model: purchase.order, id: purchase_order_po0}:
+    - state == 'draft'  
+-
+  Then an order is confirmed by clicking on the "Confirm Purchase Order" button  
+-
+  !python {model: purchase.order}: |
+    self.wkf_confirm_order(cr, uid, [ref("purchase_order_po0")])  
+-
+ Performing a workflow action purchase_confirm on module purchase.order
+-
+  !workflow {model: purchase.order, action: purchase_confirm, ref: purchase_order_po0}
+-  
+ I check that the order which was initially in the draft state has transit to confirm state.
+-
+  !assert {model: purchase.order, id: purchase_order_po0}:
+    - state == 'confirmed'  
+-
+ I check that an entry gets created in the "Lines to Invoice" of Invoice Control on the basis of purchase order line
+-
+  !python {model: purchase.order}: |
+    from tools.translate import _
+    pur_order_obj=self.browse(cr, uid, ref("purchase_order_po0"))
+    pur_line=self.pool.get( 'purchase.order.line')
+    search_ids=pur_line.search(cr, uid, [('order_id', '=', pur_order_obj.name) ])
+    assert search_ids, _('Purchase order line is not created!')
+-
+ To check that wizard "Create Invoices" gets called
+-
+  Creating a purchase.order.line_invoice record
+-
+  !record {model: purchase.order.line_invoice, id: purchase_order_line_invoice_0}:
+    {}
+-
+ Performing an osv_memory action makeInvoices on module purchase.order.line_invoice
+-
+  !python {model: purchase.order.line_invoice}: |
+    pur_obj=self.pool.get('purchase.order')  
+    ids = []
+    pur_id1=pur_obj.browse(cr, uid, ref("purchase_order_po0"))
+    for line in pur_id1.order_line:
+        ids.append(line.id)
+    self.makeInvoices(cr, uid, [1], context={'active_ids': ids})
+-
+ I check that invoice gets created
+-
+  !python {model: purchase.order}: |
+    from tools.translate import _
+    pur_order_obj=self.browse(cr, uid, ref("purchase_order_po0"))
+    pur_line=self.pool.get( 'purchase.order.line')
+    search_ids=pur_line.search(cr, uid, [('order_id', '=', pur_order_obj.name),('invoiced', '=', '1') ])
+    assert search_ids, _('Invoice is not created!')
+-
+ I check that a record gets created in the Pending Invoices
+-
+  !python {model: purchase.order}: |
+    from tools.translate import _
+    pur_id1=self.browse(cr, uid, ref("purchase_order_po0"))
+    account_obj = self.pool.get('account.invoice')
+    ids = account_obj.search(cr, uid, [('origin', '=', pur_id1.name)])
+    assert ids, _('Pending Invoice is not created!')
+-
+ Then an order is approved by clicking on the "Approved by Supplier" button
+-
+    !python {model: purchase.order}: |
+        self.wkf_approve_order(cr, uid, [ref("purchase_order_po0")]) 
+-
+ Performing a workflow action purchase_approve on module purchase.order
+-
+  !workflow {model: purchase.order, action: purchase_approve, ref: purchase_order_po0}
+-
+ I check that the order which was initially in the confirmed state has transit to approved state.
+-
+  !assert {model: purchase.order, id: purchase_order_po0}:
+    - state == 'approved' 
+-
+ I check that date_approve field of Delivery&Invoices gets bind with the date on which it has been approved 
+-
+  !python {model: purchase.order}: |
+    pur_id=self.browse(cr, uid, ref("purchase_order_po0"))
+    assert(pur_id.date_approve)
+-
+ I check that an entry gets created in the stock.picking 
+-
+  !python {model: purchase.order}: |
+    pur_id=self.browse(cr, uid, ref("purchase_order_po0"))
+    assert(pur_id.picking_ids)
+-
+ I check that an entry gets created in the stock.move
+-
+  !python {model: purchase.order}: |
+    from tools.translate import _
+    pur_id1=self.browse(cr, uid, ref("purchase_order_po0"))
+    picking_obj = self.pool.get('stock.picking')
+    ids = picking_obj.search(cr, uid, [('origin', '=', pur_id1.name)])
+    pick_id = picking_obj.browse(cr, uid, ids)[0]
+    move_obj = self.pool.get('stock.move')
+    search_id = move_obj.search(cr, uid, [('picking_id', '=', pick_id.name)])
+    assert search_id, _('No Incoming Product!')
+-
+ I check that Traceability moves are created
+-
+ I check that an invoice_id field of Delivery&Invoices gets bind with the value  
+-
+  !python {model: purchase.order}: |
+    pur_id2=self.browse(cr, uid, ref("purchase_order_po0"))
+    assert(pur_id2.invoice_id)
diff --git a/addons/purchase/test/purchase_from_picking.yml b/addons/purchase/test/purchase_from_picking.yml
new file mode 100644
index 00000000000..f4e9628985d
--- /dev/null
+++ b/addons/purchase/test/purchase_from_picking.yml
@@ -0,0 +1,174 @@
+-
+ In order to test the purchase flow,I start by creating a new product 'iPod'
+-
+ !record {model: product.product, id: product_product_ipod0}:
+    categ_id: 'product.product_category_3'
+    cost_method: standard
+    mes_type: fixed
+    name: iPod
+    price_margin: 2.0
+    procure_method: make_to_stock
+    property_stock_inventory: stock.location_inventory
+    property_stock_procurement: stock.location_procurement
+    property_stock_production: stock.location_production
+    seller_delay: '1'
+    standard_price: 100.0
+    supply_method: buy
+    type: product
+    uom_id: product.product_uom_unit
+    uom_po_id: product.product_uom_unit
+    volume: 0.0
+    warranty: 0.0
+    weight: 0.0
+    weight_net: 0.0
+- 
+ In order to test the purchase flow,I create a new record where "invoice_method" is From Picking
+-
+  Creating an purchase.order record
+- 
+  !record {model: purchase.order, id: purchase_order_po2}:
+    company_id: base.main_company
+    date_order: '2010-05-11'
+    invoice_method: picking
+    location_id: stock.stock_location_stock
+    name: PO00008
+    order_line:
+      - date_planned: '2010-05-13'
+        name: iPod
+        price_unit: 100.0
+        product_id: 'product_product_ipod0'
+        product_qty: 10.0
+        product_uom: product.product_uom_unit
+        state: draft
+    partner_address_id: base.res_partner_address_7
+    partner_id: base.res_partner_4
+    pricelist_id: purchase.list0
+-
+ Initially purchase order is in the draft state
+-
+  !assert {model: purchase.order, id: purchase_order_po2}:
+    - state == 'draft'  
+-
+ Then an order is confirmed by clicking on the "Confirm Purchase Order" button
+-
+  !python {model: purchase.order}: |
+    self.wkf_confirm_order(cr, uid, [ref("purchase_order_po2")]) 
+-
+ Performing a workflow action purchase_confirm on module purchase.order
+-
+  !workflow {model: purchase.order, action: purchase_confirm, ref: purchase_order_po2}
+-  
+ I check that the order which was initially in the draft state has transit to confirm state.
+-
+  !assert {model: purchase.order, id: purchase_order_po2}:
+    - state == 'confirmed'  
+-
+ I check that an entry gets created in the "Lines to Invoice" of Invoice Control on the basis of purchase order line
+-
+  !python {model: purchase.order}: |
+    from tools.translate import _
+    pur_order_obj=self.browse(cr, uid, ref("purchase_order_po2"))
+    pur_line=self.pool.get( 'purchase.order.line')
+    search_ids=pur_line.search(cr, uid, [('order_id', '=', pur_order_obj.name) ])
+    assert search_ids, _('Purchase order line is not created!')
+-
+ To check that wizard "Create Invoices" gets opened
+- 
+ Creating a purchase.order.line_invoice record
+-
+  !record {model: purchase.order.line_invoice, id: purchase_order_line_invoice_0}:
+    {}
+-
+ Performing an osv_memory action makeInvoices on module purchase.order.line_invoice
+-
+  !python {model: purchase.order.line_invoice}: |
+    pur_obj=self.pool.get('purchase.order')  
+    ids = []
+    pur_id1=pur_obj.browse(cr, uid, ref("purchase_order_po2"))
+    for line in pur_id1.order_line:
+        ids.append(line.id)
+    self.makeInvoices(cr, uid, [1], context={'active_ids': ids})
+-
+ I check that invoice gets created
+-
+  !python {model: purchase.order}: |
+    from tools.translate import _
+    pur_order_obj=self.browse(cr, uid, ref("purchase_order_po2"))
+    pur_line=self.pool.get( 'purchase.order.line')
+    search_ids=pur_line.search(cr, uid, [('order_id', '=', pur_order_obj.name),('invoiced', '=', '1') ])
+    assert search_ids, _('Invoice is not created!')
+-
+ I check that a record gets created in the Pending Invoices
+-
+  !python {model: purchase.order}: |
+    from tools.translate import _
+    pur_id1=self.browse(cr, uid, ref("purchase_order_po2"))
+    account_obj = self.pool.get('account.invoice')
+    ids = account_obj.search(cr, uid, [('origin', '=', pur_id1.name)])
+    assert ids, _('Pending Invoice is not created!')
+-
+ Then an order is approved by clicking on the "Approved by Supplier" button
+-
+    !python {model: purchase.order}: |
+        self.wkf_approve_order(cr, uid, [ref("purchase_order_po2")]) 
+-
+ Performing a workflow action purchase_approve on module purchase.order
+-
+  !workflow {model: purchase.order, action: purchase_approve, ref: purchase_order_po2}
+-
+ I check that the order which was initially in the confirmed state has transit to approved state.
+-
+  !assert {model: purchase.order, id: purchase_order_po2}:
+    - state == 'approved' 
+-
+ I check that date_approve field of Delivery&Invoices gets bind with the date on which it has been approved 
+-
+  !python {model: purchase.order}: |
+    pur_id=self.browse(cr, uid, ref("purchase_order_po2"))
+    assert(pur_id.date_approve)
+-
+ I check that an entry gets created in the stock.picking 
+-
+  !python {model: purchase.order}: |
+    pur_id=self.browse(cr, uid, ref("purchase_order_po2"))
+    assert(pur_id.picking_ids)
+-
+ I check that an entry gets created in the stock.move
+-
+  !python {model: purchase.order}: |
+    from tools.translate import _
+    pur_id1=self.browse(cr, uid, ref("purchase_order_po2"))
+    picking_obj = self.pool.get('stock.picking')
+    ids = picking_obj.search(cr, uid, [('origin', '=', pur_id1.name)])
+    pick_id = picking_obj.browse(cr, uid, ids)[0]
+    move_obj = self.pool.get('stock.move')
+    search_id = move_obj.search(cr, uid, [('picking_id', '=', pick_id.name)])
+    assert search_id, _('No Incoming Product!')
+-
+ I check that Traceability moves are created
+-
+ Then I create an invoice from picking by clicking on "Create Invoice" wizard 
+- 
+ Creating a stock.invoice.onshipping record
+- 
+  !record {model: stock.invoice.onshipping, id: stock_invoice_onshipping_0}:
+    invoice_date: '2010-05-11'
+    journal_id: account.bank_journal
+    type: in_invoice
+- 
+ Performing an osv_memory action create_invoice on module stock.invoice.onshipping
+- 
+  !python {model: stock.invoice.onshipping}: |
+    pur_obj=self.pool.get('purchase.order')  
+    pur_id1=pur_obj.browse(cr, uid, ref("purchase_order_po2"))
+    picking_obj = self.pool.get('stock.picking')
+    ids = picking_obj.search(cr, uid, [('origin', '=', pur_id1.name)])
+    self.create_invoice(cr, uid, [ref("stock_invoice_onshipping_0")], {"lang": "en_US",
+      "tz": False, "search_default_approved": 1, "active_model": "stock.picking",
+      "active_ids": ids, "active_id": ids[0], })
+-
+ I check that an invoice_id field of Delivery&Invoices gets bind with the value  
+-
+  !python {model: purchase.order}: |
+    pur_id2=self.browse(cr, uid, ref("purchase_order_po2"))
+    assert(pur_id2.invoice_id)

From 1399bb0b2b8b7ff304df75954bdbafe3d9a45f62 Mon Sep 17 00:00:00 2001
From: mso <mso@mso>
Date: Fri, 14 May 2010 18:57:05 +0530
Subject: [PATCH 35/82] [IMP] stock: Task id 596 reporting stock move

bzr revid: mso@mso-20100514132705-9du8yhfm1zjh7qgh
---
 addons/stock/report/report_stock_move.py      | 36 +++++++++++--------
 .../stock/report/report_stock_move_view.xml   | 30 +++++++++++-----
 2 files changed, 44 insertions(+), 22 deletions(-)

diff --git a/addons/stock/report/report_stock_move.py b/addons/stock/report/report_stock_move.py
index 09fcff39eb0..11d855e63d9 100755
--- a/addons/stock/report/report_stock_move.py
+++ b/addons/stock/report/report_stock_move.py
@@ -28,16 +28,18 @@ class report_stock_move(osv.osv):
     _description = "Stock Statistics"
     _auto = False
     _columns = {
-        'date': fields.date('Date', readonly=True),
+        'date_planned': fields.date('Date', readonly=True),
         'year': fields.char('Year', size=4, readonly=True),
         'day': fields.char('Day', size=128, 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),
+        'partner_id':fields.many2one('res.partner', 'Partner', readonly=True),
         'product_id':fields.many2one('product.product', 'Product', readonly=True),
         'location_id': fields.many2one('stock.location', 'Source Location', readonly=True, select=True, help="Sets a location if you produce at a fixed location. This can be a partner location if you subcontract the manufacturing operations."),
         'location_dest_id': fields.many2one('stock.location', 'Dest. Location', readonly=True, select=True, help="Location where the system will stock the finished products."),
         'product_qty':fields.integer('Qty',readonly=True),
+        'value' : fields.float('Total Value', required=True),
         'product_uom': fields.many2one('product.uom', 'Product UOM', readonly=True),
         'state': fields.selection([('draft', 'Draft'), ('waiting', 'Waiting'), ('confirmed', 'Confirmed'), ('assigned', 'Available'), ('done', 'Done'), ('cancel', 'Cancelled')], 'State', readonly=True, select=True,
                                   help='When the stock move is created it is in the \'Draft\' state.\n After that it is set to \'Confirmed\' state.\n If stock is available state is set to \'Avaiable\'.\n When the picking it done the state is \'Done\'.\
@@ -49,18 +51,24 @@ class report_stock_move(osv.osv):
         tools.drop_view_if_exists(cr, 'report_stock_move')
         cr.execute("""
             create or replace view report_stock_move as (
-                select min(m.id) as id,
-                m.date as date,
-                to_char(date_trunc('day',m.date), 'YYYY') as year,
-                to_char(date_trunc('day',m.date), 'MM') as month,
-                to_char(date_trunc('day',m.date), 'YYYY-MM-DD') as day,
-                m.location_id as location_id,
-                m.location_dest_id as location_dest_id,
-                m.product_id as product_id,
-                m.state as state,
-                m.product_uom as product_uom,
-                sum(m.product_qty) as product_qty
-                from stock_move as m group by m.id, m.product_id, m.location_id, m.location_dest_id, m.date, m.state, m.product_uom
-            )
+               select min(m.id) as id,
+                    m.date_planned as date_planned,
+                    to_char(date_trunc('day',m.date_planned), 'YYYY') as year,
+                    to_char(date_trunc('day',m.date_planned), 'MM') as month,
+                    to_char(date_trunc('day',m.date_planned), 'YYYY-MM-DD') as day,
+                    m.address_id as partner_id,
+                    m.location_id as location_id,
+                    m.location_dest_id as location_dest_id,
+                    m.product_id as product_id,
+                    m.state as state,
+                    m.product_uom as product_uom,
+                    sum(m.product_qty) as product_qty,
+                    pt.standard_price * sum(m.product_qty) as value
+               from stock_move m ,product_product pp,product_template pt
+               where 
+                    m.product_id=pp.id and pp.product_tmpl_id=pt.id
+               group by 
+                    m.id, m.product_id,m.address_id, m.location_id, m.location_dest_id,
+                    m.date_planned, m.state, m.product_uom,pt.standard_price     )      
         """)
 report_stock_move()
diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index dfe40a9b254..8a72f5182d8 100755
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -7,16 +7,18 @@
         <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Stock Orders Statistics">
-                <field name="date"/>
+                <field name="date_planned"/>
                 <field name="year" invisible="1" />
                 <field name="month" invisible="1"/>
                 <field name="day" invisible="1"/>
                 <field name="location_id" invisible="1"/>
                 <field name="location_dest_id" invisible="1"/>
                 <field name="product_id"/>
+                <field name="partner_id"/>
                 <field name="product_qty"/>
                 <field name="product_uom"/>
                 <field name="state"/>
+                <field name="value"/>
                 
            </tree>
         </field>
@@ -46,13 +48,14 @@
                     domain="[('year','=',time.strftime('%%Y'))]"
                     help="Stock Moves of the year"/>
                 <filter icon="terp-stock"
+                 	name="month"
                     string="This Month"
                     domain="[('month','=',time.strftime('%%m'))]"
                     help="Stock Moves of this month"/>
 	            <filter icon="terp-stock"
                     string="Today"
                     separator="1"
-                    domain="[('date', '=', time.strftime('%%Y-%%m-%%d')]"
+                    domain="[('date_planned','&gt;=', time.strftime('%%Y-%%m-%%d')), ('date_planned','&lt;',(datetime.date.today()-datetime.timedelta(days=1)).strftime('%%Y-%%m-%%d'))]"
                     help="Stock Moves of today"/>
                 <separator orientation="vertical"/>
 
@@ -67,24 +70,35 @@
                     	help = "Available Stock-Moves"/>
 
                 <filter string="Done"
+                		name="done"
                     	icon="terp-stock"
                     	domain="[('state','=','done')]"
                     	help = "Completed Stock-Moves"/>
-                
-                <separator orientation="vertical"/>                                        
+                    	
+                <separator orientation="vertical"/>
+                <filter icon="terp-stock" string="Internal Locations" domain="[('location_id.usage','=','internal')]"/>
+                <filter icon="terp-stock" string="Scrap Locations" domain="[('location_id.scrap_location','=',1)]"/>
+                <separator orientation="vertical"/>
                 <field name="product_id"/>
+                </group>
+                <newline/>
+                
+                <group expand="0" string="Extended options..." colspan="10" col="12">
                 <field name="location_id" widget = "selection"/>
                 <field name="location_dest_id"  widget = "selection"/>
+                <field name="date_planned"/>
                 </group>
                 <newline/>
                 <group expand="1" string="Group By..." >
-                    <filter string="Product" icon="terp-stock" context="{'group_by':'product_id'}"/>
-                    <filter string="Source Location" icon="terp-stock" context="{'group_by':'location_id'}"/>
+             		<filter string="Partner" name="Partner" icon="terp-stock" domain="[]" context="{'group_by':'partner_id'}"/>
+                    <filter name="product" string="Product" icon="terp-stock" context="{'group_by':'product_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter name="src_location" string="Source Location" icon="terp-stock" context="{'group_by':'location_id'}"/>
                     <filter string="Dest. Location" icon="terp-stock"  context="{'group_by':'location_dest_id'}"/>
                     <filter string="State" icon="terp-stock" context="{'group_by':'state'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Day" icon="terp-stock" context="{'group_by':'day'}"/>
-                    <filter string="Month" icon="terp-stock" context="{'group_by':'date'}"/>
+                    <filter string="Month" icon="terp-stock" context="{'group_by':'date_planned'}"/>
                     <filter string="Year" icon="terp-stock" context="{'group_by':'year'}"/>
                 </group>
             </search>
@@ -97,7 +111,7 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
  		<field name="search_view_id"  ref="view_stock_search"/>
- 	
+ 		<field name="context">{'search_default_product':1, 'search_default_src_location':1,'search_default_done':1,'group_by':[]}</field>
     </record>
 
 	<menuitem

From 1aab606b169bccf4852dd02d054ec64787b09266 Mon Sep 17 00:00:00 2001
From: mso <mso@mso>
Date: Fri, 14 May 2010 19:56:15 +0530
Subject: [PATCH 36/82] [Fix] Changes in yml, Need Fixing

bzr revid: mso@mso-20100514142615-72udcsxrfjv6tkkk
---
 addons/sale/__openerp__.py              |  7 ++++++-
 addons/sale/test/prepaid_sale_order.yml | 17 ++++++++---------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/addons/sale/__openerp__.py b/addons/sale/__openerp__.py
index 1e4a674dd4c..9be6711a0a8 100644
--- a/addons/sale/__openerp__.py
+++ b/addons/sale/__openerp__.py
@@ -60,7 +60,12 @@
 #        'process/sale_process.xml',
     ],
     'demo_xml': ['sale_demo.xml'],
-    'test': ['test/sale_procurement.yml'],
+    'test': [
+             'test/shipping_manual_sale_order.yml',
+#             'test/prepaid_sale_order.yml',
+             'test/advance_invoice.yml',
+             'test/sale_procurement.yml',
+            ],
     'installable': True,
     'active': False,
     'certificate': '0058103601429',
diff --git a/addons/sale/test/prepaid_sale_order.yml b/addons/sale/test/prepaid_sale_order.yml
index e2aa34c8263..d3299507bb2 100644
--- a/addons/sale/test/prepaid_sale_order.yml
+++ b/addons/sale/test/prepaid_sale_order.yml
@@ -326,12 +326,6 @@
     invoice_ids = so.invoice_ids
     for invoice in invoice_ids:
       wf_service.trg_validate(uid, 'account.invoice',invoice.id,'invoice_open', cr) 
--
-  I will verify the picking associated with the sale order sale_order_so0
-- 
-  !python {model: sale.order}: |
-    so = self.browse(cr, uid, ref("sale_order_so0"))
-    assert so.picking_ids,"Picking has not been generated for sale_order_so0"
 -
   Creating a account.invoice.pay record
 - 
@@ -370,7 +364,7 @@
     so = sale_order_obj.browse(cr, uid, ref("sale_order_so0"))   
     self.pay_and_reconcile_writeoff(cr, uid, [ref("account_invoice_pay_writeoff_0")],
       {"lang": 'en_US', "tz": False, "active_model": 'account.invoice', "active_ids":
-      [so.invoice_ids[0].id], "type": "out_invoice", "active_id": so.invoice_ids[0].id, })
+      [so.invoice_ids[0].id], "type": "out_invoice", "active_id": so.invoice_ids[0].id })
     
     
 -
@@ -384,7 +378,9 @@
 - 
   !python {model: stock.picking }: |
    import time
-   picking_id = self.search(cr, uid, [('origin','=','SO004'),('type','=','out')])
+   sale_order_obj = self.pool.get('sale.order')
+   so = sale_order_obj.browse(cr, uid, ref("sale_order_so0"))
+   picking_id = self.search(cr, uid, [('origin','=',so.name),('type','=','out')])
    if picking_id:
       pick=self.browse(cr,uid,picking_id[0])
       pick.force_assign(cr, uid)
@@ -399,12 +395,15 @@
           'product_qty': move.product_qty,
           'product_uom': move.product_uom.id,
       } 
+      print "=====>>>>>>",partial_datas
       self.do_partial(cr, uid, picking_id,partial_datas)
 -
   I verify that picking order is in done state
 -
   !python {model: stock.picking }: |
-   picking_id = self.search(cr, uid, [('origin','=','SO004'),('type','=','out')])
+   sale_order_obj = self.pool.get('sale.order')
+   so = sale_order_obj.browse(cr, uid, ref("sale_order_so0"))  
+   picking_id = self.search(cr, uid, [('origin','=',so.name),('type','=','out')])
    if picking_id:
      pick = self.browse(cr,uid,picking_id[0])
      assert (pick.state) =='done', "Picking for SO is not in done state."
\ No newline at end of file

From e955eac8b107f415ebbf67ccee05a9e9823b4837 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 14 May 2010 20:44:22 +0530
Subject: [PATCH 37/82] Task-Id 529 : Add the yml for stock_location

bzr revid: sbh@tinyerp.com-20100514151422-l63dx5x94lubzhwc
---
 addons/stock_location/__openerp__.py          |   1 +
 addons/stock_location/test/stock_location.yml | 271 ++++++++++++++++++
 2 files changed, 272 insertions(+)
 create mode 100644 addons/stock_location/test/stock_location.yml

diff --git a/addons/stock_location/__openerp__.py b/addons/stock_location/__openerp__.py
index 7dd4e3facb9..c71199cb74c 100644
--- a/addons/stock_location/__openerp__.py
+++ b/addons/stock_location/__openerp__.py
@@ -42,6 +42,7 @@ This module may be useful for different purposes:
     'update_xml': ['stock_view.xml', 'security/ir.model.access.csv'],
     'demo_xml': [],
     'installable': True,
+    'test':['test/stock_location.yml',],
     'active': False,
     'certificate': '0046505115101',
 }
diff --git a/addons/stock_location/test/stock_location.yml b/addons/stock_location/test/stock_location.yml
new file mode 100644
index 00000000000..8313da69bb9
--- /dev/null
+++ b/addons/stock_location/test/stock_location.yml
@@ -0,0 +1,271 @@
+
+-
+  In order to test the stock location module, I will create product,locations,
+  create physical inventory ,fill inventory lines,
+- 
+  Creating a account.account.type record
+- 
+  !record {model: account.account.type, id: account_account_type_asset0}:
+    close_method: balance
+    code: asset
+    name: Asset
+    sign: 1
+    
+
+- 
+  Creating a account.account.type record
+- 
+  !record {model: account.account.type, id: account_account_type_income0}:
+    close_method: unreconciled
+    code: income
+    name: Income
+    sign: 1
+    
+    
+- 
+  Creating a account.account.type record
+- 
+  !record {model: account.account.type, id: account_account_type_expense0}:
+    close_method: unreconciled
+    code: expense
+    name: Expense
+    sign: 1    
+- 
+  Creating a account.account.type record
+- 
+  !record {model: account.account.type, id: account_account_type_receivable0}:
+    close_method: balance
+    code: receivable
+    name: Receivable
+    sign: 1
+-
+ 
+  Creating a account.account record
+- 
+  !record {model: account.account, id: account_account_receivable0}:
+    code: '40000'
+    company_id: base.main_company
+    currency_mode: current
+    name: Receivable
+    parent_left: 1
+    parent_right: 2
+    type: receivable
+    user_type: account_account_type_receivable0
+- 
+  Creating a account.account record
+- 
+  !record {model: account.account, id: account_account_payable0}:
+    code: '440000'
+    company_id: base.main_company
+    currency_mode: current
+    name: Payable
+    parent_left: 3
+    parent_right: 4
+    type: payable
+    user_type: account_account_type_expense0    
+- 
+  Creating a account.journal record
+- 
+  !record {model: account.journal, id: account_journal_purchasejournal0}:
+    code: pur
+    company_id: base.main_company
+    name: Purchase Journal
+    sequence_id:  account.sequence_purchase_journal
+    type: purchase
+    view_id: account.account_journal_bank_view
+    
+- 
+  Creating a account.journal record
+- 
+  !record {model: account.journal, id: account_journal_salejouran0}:
+    code: sal
+    company_id: base.main_company
+    name: Sale Jouran
+    sequence_id: account.sequence_sale_journal
+    type: sale
+    view_id: account.account_journal_view
+    
+- 
+  Creating a account.account record
+- 
+  !record {model: account.account, id: account_account_expenseaccount0}:
+    code: Expe
+    company_id: base.main_company
+    currency_mode: current
+    name: Expense Account
+    parent_left: 5
+    parent_right: 6
+    type: consolidation
+    user_type: account_account_type_asset0
+- 
+  Creating a account.account record
+- 
+  !record {model: account.account, id: account_account_productsale0}:
+    code: '001'
+    company_id: base.main_company
+    currency_mode: current
+    name: Product Sale
+    type: other
+    user_type: account_account_type_income0
+
+- 
+  Creating a account.account record
+- 
+  !record {model: account.account, id: account_account_productpurchase0}:
+    code: '0002'
+    company_id: base.main_company
+    currency_mode: current
+    name: Product Purchase
+    type: other
+    user_type: account_account_type_expense0
+        
+- 
+  Creating a res.partner record
+- 
+  !record {model: res.partner, id: res_partner_shawtrust0}:
+    address:
+      - country_id: base.in    
+      - street: St James House, Vicar Lane, Sheffield
+    lang: en_US
+    name: 'Shaw Trust '
+    property_account_payable: account_account_payable0
+    property_account_receivable: account_account_receivable0
+-    
+  Creating a res.partner record
+- 
+  !record {model: res.partner, id: res_partner_diasorinltd0}:
+    address:
+      - country_id: base.in
+        street: Ash House, Ash Road
+    name: DiaSorin Ltd
+    supplier: true
+    
+        
+-
+  Creating a res.partner record
+- 
+  !record {model: res.partner, id: res_partner_microlinktechnologies0}:
+    address:
+      - street: Kailash Vaibhav, Parksite
+    name: Micro Link Technologies
+    property_account_payable: account_account_payable0
+    property_account_receivable: account_account_receivable0   
+    supplier: true        
+    
+-
+  Creating a res.partner.address record
+- 
+  !record {model: res.partner.address, id: res_partner_address_0}:
+    country_id: base.in
+    partner_id: res_partner_microlinktechnologies0
+    street: Ash House, Ash Road
+    title: Ms.
+    
+               
+-     
+  Creating a product.category record
+- 
+  !record {model: product.category, id: product_category_computer0}:
+    name: Computer
+-
+  Creating a stock.location record
+- 
+  !record {model: stock.location, id: stock_location_suppiler0}:
+    allocation_method: fifo
+    chained_auto_packing: auto
+    chained_delay: 15
+    chained_location_type: none
+    company_id: base.main_company
+    name: Suppiler1
+    usage: supplier
+- 
+
+  Creating a product.product record
+- 
+  !record {model: product.product, id: product_product_hpcdwriters0}:
+    categ_id: product_category_computer0
+    cost_method: standard
+    list_price: 1000.0
+    mes_type: fixed
+    name: HP CD writers
+    procure_method: make_to_stock
+    seller_ids:
+      - delay: 1
+        name: res_partner_shawtrust0
+        qty: 5.0
+    supply_method: buy
+    type: product
+    uom_id: product.product_uom_unit
+    uom_po_id: product.product_uom_unit
+    property_account_expense: account_account_productpurchase0
+    property_account_income: account_account_productsale0
+    path_ids:
+      - auto: auto
+        delay: 30
+        location_dest_id: stock.location_inventory
+        location_from_id: stock_location_suppiler0
+    pricelist_sale: 'Public Pricelist (0.00) : 1.00\n'
+    property_stock_inventory: stock.location_inventory
+    property_stock_procurement: stock.location_procurement
+    property_stock_production: stock.location_production
+-
+- 
+  Creating a stock.location record
+- 
+  !record {model: stock.location, id: stock_location_suppiler0}:
+    address_id: res_partner_address_0
+    allocation_method: fifo
+    chained_auto_packing: manual
+    chained_delay: 20
+    chained_location_type: none
+    company_id: base.main_company
+    name: Suppiler 1
+    usage: internal
+-
+ I  create warehouse 
+- 
+  !record {model: stock.warehouse, id: sale.shop}:
+    company_id: base.main_company
+    lot_input_id: stock.stock_location_stock
+    lot_output_id: stock_location.stock_location_suppiler0
+    lot_stock_id: stock_location.stock_location_suppiler0
+    name: OpenERP S.A.
+    partner_address_id: res_partner_address_0
+- 
+  !record {model: sale.order, id: sale_order_01}:
+    date_order: '2010-04-20'
+    invoice_quantity: order
+    name: Test/location
+    order_line:
+      - name: HP CD writers
+        price_unit: 1000.0
+        product_uom: product.product_uom_unit
+        product_uom_qty: 5.0
+        state: draft
+        'product_id': product_product_hpcdwriters0
+        'type': make_to_order
+    order_policy: manual
+    partner_id: base.res_partner_agrolait
+    partner_invoice_id: base.res_partner_address_8
+    partner_order_id: base.res_partner_address_8
+    partner_shipping_id: base.res_partner_address_8
+    picking_policy: direct
+    pricelist_id: product.list0
+    shop_id: sale.shop
+- 
+  I confirm the order
+- 
+  !workflow {model: sale.order, action: order_confirm, ref: sale_order_01}     
+-
+  I check the dealy in move 
+-  
+  !python {model: stock.move}: |
+    product_id=self.pool.get('product.product').search(cr,uid,[('name','=','HP CD writers')])
+    location_id=self.pool.get('stock.location').search(cr,uid,[('name','=','Inventory loss')])
+    move_ids =self.search(cr, uid, [('product_id','in',product_id),('location_dest_id','=',location_id)])
+    move_obj=self.browse(cr,uid,move_ids)[0]
+    import time
+    from_dt = time.mktime(time.strptime(move_obj.date,'%Y-%m-%d %H:%M:%S'))
+    to_dt = time.mktime(time.strptime(move_obj.date_planned,'%Y-%m-%d %H:%M:%S'))
+    diff_day = (to_dt-from_dt)/(3600*24)
+    assert (round(diff_day)+1 ==30)    

From 7e61fed118033ce77b61ccb7045ce44b7c7d4748 Mon Sep 17 00:00:00 2001
From: mso <mso@mso>
Date: Fri, 14 May 2010 21:55:17 +0530
Subject: [PATCH 38/82] [IMP] stock_location: yml dependent on sale module so
 commented in the test block

bzr revid: mso@mso-20100514162517-7wsf4fs38khtis4d
---
 addons/stock_location/__openerp__.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/stock_location/__openerp__.py b/addons/stock_location/__openerp__.py
index c71199cb74c..b13769b3458 100644
--- a/addons/stock_location/__openerp__.py
+++ b/addons/stock_location/__openerp__.py
@@ -42,7 +42,9 @@ This module may be useful for different purposes:
     'update_xml': ['stock_view.xml', 'security/ir.model.access.csv'],
     'demo_xml': [],
     'installable': True,
-    'test':['test/stock_location.yml',],
+    'test':[
+#            'test/stock_location.yml'
+            ],
     'active': False,
     'certificate': '0046505115101',
 }

From 7fb7116d03bdc1a129b4e60437157f0aee39ee83 Mon Sep 17 00:00:00 2001
From: mso <mso@mso>
Date: Mon, 17 May 2010 10:22:26 +0530
Subject: [PATCH 39/82] [IMP] sale: Few modification in YML files.

bzr revid: mso@mso-20100517045226-alu3n532rxw5cimo
---
 addons/sale/test/advance_invoice.yml          |  4 +--
 addons/sale/test/prepaid_sale_order.yml       | 33 +++++++++----------
 .../sale/test/shipping_manual_sale_order.yml  | 10 ++++--
 3 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/addons/sale/test/advance_invoice.yml b/addons/sale/test/advance_invoice.yml
index 28535b2872c..28855a02237 100644
--- a/addons/sale/test/advance_invoice.yml
+++ b/addons/sale/test/advance_invoice.yml
@@ -321,10 +321,10 @@
       "active_model": 'sale.order', "active_ids": [ref("sale_order_so0")], "tz":
       False, "active_id": ref("sale_order_so0"), })
 -
-  I will verify whether the invoice has been generated for SO since Shipping policy is 'Payment Before Delivery'
+  I will verify whether the invoice has been generated.
 -
   !python {model: sale.order}: |
     so = self.browse(cr, uid, ref("sale_order_so0"))
     assert so.invoice_ids, "Invoices has not been generated for sale_order_so0"    
     
-    
\ No newline at end of file
+    
diff --git a/addons/sale/test/prepaid_sale_order.yml b/addons/sale/test/prepaid_sale_order.yml
index d3299507bb2..4038e4be9b8 100644
--- a/addons/sale/test/prepaid_sale_order.yml
+++ b/addons/sale/test/prepaid_sale_order.yml
@@ -280,10 +280,10 @@
 -
   Creating a sale.order record
 - 
-  !record {model: sale.order, id: sale_order_so0}:
+  !record {model: sale.order, id: sale_order_so1}:
     date_order: '2010-05-03'
     invoice_quantity: order
-    name: SO004
+    name: SO001
     order_line:
       - name: LG Viewty Smart
         price_unit: 170.0
@@ -308,19 +308,19 @@
 - 
   Performing a workflow action order_confirm on module sale.order
 - 
-  !workflow {model: sale.order, action: order_confirm, ref: sale_order_so0}
+  !workflow {model: sale.order, action: order_confirm, ref: sale_order_so1}
 -
   I will verify whether the invoice has been generated for SO since Shipping policy is 'Payment Before Delivery'
 -
   !python {model: sale.order}: |
-    so = self.browse(cr, uid, ref("sale_order_so0"))
-    assert so.invoice_ids, "Invoices has not been generated for sale_order_so0"
+    so = self.browse(cr, uid, ref("sale_order_so1"))
+    assert so.invoice_ids, "Invoices has not been generated for sale_order_so1"
 - 
   Performing a workflow action invoice_open on module account.invoice
 - 
   !python {model: account.invoice}: |
     sale_order_obj = self.pool.get('sale.order')
-    so = sale_order_obj.browse(cr, uid, ref("sale_order_so0"))
+    so = sale_order_obj.browse(cr, uid, ref("sale_order_so1"))
     import netsvc
     wf_service = netsvc.LocalService("workflow")  
     invoice_ids = so.invoice_ids
@@ -329,7 +329,7 @@
 -
   Creating a account.invoice.pay record
 - 
-  !record {model: account.invoice.pay, id: account_invoice_pay_tst0}:
+  !record {model: account.invoice.pay, id: account_invoice_pay_tst1}:
     amount: 85000.0
     date: '2010-05-10'
     journal_id: sale.account_journal_bankjournal0
@@ -340,8 +340,8 @@
 - 
   !python {model: account.invoice.pay}: |
     sale_order_obj = self.pool.get('sale.order')
-    so = sale_order_obj.browse(cr, uid, ref("sale_order_so0"))  
-    self.wo_check(cr, uid, [ref("account_invoice_pay_tst0")], {"lang": "en_US", "tz":
+    so = sale_order_obj.browse(cr, uid, ref("sale_order_so1"))  
+    self.wo_check(cr, uid, [ref("account_invoice_pay_tst1")], {"lang": "en_US", "tz":
       False, "active_model": 'account.invoice', "active_ids": [so.invoice_ids[0].id], "type":
       "out_invoice", "active_id": so.invoice_ids[0].id, })
     
@@ -361,25 +361,25 @@
 - 
   !python {model: account.invoice.pay.writeoff}: |
     sale_order_obj = self.pool.get('sale.order')
-    so = sale_order_obj.browse(cr, uid, ref("sale_order_so0"))   
+    so = sale_order_obj.browse(cr, uid, ref("sale_order_so1"))   
     self.pay_and_reconcile_writeoff(cr, uid, [ref("account_invoice_pay_writeoff_0")],
       {"lang": 'en_US', "tz": False, "active_model": 'account.invoice', "active_ids":
       [so.invoice_ids[0].id], "type": "out_invoice", "active_id": so.invoice_ids[0].id })
     
     
 -
-  I will verify the picking associated with the sale order sale_order_so0
+  I will verify the picking associated with the sale order sale_order_so1
 - 
   !python {model: sale.order}: |
-    so = self.browse(cr, uid, ref("sale_order_so0"))
-    assert so.picking_ids,"Picking has not been generated for sale_order_so0"
+    so = self.browse(cr, uid, ref("sale_order_so1"))
+    assert so.picking_ids,"Picking has not been generated for sale_order_so1"
 - 
   Creating a stock.partial.picking record
 - 
   !python {model: stock.picking }: |
    import time
    sale_order_obj = self.pool.get('sale.order')
-   so = sale_order_obj.browse(cr, uid, ref("sale_order_so0"))
+   so = sale_order_obj.browse(cr, uid, ref("sale_order_so1"))
    picking_id = self.search(cr, uid, [('origin','=',so.name),('type','=','out')])
    if picking_id:
       pick=self.browse(cr,uid,picking_id[0])
@@ -395,15 +395,14 @@
           'product_qty': move.product_qty,
           'product_uom': move.product_uom.id,
       } 
-      print "=====>>>>>>",partial_datas
       self.do_partial(cr, uid, picking_id,partial_datas)
 -
   I verify that picking order is in done state
 -
   !python {model: stock.picking }: |
    sale_order_obj = self.pool.get('sale.order')
-   so = sale_order_obj.browse(cr, uid, ref("sale_order_so0"))  
+   so = sale_order_obj.browse(cr, uid, ref("sale_order_so1"))  
    picking_id = self.search(cr, uid, [('origin','=',so.name),('type','=','out')])
    if picking_id:
      pick = self.browse(cr,uid,picking_id[0])
-     assert (pick.state) =='done', "Picking for SO is not in done state."
\ No newline at end of file
+     assert (pick.state) =='done', "Picking for SO is not in done state."
diff --git a/addons/sale/test/shipping_manual_sale_order.yml b/addons/sale/test/shipping_manual_sale_order.yml
index 2ed3db022d3..90b681ab47d 100644
--- a/addons/sale/test/shipping_manual_sale_order.yml
+++ b/addons/sale/test/shipping_manual_sale_order.yml
@@ -390,7 +390,9 @@
 - 
   !python {model: stock.picking }: |
    import time
-   picking_id = self.search(cr, uid, [('origin','=','SO001'),('type','=','out')])
+   sale_order_obj = self.pool.get('sale.order')
+   so = sale_order_obj.browse(cr, uid, ref("sale_order_so0"))
+   picking_id = self.search(cr, uid, [('origin','=',so.name),('type','=','out')])
    if picking_id:
       pick=self.browse(cr,uid,picking_id[0])
       pick.force_assign(cr, uid)
@@ -410,7 +412,9 @@
   I verify that picking order is in done state
 -
   !python {model: stock.picking }: |
-   picking_id = self.search(cr, uid, [('origin','=','SO001'),('type','=','out')])
+   sale_order_obj = self.pool.get('sale.order')
+   so = sale_order_obj.browse(cr, uid, ref("sale_order_so0"))
+   picking_id = self.search(cr, uid, [('origin','=',so.name),('type','=','out')])
    if picking_id:
      pick = self.browse(cr,uid,picking_id[0])
-     assert (pick.state) =='done', "Picking for SO is not in done state." 
\ No newline at end of file
+     assert (pick.state) =='done', "Picking for SO is not in done state." 

From 580a243fddf895cc90103544da7fb82e8a5e5c9d Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.com>
Date: Mon, 17 May 2010 10:32:45 +0530
Subject: [PATCH 40/82] [FIX] point_of_sale: Fixed unused menu problem and
 wrongly set parent menu.

bzr revid: uco@tinyerp.com-20100517050245-m5ejzv25m1hu5hx2
---
 addons/point_of_sale/posrule_data.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/point_of_sale/posrule_data.xml b/addons/point_of_sale/posrule_data.xml
index 5fa46ad43a8..80c06670243 100644
--- a/addons/point_of_sale/posrule_data.xml
+++ b/addons/point_of_sale/posrule_data.xml
@@ -496,8 +496,8 @@
             id="stock.next_id_61"
             name="Reporting"
             parent="stock.menu_stock_root" groups="base.group_user"/>
-		<menuitem action="stock.action_picking_tree" id="stock.menu_action_picking_tree" parent="stock.menu_stock_root" sequence="19" groups="res_groups_posuser0"/>
-        <menuitem id="mrp_procurement.menu_mrp_reordering" name="Automatic Procurements" parent="stock.menu_stock_root" sequence="4" groups="base.group_user"/>
+		<menuitem action="stock.action_picking_tree" id="stock.menu_action_picking_tree" parent="stock.menu_stock_warehouse_mgmt" sequence="19" groups="res_groups_posuser0"/>
+<!--        <menuitem id="mrp_procurement.menu_mrp_reordering" name="Automatic Procurements" parent="stock.menu_stock_root" sequence="4" groups="base.group_user"/>-->
         <menuitem parent="stock.next_id_61" action="stock.action_stock_line_date" id="stock.menu_report_stock_line_date" groups="base.group_user"/>
 
 	</data>

From be792718f9a449a4e2f11755e1d970466da69231 Mon Sep 17 00:00:00 2001
From: mso <mso@mso>
Date: Mon, 17 May 2010 10:56:33 +0530
Subject: [PATCH 41/82] [IMP] sale: Few modification in YML files.

bzr revid: mso@mso-20100517052633-hejlin69a07tfrad
---
 addons/sale/__openerp__.py                      | 2 +-
 addons/sale/test/prepaid_sale_order.yml         | 3 ++-
 addons/sale/test/shipping_manual_sale_order.yml | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/sale/__openerp__.py b/addons/sale/__openerp__.py
index 9be6711a0a8..eb97152280b 100644
--- a/addons/sale/__openerp__.py
+++ b/addons/sale/__openerp__.py
@@ -62,7 +62,7 @@
     'demo_xml': ['sale_demo.xml'],
     'test': [
              'test/shipping_manual_sale_order.yml',
-#             'test/prepaid_sale_order.yml',
+             'test/prepaid_sale_order.yml',
              'test/advance_invoice.yml',
              'test/sale_procurement.yml',
             ],
diff --git a/addons/sale/test/prepaid_sale_order.yml b/addons/sale/test/prepaid_sale_order.yml
index 4038e4be9b8..881af754c5f 100644
--- a/addons/sale/test/prepaid_sale_order.yml
+++ b/addons/sale/test/prepaid_sale_order.yml
@@ -283,7 +283,7 @@
   !record {model: sale.order, id: sale_order_so1}:
     date_order: '2010-05-03'
     invoice_quantity: order
-    name: SO001
+    name: Test_SO001
     order_line:
       - name: LG Viewty Smart
         price_unit: 170.0
@@ -403,6 +403,7 @@
    sale_order_obj = self.pool.get('sale.order')
    so = sale_order_obj.browse(cr, uid, ref("sale_order_so1"))  
    picking_id = self.search(cr, uid, [('origin','=',so.name),('type','=','out')])
+   
    if picking_id:
      pick = self.browse(cr,uid,picking_id[0])
      assert (pick.state) =='done', "Picking for SO is not in done state."
diff --git a/addons/sale/test/shipping_manual_sale_order.yml b/addons/sale/test/shipping_manual_sale_order.yml
index 90b681ab47d..5fe45fdba43 100644
--- a/addons/sale/test/shipping_manual_sale_order.yml
+++ b/addons/sale/test/shipping_manual_sale_order.yml
@@ -285,7 +285,7 @@
   !record {model: sale.order, id: sale_order_so0}:
     date_order: '2010-05-12'
     invoice_quantity: order
-    name: SO001
+    name: Test_SO002
     order_line:
       - name: New Chocolate Slider Mobile
         price_unit: 200.0

From 5fc48ab9ef97e6a2403dd8e3033e2e0966ce547d Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Mon, 17 May 2010 14:14:20 +0530
Subject: [PATCH 42/82] [IMP] point_of_sale:improve the view of point_of_sale
 and fix the problem of Sale Confirm wizard

bzr revid: sbh@tinyerp.com-20100517084420-or26a2xz7w4pnd6z
---
 addons/point_of_sale/pos.py       |  4 +++-
 addons/point_of_sale/pos_view.xml | 21 +++++++++++----------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/addons/point_of_sale/pos.py b/addons/point_of_sale/pos.py
index 7a8d64899fa..981d20077d3 100644
--- a/addons/point_of_sale/pos.py
+++ b/addons/point_of_sale/pos.py
@@ -349,6 +349,7 @@ class pos_order(osv.osv):
             return False
 
     _defaults = {
+        'user_salesman_id':lambda self, cr, uid, context: uid,                
         'user_id': lambda self, cr, uid, context: uid,
         'sale_manager': lambda self, cr, uid, context: uid,
         'state': lambda *a: 'draft',
@@ -773,7 +774,8 @@ class pos_order(osv.osv):
             comp_id=comp_id and comp_id.id or False
             to_reconcile = []
             group_tax = {}
-            account_def = property_obj.get(cr, uid, 'property_account_receivable', 'res.partner', context=context)
+            account_def = property_obj.get(cr, uid, 'property_account_receivable', 'res.partner', context=context).id
+            
             order_account = order.partner_id and order.partner_id.property_account_receivable and order.partner_id.property_account_receivable.id or account_def or curr_c.account_receivable.id
 
             # Create an entry for the sale
diff --git a/addons/point_of_sale/pos_view.xml b/addons/point_of_sale/pos_view.xml
index be838e1e11e..dace921596b 100644
--- a/addons/point_of_sale/pos_view.xml
+++ b/addons/point_of_sale/pos_view.xml
@@ -8,18 +8,19 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Sales Order POS">
-                    <notebook >
-                        <page string="Order lines">
-                            <group colspan="4" col="6">
-                                <field name="user_salesman_id" />
-                                <field name="partner_id" on_change="onchange_partner_pricelist(partner_id)"/>
-                                <field name="contract_number" groups="base.group_extended"/>
-                            </group>
+                    <group col="6" colspan="4">
+						<field name="user_salesman_id" />
+						<field name="partner_id" on_change="onchange_partner_pricelist(partner_id)"/>
+						<field name="contract_number" groups="base.group_extended"/>
+                    
+                	</group>
+                     <notebook colspan="4">
+                      <page string="Sale Order ">                    
                             <field name="lines" colspan="4" nolabel="1">
                                 <tree string="Order lines" editable="bottom">
                                     <field name="product_id" on_change="onchange_product_id(parent.pricelist_id,product_id,qty,parent.partner_id)" width="275" />
                                     <field name="qty" />
-                                    <field name="qty_rfd" />
+                                    <field name="qty_rfd" groups="base.group_extended"/> 
                                     <field name="discount" on_change="onchange_discount(discount,price_unit)" />
                                     <field name="price_ded" on_change="onchange_ded(price_ded, price_unit)" />
                                     <field name="price_unit" readonly="1"/>
@@ -31,7 +32,7 @@
                                 <form string="Order lines" >
                                     <field name="product_id" on_change="onchange_product_id(parent.pricelist_id,product_id,qty,parent.partner_id)" width="275"/>
                                     <field name="qty" />
-                                    <field name="qty_rfd" />
+                                    <field name="qty_rfd" groups="base.group_extended"/>
                                     <field name="discount" on_change="onchange_discount(discount,price_unit)" />
                                     <field name="price_ded" on_change="onchange_ded(price_ded, price_unit)" />
                                     <field name="price_unit"/>
@@ -69,7 +70,7 @@
                             </group>
                         </page>
 
-                        <page string="Payment">
+                        <page string="Order and Payment">
                             <group colspan="2" col="2" name="Type">
                                 <separator string="Order Information" colspan="4"/>
                                 <field name="company_id"/>

From c6d2eb2b4404d2c69a7d8011c915aa9d6f05be67 Mon Sep 17 00:00:00 2001
From: mso <mso@mso>
Date: Mon, 17 May 2010 15:38:47 +0530
Subject: [PATCH 43/82] [IMP] sale: modification in YML files

bzr revid: mso@mso-20100517100847-53zh6vjuaqp2d6ds
---
 addons/sale/test/advance_invoice.yml          |  87 +++++---------
 addons/sale/test/prepaid_sale_order.yml       | 106 ++++++-----------
 .../sale/test/shipping_manual_sale_order.yml  | 112 ++++++------------
 3 files changed, 105 insertions(+), 200 deletions(-)

diff --git a/addons/sale/test/advance_invoice.yml b/addons/sale/test/advance_invoice.yml
index 28855a02237..870b3ec0428 100644
--- a/addons/sale/test/advance_invoice.yml
+++ b/addons/sale/test/advance_invoice.yml
@@ -1,49 +1,41 @@
 -
   In order to test the sale module in the Open-ERP, I need to configure details regarding product & customer.
 -
-  I want to sell my mobile products to the customer with name Cleartrail
+  I am going to sell my Mobile products to the customer with name Cleartrail
 - 
-  Creating an account.account.type record
+  I create View Account Type.
 - 
   !record {model: account.account.type, id: account_account_type_view0}:
     close_method: none
     code: View
     name: View
     sign: 1
-    
-    
 - 
-  Creating an account.account.type record
+  I create Income Account Type.
 - 
   !record {model: account.account.type, id: account_account_type_income0}:
     close_method: unreconciled
     code: Income
     name: Income
     sign: 1
-    
-    
 - 
-  Creating an account.account.type record
+  I create Expense Account Type.
 - 
   !record {model: account.account.type, id: account_account_type_expense0}:
     close_method: unreconciled
     code: Expense
     name: Expense
     sign: 1
-    
-    
 - 
-  Creating an account.account.type record
+  I create Cash Account Type.
 - 
   !record {model: account.account.type, id: account_account_type_cash0}:
     close_method: balance
     code: Cash
     name: Cash
     sign: 1
-    
-    
 - 
-  Creating an account.account record
+  I create Minimal Chart Account.
 - 
   !record {model: account.account, id: account_account_minimalchart0}:
     code: '0'
@@ -55,7 +47,7 @@
     type: view
     user_type: account_account_type_view0
 - 
-  Creating an account.account record
+  I create Payable Account.
 - 
   !record {model: account.account, id: account_account_payable1}:
     code: AP
@@ -68,10 +60,8 @@
     reconcile: true
     type: payable
     user_type: account_account_type_expense0
-    
-    
 - 
-  Creating an account.account record
+  I create Receivable Account.
 - 
   !record {model: account.account, id: account_account_receivable0}:
     code: AR
@@ -84,10 +74,8 @@
     reconcile: true
     type: receivable
     user_type: account_account_type_income0
-    
-    
 - 
-  Creating an account.account record
+  I create Cash Account.
 - 
   !record {model: account.account, id: account_account_cash0}:
     code: C
@@ -99,10 +87,8 @@
     parent_right: 7
     type: other
     user_type: account_account_type_cash0
-    
-    
 - 
-  Creating an account.account record
+  I create Purchases Account.
 - 
   !record {model: account.account, id: account_account_purchases0}:
     code: P
@@ -115,7 +101,7 @@
     type: other
     user_type: account_account_type_expense0
 - 
-  Creating an account.account record
+  I create Sales Account.
 - 
   !record {model: account.account, id: account_account_sales0}:
     code: S
@@ -127,10 +113,8 @@
     parent_right: 11
     type: other
     user_type: account_account_type_income0
-
-    
 - 
-  Creating an account.journal record
+  I create Purchase Journal.
 - 
   !record {model: account.journal, id: account_journal_purchasejournal0}:
     code: PUJ
@@ -141,10 +125,8 @@
     sequence_id: account.sequence_purchase_journal
     type: purchase
     view_id: account.account_journal_view
-    
-    
 - 
-  Creating an account.journal record
+  I create Sale Journal.
 - 
   !record {model: account.journal, id: account_journal_salejournal0}:
     code: SAJ
@@ -155,10 +137,8 @@
     sequence_id: account.sequence_sale_journal
     type: sale
     view_id: account.account_journal_view
-    
-    
 - 
-  Creating an account.journal record
+  I create Bank Journal.
 - 
   !record {model: account.journal, id: account_journal_bankjournal0}:
     code: BNK
@@ -169,20 +149,16 @@
     sequence_id: account.sequence_journal
     type: cash
     view_id: account.account_journal_bank_view
-    
-    
 - 
-  Creating a ir.property record
+  I create ir.property for account payable.
 - 
   !record {model: ir.property, id: ir_property_propertyaccountexpensecateg0}:
     company_id: base.main_company
     fields_id: account.field_res_partner_property_account_payable
     name: property_account_expense_categ
     value_reference: account.account,5
-    
-    
 - 
-  Creating a ir.property record
+  I create ir.property for account receivable.
 - 
   !record {model: ir.property, id: ir_property_propertyaccountincomecateg0}:
     company_id: base.main_company
@@ -190,59 +166,54 @@
     name: property_account_income_categ
     value_reference: account.account,6
 - 
-  Creating a res.partner.category record
+  I create Partner category Customers.
 - 
   !record {model: res.partner.category, id: res_partner_category_customers0}:
     name: Customers
 -
-  Creating an res.partner record
+  I create Cleartrail Customer.
 - 
   !record {model: res.partner, id: res_partner_cleartrail0}:
     category_id:
       - res_partner_category_customers0
     name: Cleartrail
-    
-    
 - 
-  Creating an res.partner.address record
+  I create contact address for Cleartrail.
 - 
   !record {model: res.partner.address, id: res_partner_address_1}:
     partner_id: res_partner_cleartrail0
     street: onam plaza, 14 B palasia A B Road
     type: contact
-    
-    
 - 
-  Creating an res.partner.address record
+  I create invoice address for Cleartrail.
 - 
   !record {model: res.partner.address, id: res_partner_address_2}:
     partner_id: res_partner_cleartrail0
+    street: sarda house 24 B palasia, A B Road
     type: invoice
-    
-    
 - 
-  Creating an res.partner.address record
+  I create delivery address for Cleartrail.
 - 
   !record {model: res.partner.address, id: res_partner_address_3}:
     partner_id: res_partner_cleartrail0
     street: sangam house 15 B palasia, A B Road
     type: delivery
 -
-  Customer Cleartrail has specific instrument requirements regarding the stockable products
+  Customer Cleartrail has specific instrument requirement regarding the stockable products.
 - 
-  Creating an product.category record
+  I define product category Mobile Products Sellable.
 - 
   !record {model: product.category, id: product_category_allproductssellable0}:
     name: Mobile Products Sellable
     
     
 - 
-  Creating an product.category record
+  I define product category Mobile Services. 
 - 
   !record {model: product.category, id: product_category_services0}:
     name: Mobile Services
 - 
-  Creating an product.template record
+  I define LG Viewty Smart product template.
 - 
   !record {model: product.template, id: product_template_lgviewtysmart0}:
     categ_id: product_category_allproductssellable0
@@ -258,7 +229,7 @@
     uom_po_id: product.product_uom_unit
     
 -    
-  Creating an product.product record
+  I define LG Viewty Smart product.
 - 
   !record {model: product.product, id: product_product_lgviewtysmart0}:
     categ_id: product_category_allproductssellable0
@@ -278,7 +249,7 @@
     uom_id: product.product_uom_unit
     uom_po_id: product.product_uom_unit
 -
-  Creating a sale.order record
+  I create a Sale Order for LG Viewty Smart for qty 500 having order_policy prepaid.
 - 
   !record {model: sale.order, id: sale_order_so0}:
     date_order: '2010-05-03'
@@ -305,7 +276,7 @@
     shop_id: sale.shop
     
 - 
-  Creating a sale.advance.payment.inv record
+  I use the Advance Payment wizard.
 - 
   !record {model: sale.advance.payment.inv, id: sale_advance_payment_inv_0}:
     amount: 1000.0
diff --git a/addons/sale/test/prepaid_sale_order.yml b/addons/sale/test/prepaid_sale_order.yml
index 881af754c5f..cd33b1bc73e 100644
--- a/addons/sale/test/prepaid_sale_order.yml
+++ b/addons/sale/test/prepaid_sale_order.yml
@@ -1,49 +1,41 @@
 -
   In order to test the sale module in the Open-ERP, I need to configure details regarding product & customer.
 -
-  I want to sell my mobile products to the customer with name Cleartrail
+  I am going to sell my Mobile products to the customer with name Cleartrail
 - 
-  Creating an account.account.type record
+  I create View Account Type.
 - 
   !record {model: account.account.type, id: account_account_type_view0}:
     close_method: none
     code: View
     name: View
     sign: 1
-    
-    
 - 
-  Creating an account.account.type record
+  I create Income Account Type.
 - 
   !record {model: account.account.type, id: account_account_type_income0}:
     close_method: unreconciled
     code: Income
     name: Income
     sign: 1
-    
-    
 - 
-  Creating an account.account.type record
+  I create Expense Account Type.
 - 
   !record {model: account.account.type, id: account_account_type_expense0}:
     close_method: unreconciled
     code: Expense
     name: Expense
     sign: 1
-    
-    
 - 
-  Creating an account.account.type record
+  I create Cash Account Type.
 - 
   !record {model: account.account.type, id: account_account_type_cash0}:
     close_method: balance
     code: Cash
     name: Cash
     sign: 1
-    
-    
 - 
-  Creating an account.account record
+  I create Minimal Chart Account.
 - 
   !record {model: account.account, id: account_account_minimalchart0}:
     code: '0'
@@ -55,7 +47,7 @@
     type: view
     user_type: account_account_type_view0
 - 
-  Creating an account.account record
+  I create Payable Account.
 - 
   !record {model: account.account, id: account_account_payable1}:
     code: AP
@@ -68,10 +60,8 @@
     reconcile: true
     type: payable
     user_type: account_account_type_expense0
-    
-    
 - 
-  Creating an account.account record
+  I create Receivable Account.
 - 
   !record {model: account.account, id: account_account_receivable0}:
     code: AR
@@ -84,10 +74,8 @@
     reconcile: true
     type: receivable
     user_type: account_account_type_income0
-    
-    
 - 
-  Creating an account.account record
+  I create Cash Account.
 - 
   !record {model: account.account, id: account_account_cash0}:
     code: C
@@ -99,10 +87,8 @@
     parent_right: 7
     type: other
     user_type: account_account_type_cash0
-    
-    
 - 
-  Creating an account.account record
+  I create Purchases Account.
 - 
   !record {model: account.account, id: account_account_purchases0}:
     code: P
@@ -115,7 +101,7 @@
     type: other
     user_type: account_account_type_expense0
 - 
-  Creating an account.account record
+  I create Sales Account.
 - 
   !record {model: account.account, id: account_account_sales0}:
     code: S
@@ -127,10 +113,8 @@
     parent_right: 11
     type: other
     user_type: account_account_type_income0
-
-    
 - 
-  Creating an account.journal record
+  I create Purchase Journal.
 - 
   !record {model: account.journal, id: account_journal_purchasejournal0}:
     code: PUJ
@@ -141,10 +125,8 @@
     sequence_id: account.sequence_purchase_journal
     type: purchase
     view_id: account.account_journal_view
-    
-    
 - 
-  Creating an account.journal record
+  I create Sale Journal.
 - 
   !record {model: account.journal, id: account_journal_salejournal0}:
     code: SAJ
@@ -155,10 +137,8 @@
     sequence_id: account.sequence_sale_journal
     type: sale
     view_id: account.account_journal_view
-    
-    
 - 
-  Creating an account.journal record
+  I create Bank Journal.
 - 
   !record {model: account.journal, id: account_journal_bankjournal0}:
     code: BNK
@@ -169,20 +149,16 @@
     sequence_id: account.sequence_journal
     type: cash
     view_id: account.account_journal_bank_view
-    
-    
 - 
-  Creating a ir.property record
+  I create ir.property for account payable.
 - 
   !record {model: ir.property, id: ir_property_propertyaccountexpensecateg0}:
     company_id: base.main_company
     fields_id: account.field_res_partner_property_account_payable
     name: property_account_expense_categ
     value_reference: account.account,5
-    
-    
 - 
-  Creating a ir.property record
+  I create ir.property for account receivable.
 - 
   !record {model: ir.property, id: ir_property_propertyaccountincomecateg0}:
     company_id: base.main_company
@@ -190,59 +166,54 @@
     name: property_account_income_categ
     value_reference: account.account,6
 - 
-  Creating a res.partner.category record
+  I create Partner category Customers.
 - 
   !record {model: res.partner.category, id: res_partner_category_customers0}:
     name: Customers
 -
-  Creating an res.partner record
+  I create Cleartrail Customer.
 - 
   !record {model: res.partner, id: res_partner_cleartrail0}:
     category_id:
       - res_partner_category_customers0
     name: Cleartrail
-    
-    
 - 
-  Creating an res.partner.address record
+  I create contact address for Cleartrail.
 - 
   !record {model: res.partner.address, id: res_partner_address_1}:
     partner_id: res_partner_cleartrail0
     street: onam plaza, 14 B palasia A B Road
     type: contact
-    
-    
 - 
-  Creating an res.partner.address record
+  I create invoice address for Cleartrail.
 - 
   !record {model: res.partner.address, id: res_partner_address_2}:
     partner_id: res_partner_cleartrail0
+    street: sarda house 24 B palasia, A B Road
     type: invoice
-    
-    
 - 
-  Creating an res.partner.address record
+  I create delivery address for Cleartrail.
 - 
   !record {model: res.partner.address, id: res_partner_address_3}:
     partner_id: res_partner_cleartrail0
     street: sangam house 15 B palasia, A B Road
     type: delivery
 -
-  Customer Cleartrail has specific instrument requirements regarding the stockable products
+  Customer Cleartrail has specific instrument requirement regarding the stockable products.
 - 
-  Creating an product.category record
+  I define product category Mobile Products Sellable.
 - 
   !record {model: product.category, id: product_category_allproductssellable0}:
     name: Mobile Products Sellable
     
     
 - 
-  Creating an product.category record
+  I define product category Mobile Services. 
 - 
   !record {model: product.category, id: product_category_services0}:
     name: Mobile Services
 - 
-  Creating an product.template record
+  I define LG Viewty Smart product template.
 - 
   !record {model: product.template, id: product_template_lgviewtysmart0}:
     categ_id: product_category_allproductssellable0
@@ -256,9 +227,8 @@
     type: product
     uom_id: product.product_uom_unit
     uom_po_id: product.product_uom_unit
-    
 -    
-  Creating an product.product record
+  I define LG Viewty Smart product.
 - 
   !record {model: product.product, id: product_product_lgviewtysmart0}:
     categ_id: product_category_allproductssellable0
@@ -278,7 +248,7 @@
     uom_id: product.product_uom_unit
     uom_po_id: product.product_uom_unit
 -
-  Creating a sale.order record
+  I create a Sale Order for LG Viewty Smart for qty 500 having order_policy prepaid.
 - 
   !record {model: sale.order, id: sale_order_so1}:
     date_order: '2010-05-03'
@@ -306,7 +276,7 @@
     
     
 - 
-  Performing a workflow action order_confirm on module sale.order
+  I confirm the sale order.
 - 
   !workflow {model: sale.order, action: order_confirm, ref: sale_order_so1}
 -
@@ -316,7 +286,7 @@
     so = self.browse(cr, uid, ref("sale_order_so1"))
     assert so.invoice_ids, "Invoices has not been generated for sale_order_so1"
 - 
-  Performing a workflow action invoice_open on module account.invoice
+  I open the Invoice for the SO.
 - 
   !python {model: account.invoice}: |
     sale_order_obj = self.pool.get('sale.order')
@@ -327,7 +297,7 @@
     for invoice in invoice_ids:
       wf_service.trg_validate(uid, 'account.invoice',invoice.id,'invoice_open', cr) 
 -
-  Creating a account.invoice.pay record
+  Creating a account invoice pay entry.
 - 
   !record {model: account.invoice.pay, id: account_invoice_pay_tst1}:
     amount: 85000.0
@@ -336,7 +306,7 @@
     name: tst
     period_id: account.period_5
 - 
-  Performing an osv_memory action wo_check on module account.invoice.pay
+  I pay the invoice.
 - 
   !python {model: account.invoice.pay}: |
     sale_order_obj = self.pool.get('sale.order')
@@ -347,7 +317,7 @@
     
     
 - 
-  Creating a account.invoice.pay.writeoff record
+  Creating an account invoice pay writeoff entry.
 - 
   !record {model: account.invoice.pay.writeoff, id: account_invoice_pay_writeoff_0}:
     analytic_id: account.analytic_customers
@@ -357,7 +327,7 @@
     
     
 - 
-  Performing an osv_memory action pay_and_reconcile_writeoff on module account.invoice.pay.writeoff
+  Pay and Reconcile the Invoice.
 - 
   !python {model: account.invoice.pay.writeoff}: |
     sale_order_obj = self.pool.get('sale.order')
@@ -374,7 +344,7 @@
     so = self.browse(cr, uid, ref("sale_order_so1"))
     assert so.picking_ids,"Picking has not been generated for sale_order_so1"
 - 
-  Creating a stock.partial.picking record
+  Products are delivered to the Cleartrail Customer.
 - 
   !python {model: stock.picking }: |
    import time
@@ -394,10 +364,10 @@
           'product_id': move.product_id.id,
           'product_qty': move.product_qty,
           'product_uom': move.product_uom.id,
-      } 
-      self.do_partial(cr, uid, picking_id,partial_datas)
+      }
+      self.do_partial(cr, uid, [pick.id],partial_datas)
 -
-  I verify that picking order is in done state
+  I verify that picking order is in done state.
 -
   !python {model: stock.picking }: |
    sale_order_obj = self.pool.get('sale.order')
diff --git a/addons/sale/test/shipping_manual_sale_order.yml b/addons/sale/test/shipping_manual_sale_order.yml
index 5fe45fdba43..4bbbbb74dc5 100644
--- a/addons/sale/test/shipping_manual_sale_order.yml
+++ b/addons/sale/test/shipping_manual_sale_order.yml
@@ -1,49 +1,41 @@
 -
   In order to test the sale module in the Open-ERP, I need to configure details regarding product & customer.
 -
-  I want to sell my mobile products to the customer with name Cleartrail
+  I am going to sell my Mobile products to the customer with name Cleartrail
 - 
-  Creating an account.account.type record
+  I create View Account Type.
 - 
   !record {model: account.account.type, id: account_account_type_view0}:
     close_method: none
     code: View
     name: View
     sign: 1
-    
-    
 - 
-  Creating an account.account.type record
+  I create Income Account Type.
 - 
   !record {model: account.account.type, id: account_account_type_income0}:
     close_method: unreconciled
     code: Income
     name: Income
     sign: 1
-    
-    
 - 
-  Creating an account.account.type record
+  I create Expense Account Type.
 - 
   !record {model: account.account.type, id: account_account_type_expense0}:
     close_method: unreconciled
     code: Expense
     name: Expense
     sign: 1
-    
-    
 - 
-  Creating an account.account.type record
+  I create Cash Account Type.
 - 
   !record {model: account.account.type, id: account_account_type_cash0}:
     close_method: balance
     code: Cash
     name: Cash
     sign: 1
-    
-    
 - 
-  Creating an account.account record
+  I create Minimal Chart Account.
 - 
   !record {model: account.account, id: account_account_minimalchart0}:
     code: '0'
@@ -55,7 +47,7 @@
     type: view
     user_type: account_account_type_view0
 - 
-  Creating an account.account record
+  I create Payable Account.
 - 
   !record {model: account.account, id: account_account_payable1}:
     code: AP
@@ -68,10 +60,8 @@
     reconcile: true
     type: payable
     user_type: account_account_type_expense0
-    
-    
 - 
-  Creating an account.account record
+  I create Receivable Account.
 - 
   !record {model: account.account, id: account_account_receivable0}:
     code: AR
@@ -84,10 +74,8 @@
     reconcile: true
     type: receivable
     user_type: account_account_type_income0
-    
-    
 - 
-  Creating an account.account record
+  I create Cash Account.
 - 
   !record {model: account.account, id: account_account_cash0}:
     code: C
@@ -99,10 +87,8 @@
     parent_right: 7
     type: other
     user_type: account_account_type_cash0
-    
-    
 - 
-  Creating an account.account record
+  I create Purchases Account.
 - 
   !record {model: account.account, id: account_account_purchases0}:
     code: P
@@ -115,7 +101,7 @@
     type: other
     user_type: account_account_type_expense0
 - 
-  Creating an account.account record
+  I create Sales Account.
 - 
   !record {model: account.account, id: account_account_sales0}:
     code: S
@@ -127,10 +113,8 @@
     parent_right: 11
     type: other
     user_type: account_account_type_income0
-
-    
 - 
-  Creating an account.journal record
+  I create Purchase Journal.
 - 
   !record {model: account.journal, id: account_journal_purchasejournal0}:
     code: PUJ
@@ -141,10 +125,8 @@
     sequence_id: account.sequence_purchase_journal
     type: purchase
     view_id: account.account_journal_view
-    
-    
 - 
-  Creating an account.journal record
+  I create Sale Journal.
 - 
   !record {model: account.journal, id: account_journal_salejournal0}:
     code: SAJ
@@ -155,10 +137,8 @@
     sequence_id: account.sequence_sale_journal
     type: sale
     view_id: account.account_journal_view
-    
-    
 - 
-  Creating an account.journal record
+  I create Bank Journal.
 - 
   !record {model: account.journal, id: account_journal_bankjournal0}:
     code: BNK
@@ -169,20 +149,16 @@
     sequence_id: account.sequence_journal
     type: cash
     view_id: account.account_journal_bank_view
-    
-    
 - 
-  Creating a ir.property record
+  I create ir.property for account payable.
 - 
   !record {model: ir.property, id: ir_property_propertyaccountexpensecateg0}:
     company_id: base.main_company
     fields_id: account.field_res_partner_property_account_payable
     name: property_account_expense_categ
     value_reference: account.account,5
-    
-    
 - 
-  Creating a ir.property record
+  I create ir.property for account receivable.
 - 
   !record {model: ir.property, id: ir_property_propertyaccountincomecateg0}:
     company_id: base.main_company
@@ -190,59 +166,52 @@
     name: property_account_income_categ
     value_reference: account.account,6
 - 
-  Creating a res.partner.category record
+  I create Partner category Customers.
 - 
   !record {model: res.partner.category, id: res_partner_category_customers0}:
     name: Customers
 -
-  Creating an res.partner record
+  I create Cleartrail Customer.
 - 
   !record {model: res.partner, id: res_partner_cleartrail0}:
     category_id:
       - res_partner_category_customers0
     name: Cleartrail
-    
-    
 - 
-  Creating an res.partner.address record
+  I create contact address for Cleartrail.
 - 
   !record {model: res.partner.address, id: res_partner_address_1}:
     partner_id: res_partner_cleartrail0
     street: onam plaza, 14 B palasia A B Road
     type: contact
-    
-    
 - 
-  Creating an res.partner.address record
+  I create invoice address for Cleartrail.
 - 
   !record {model: res.partner.address, id: res_partner_address_2}:
     partner_id: res_partner_cleartrail0
+    street: sarda house 24 B palasia, A B Road
     type: invoice
-    
-    
 - 
-  Creating an res.partner.address record
+  I create delivery address for Cleartrail.
 - 
   !record {model: res.partner.address, id: res_partner_address_3}:
     partner_id: res_partner_cleartrail0
     street: sangam house 15 B palasia, A B Road
     type: delivery
 -
-  Customer Cleartrail has specific instrument requirements regarding the stockable products
+  Customer Cleartrail has specific instrument requirement regarding the stockable products.
 - 
-  Creating an product.category record
+  I define product category Mobile Products Sellable.
 - 
   !record {model: product.category, id: product_category_allproductssellable0}:
     name: Mobile Products Sellable
-    
-    
 - 
-  Creating an product.category record
+  I define product category Mobile Services. 
 - 
   !record {model: product.category, id: product_category_services0}:
     name: Mobile Services
 - 
-  Creating an product.template record
+  I define LG Viewty Smart product template.
 - 
   !record {model: product.template, id: product_template_newchocolateslidermobile0}:
     categ_id: product_category_allproductssellable0
@@ -256,9 +225,8 @@
     type: product
     uom_id: product.product_uom_unit
     uom_po_id: product.product_uom_unit
-   
 - 
-  Creating an product.product record
+  I define LG Viewty Smart product.
 - 
   !record {model: product.product, id: product_product_newchocolateslidermobile0}:
     categ_id: product_category_allproductssellable0
@@ -277,10 +245,8 @@
     type: product
     uom_id: product.product_uom_unit
     uom_po_id: product.product_uom_unit
-    
-
 - 
-  Creating a sale.order record
+  I create a Sale Order for LG Viewty Smart for qty 500 having order_policy manual.
 -
   !record {model: sale.order, id: sale_order_so0}:
     date_order: '2010-05-12'
@@ -305,13 +271,11 @@
     pricelist_id: product.list0
     shop_id: sale.shop
 - 
-  Performing a workflow action order_confirm on module sale.order
+  I confirm the Sale Order.
 - 
   !workflow {model: sale.order, action: order_confirm, ref: sale_order_so0}
 -
   I click on Create Invoice button to create the invoice.
--
-  Performing a workflow action manual_invoice on module sale.order
 - 
   !workflow {model: sale.order, action: manual_invoice, ref: sale_order_so0}
 -
@@ -321,7 +285,7 @@
     so = self.browse(cr, uid, ref("sale_order_so0"))
     assert so.invoice_ids, "Invoices has not been generated for sale_order_so0"
 - 
-  Performing a workflow action invoice_open on module account.invoice
+  I open the Invoice for the SO.
 - 
   !python {model: account.invoice}: |
     sale_order_obj = self.pool.get('sale.order')
@@ -332,7 +296,7 @@
     for invoice in invoice_ids:
       wf_service.trg_validate(uid, 'account.invoice',invoice.id,'invoice_open', cr) 
 -
-  Creating a account.invoice.pay record
+  Creating a account invoice pay entry.
 - 
   !record {model: account.invoice.pay, id: account_invoice_pay_tst0}:
     amount: 100000.0
@@ -341,7 +305,7 @@
     name: test
     period_id: account.period_5
 - 
-  Performing an osv_memory action wo_check on module account.invoice.pay
+  I pay the invoice.
 - 
   !python {model: account.invoice.pay}: |
     sale_order_obj = self.pool.get('sale.order')
@@ -352,7 +316,7 @@
     
     
 - 
-  Creating a account.invoice.pay.writeoff record
+  Creating an account invoice pay writeoff entry.
 - 
   !record {model: account.invoice.pay.writeoff, id: account_invoice_pay_writeoff_0}:
     analytic_id: account.analytic_customers
@@ -362,7 +326,7 @@
     
     
 - 
-  Performing an osv_memory action pay_and_reconcile_writeoff on module account.invoice.pay.writeoff
+  Pay and Reconcile the Invoice.
 - 
   !python {model: account.invoice.pay.writeoff}: |
     sale_order_obj = self.pool.get('sale.order')
@@ -380,13 +344,13 @@
     for invoice in invoice_ids:
         assert (invoice.state) =='paid', "Invoice for SO is not in done state."
 - 
-  I will verify the picking associated with the sale order sale_order_so0
+  I verify the picking associated with the sale order sale_order_so0.
 - 
   !python {model: sale.order}: |
     so = self.browse(cr, uid, ref("sale_order_so0"))
     assert so.picking_ids,"Picking has not been generated for sale_order_so0"
 -
-  Creating a stock.partial.picking record
+  Products are delivered to the Cleartrail Customer.
 - 
   !python {model: stock.picking }: |
    import time
@@ -407,9 +371,9 @@
           'product_qty': move.product_qty,
           'product_uom': move.product_uom.id,
       } 
-      self.do_partial(cr, uid, picking_id,partial_datas)
+      self.do_partial(cr, uid, [pick.id],partial_datas)
 -
-  I verify that picking order is in done state
+  I verify that picking order is in done state.
 -
   !python {model: stock.picking }: |
    sale_order_obj = self.pool.get('sale.order')

From f3093e3690223d67d40353f6ccf7630d97f40b2b Mon Sep 17 00:00:00 2001
From: mso <mso@mso>
Date: Mon, 17 May 2010 16:02:17 +0530
Subject: [PATCH 44/82] [FIX] product, purchase: seprator removed from
 product_view file and Purchase Order is renamed to Latest Requisition

bzr revid: mso@mso-20100517103217-21exq25pp6xjc9xa
---
 addons/product/product_view.xml | 1 -
 addons/purchase/purchase.py     | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index a2d41d0cc6c..360ffef25eb 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -64,7 +64,6 @@
                 <form string="Product">
                    <group colspan="4" col="6">
                     <group colspan="4" col="2">
-                        <separator string="Product Description" colspan="4"/>
                         <field name="name"/>
                         <field groups="product.group_product_variant" name="variants" />
                     </group>
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index a7d69159873..448f4ccc63b 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -696,7 +696,7 @@ purchase_order_line()
 class mrp_procurement(osv.osv):
     _inherit = 'mrp.procurement'
     _columns = {
-        'purchase_id': fields.many2one('purchase.order', 'Purchase Order'),
+        'purchase_id': fields.many2one('purchase.order', 'Latest Requisition'),
     }
     
     def action_po_assign(self, cr, uid, ids, context={}):

From cadae704f0a0bfee6f4cfa7126b0e845c993eb3e Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.com>
Date: Tue, 18 May 2010 11:42:23 +0530
Subject: [PATCH 45/82] [REF] stock_planning: Refactored code for wizards to
 open with search view of particular object.

bzr revid: uco@tinyerp.com-20100518061223-8pi0zpd76p6gq2vg
---
 addons/stock_planning/stock_planning.py | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/addons/stock_planning/stock_planning.py b/addons/stock_planning/stock_planning.py
index fa0bec2f5b1..3bdc14bce82 100644
--- a/addons/stock_planning/stock_planning.py
+++ b/addons/stock_planning/stock_planning.py
@@ -161,6 +161,7 @@ class stock_sale_forecast_createlines(osv.osv_memory):
     def create_forecast(self,cr, uid, ids, context={}):
         product_obj = self.pool.get('product.product')
         forecast_obj=self.pool.get('stock.sale.forecast')
+        mod_obj =self.pool.get('ir.model.data')
         for f in self.browse(cr, uid, ids, context):
             prod_categ_obj=self.pool.get('product.category')
             template_obj=self.pool.get('product.template')
@@ -212,11 +213,14 @@ class stock_sale_forecast_createlines(osv.osv_memory):
                         'product_uom_categ' : p.uom_id.category_id.id,
                         'product_uos_categ' : prod_uos_categ,
                      })
+        result = mod_obj._get_id(cr, uid, 'stock_planning', 'view_stock_sale_forecast_filter')
+        id = mod_obj.read(cr, uid, result, ['res_id'], context=context)
         return {
                 'view_type': 'form',
                 "view_mode": 'tree',
                 'res_model': 'stock.sale.forecast',
-                'type': 'ir.actions.act_window',                
+                'type': 'ir.actions.act_window',
+                'search_view_id': id['res_id'],                
             }
 stock_sale_forecast_createlines()
 
@@ -488,7 +492,7 @@ class stock_planning_createlines(osv.osv_memory):
     def create_planning(self,cr, uid, ids, context={}):
         product_obj = self.pool.get('product.product')
         planning_obj=self.pool.get('stock.planning')
-
+        mod_obj =self.pool.get('ir.model.data')
         for f in self.browse(cr, uid, ids, context=context):
             if f.forecasted_products:
                 cr.execute("SELECT product_id \
@@ -562,11 +566,14 @@ class stock_planning_createlines(osv.osv_memory):
                         'stock_supply_location': stock_supply_location,
 
                     })
+        result = mod_obj._get_id(cr, uid, 'stock_planning', 'view_stock_planning_filter')
+        id = mod_obj.read(cr, uid, result, ['res_id'], context=context)
         return {
                 'view_type': 'form',
                 "view_mode": 'tree',
                 'res_model': 'stock.planning',
-                'type': 'ir.actions.act_window',                
+                'type': 'ir.actions.act_window', 
+                'search_view_id': id['res_id'],               
             }
 stock_planning_createlines()
 

From cde14b4af33ac9e5051c6e36835ea1de7e5af2ef Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.com>
Date: Tue, 18 May 2010 12:05:37 +0530
Subject: [PATCH 46/82] [REF] sale: Improved yaml for procurement orders in
 sale module.

bzr revid: uco@tinyerp.com-20100518063537-hee4dbu2a9sgjapp
---
 addons/sale/test/sale_procurement.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/addons/sale/test/sale_procurement.yml b/addons/sale/test/sale_procurement.yml
index 5a73236f7bc..c9d26baec9f 100644
--- a/addons/sale/test/sale_procurement.yml
+++ b/addons/sale/test/sale_procurement.yml
@@ -28,7 +28,6 @@
     company_id: base.main_company
     location_id: stock.stock_location_stock
     logic: max
-    name: OP/00002
     product_id: product_product_wood0
     product_max_qty: 15.0
     product_min_qty: 10.0
@@ -38,12 +37,11 @@
 -
   Now I make a sale order for table.
 - 
-  !record {model: sale.order, id: sale_order_so0}:
+  !record {model: sale.order, id: sale_order_so3}:
     amount_total: 5.0
     amount_untaxed: 5.0
     date_order: '2010-04-30'
     invoice_quantity: order
-    name: SO006
     order_line:
       - company_id: base.main_company
         delay: 7.0
@@ -66,7 +64,7 @@
 -
   I confirm the order.
 - 
-  !workflow {model: sale.order, action: order_confirm, ref: sale_order_so0}
+  !workflow {model: sale.order, action: order_confirm, ref: sale_order_so3}
 -
   I check that one procurement is generated.
 -

From 6ec34eceb486c8427aeb0fb03d9aba0138dbe070 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.com>
Date: Tue, 18 May 2010 15:50:28 +0530
Subject: [PATCH 47/82] [FIX] purchase: Task ID-701: fix the procurement menu.

bzr revid: uco@tinyerp.com-20100518102028-j5f3lyj0p64s3lqo
---
 addons/purchase/purchase_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index a57749e8134..5aac4239a17 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -5,7 +5,7 @@
             groups="group_purchase_user"/>-->
        <menuitem icon="terp-purchase" id="base.menu_purchase_root" name="Procurement Management"
             groups="group_purchase_user" sequence="7"/>
-       <menuitem id="menu_procurement_management" name="Procurement Management"
+       <menuitem id="menu_procurement_management" name="Purchase Management"
             parent="base.menu_purchase_root" sequence="1"/>
 
      <!--supplier menu-->

From 10c9972873eebddeddb8351393836de921a37e0d Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 18 May 2010 15:59:32 +0530
Subject: [PATCH 48/82] sale:Convert the makeinvoice wizard into osv_memory

bzr revid: sbh@tinyerp.com-20100518102932-e90svv65l5w3sk8a
---
 addons/sale/__openerp__.py                    |  1 +
 addons/sale/wizard/__init__.py                |  3 +-
 addons/sale/wizard/make_invoice.py            | 96 -------------------
 addons/sale/wizard/sale_make_invoice.py       | 69 +++++++++++++
 addons/sale/wizard/sale_make_invoice.xml      | 29 ++++++
 .../sale/wizard/sale_make_invoice_advance.py  |  2 +-
 6 files changed, 102 insertions(+), 98 deletions(-)
 delete mode 100644 addons/sale/wizard/make_invoice.py
 create mode 100644 addons/sale/wizard/sale_make_invoice.py
 create mode 100644 addons/sale/wizard/sale_make_invoice.xml

diff --git a/addons/sale/__openerp__.py b/addons/sale/__openerp__.py
index eb97152280b..651945752a7 100644
--- a/addons/sale/__openerp__.py
+++ b/addons/sale/__openerp__.py
@@ -47,6 +47,7 @@
     'update_xml': [
         'wizard/sale_make_invoice_advance.xml',
         'wizard/sale_line_invoice.xml',
+        'wizard/sale_make_invoice.xml',
         'security/sale_security.xml',
         'security/ir.model.access.csv',
         'company_view.xml',
diff --git a/addons/sale/wizard/__init__.py b/addons/sale/wizard/__init__.py
index 07c5ceea83d..ba6fd677a3c 100644
--- a/addons/sale/wizard/__init__.py
+++ b/addons/sale/wizard/__init__.py
@@ -19,8 +19,9 @@
 #
 ##############################################################################
 
-#remaining make_invoice
+import sale_make_invoice
 import sale_line_invoice
 import sale_make_invoice_advance
 
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale/wizard/make_invoice.py b/addons/sale/wizard/make_invoice.py
deleted file mode 100644
index 7b190c3b2d6..00000000000
--- a/addons/sale/wizard/make_invoice.py
+++ /dev/null
@@ -1,96 +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 wizard
-import netsvc
-import pooler
-
-invoice_form = """<?xml version="1.0"?>
-<form string="Create invoices">
-    <separator colspan="4" string="Do you really want to create the invoices ?" />
-    <field name="grouped" />
-    <field name="invoice_date" />    
-</form>
-"""
-
-invoice_fields = {
-    'grouped' : {'string':'Group the invoices', 'type':'boolean', 'default': lambda x,y,z: False},
-    'invoice_date': {'string': 'Invoiced date', 'type':'date' }
-}
-
-ack_form = """<?xml version="1.0"?>
-<form string="Create invoices">
-    <separator string="Invoices created" />
-</form>"""
-
-ack_fields = {}
-
-def _makeInvoices(self, cr, uid, data, context):
-    pool_obj = pooler.get_pool(cr.dbname)
-    mod_obj = pool_obj.get('ir.model.data') 
-    order_obj = pool_obj.get('sale.order')
-    newinv = []
-
-    order_obj.action_invoice_create(cr, uid, data['ids'], data['form']['grouped'], date_inv = data['form']['invoice_date'])
-    for id in data['ids']:
-        wf_service = netsvc.LocalService("workflow")
-        wf_service.trg_validate(uid, 'sale.order', id, 'manual_invoice', cr)
-
-    for o in order_obj.browse(cr, uid, data['ids'], context):
-        for i in o.invoice_ids:
-            newinv.append(i.id)
-    act_obj = pool_obj.get('ir.actions.act_window')
-    xml_id='action_invoice_tree5'
-    result = mod_obj._get_id(cr, uid, 'account', xml_id)
-    id = mod_obj.read(cr, uid, result, ['res_id'])['res_id']
-    result = act_obj.read(cr, uid, id)
-    result['domain'] ="[('id','in', ["+','.join(map(str,newinv))+"])]"
-    return result
-    #return {
-    #    'domain': "[('id','in', ["+','.join(map(str,newinv))+"])]",
-    #    'name': 'Invoices',
-    #    'view_type': 'form',
-    #    'view_mode': 'tree,form',
-    #    'res_model': 'account.invoice',
-    #    'view_id': False,
-    #    'context': "{'type':'out_refund'}",
-    #    'type': 'ir.actions.act_window'
-    #}
-    #return {}
-
-class make_invoice(wizard.interface):
-    states = {
-        'init' : {
-            'actions' : [],
-            'result' : {'type' : 'form',
-                    'arch' : invoice_form,
-                    'fields' : invoice_fields,
-                    'state' : [('end', 'Cancel'),('invoice', 'Create invoices') ]}
-        },
-        'invoice' : {
-            'actions' : [_makeInvoices],
-            'result' : {'type': 'state', 'state': 'end'}
-        },
-    }
-make_invoice("sale.order.make_invoice")
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/sale/wizard/sale_make_invoice.py b/addons/sale/wizard/sale_make_invoice.py
new file mode 100644
index 00000000000..c5d7bbaceea
--- /dev/null
+++ b/addons/sale/wizard/sale_make_invoice.py
@@ -0,0 +1,69 @@
+##############################################################################
+#
+#    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 service import web_services
+from tools.translate import _
+import ir
+import netsvc
+
+class sale_make_invoice(osv.osv_memory):
+    _name = "sale.make.invoice"
+    _description = "Sale Make Invoice"
+    _columns = {
+        'grouped': fields.boolean('Group the invoices'),
+        'invoice_date':fields.date('Invoice Date'),
+    }
+    _default = {
+        'grouped' : lambda *a: False
+    }
+
+    def make_invoices(self, cr, uid, ids, context={}):
+        order_obj = self.pool.get('sale.order')
+        newinv = []
+        data=self.read(cr,uid,ids)[0]
+        order_obj.action_invoice_create(cr, uid, context.get(('active_ids'),[]), data['grouped'],date_inv = data['invoice_date'])
+        for id in context.get(('active_ids'),[]):
+            wf_service = netsvc.LocalService("workflow")
+            wf_service.trg_validate(uid, 'sale.order', id, 'manual_invoice', cr)
+            
+        for o in order_obj.browse(cr, uid, context.get(('active_ids'),[]), context):
+            for i in o.invoice_ids:
+                newinv.append(i.id)
+        
+        mod_obj =self.pool.get('ir.model.data')
+        result = mod_obj._get_id(cr, uid, 'account', 'view_account_invoice_filter')
+        
+        id = mod_obj.read(cr, uid, result, ['res_id'])                
+        return {
+            'domain': "[('id','in', ["+','.join(map(str,newinv))+"])]",
+            'name': 'Invoices',
+            'view_type': 'form',
+            'view_mode': 'tree,form',
+            'res_model': 'account.invoice',
+            'view_id': False,
+            'context': "{'type':'out_refund'}",
+            'type': 'ir.actions.act_window',
+            'search_view_id': id['id']                
+        }
+
+sale_make_invoice()        
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/sale/wizard/sale_make_invoice.xml b/addons/sale/wizard/sale_make_invoice.xml
new file mode 100644
index 00000000000..ade720be1f4
--- /dev/null
+++ b/addons/sale/wizard/sale_make_invoice.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    	<record id="view_sale_order_make_invoice" model="ir.ui.view">
+            <field name="name">Create invoices</field>
+            <field name="model">sale.make.invoice</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+             <form string="Create invoices">
+				<separator colspan="4" string="Do you really want to create the invoices ?" />
+    			<field name="grouped" />
+    			<field name="invoice_date"/>
+             	<separator string="" colspan="6" />
+              	<button special="cancel" string="Cancel" icon="gtk-cancel"/>
+               	<button name="make_invoices" string="Create Invoices" type="object" icon="gtk-ok"/>
+             </form>
+            </field>
+		</record>
+
+        <act_window name="Make Invoices"		    
+		    res_model="sale.make.invoice"
+		    src_model="sale.order"
+		    view_mode="form"
+		    target="new"        
+            key2="client_action_multi"    
+		    id="action_view_sale_order_make_invoice"/>		
+
+    </data>
+</openerp>
diff --git a/addons/sale/wizard/sale_make_invoice_advance.py b/addons/sale/wizard/sale_make_invoice_advance.py
index 6c9ca17b836..2d5320d1ff6 100644
--- a/addons/sale/wizard/sale_make_invoice_advance.py
+++ b/addons/sale/wizard/sale_make_invoice_advance.py
@@ -24,7 +24,7 @@ from tools.translate import _
 import ir
 import netsvc
 import pooler
-import wizard
+
 
 
 class sale_advance_payment_inv(osv.osv_memory):

From 9d51a8b1b1a2857f554fde47d8b1932ff20e4019 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 18 May 2010 17:52:13 +0530
Subject: [PATCH 49/82] [Add] Stock: add the date_expected field

bzr revid: sbh@tinyerp.com-20100518122213-lnuk8ekpqlham4ez
---
 addons/stock/stock.py       |  5 +++--
 addons/stock/stock_view.xml | 13 +++++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index e96e86c5f09..17ad742fb7f 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1191,7 +1191,7 @@ class stock_move(osv.osv):
 
         'date': fields.datetime('Created Date'),
         'date_planned': fields.datetime('Date', required=True, help="Scheduled date for the movement of the products or real date if the move is done."),
-
+        'date_expected': fields.datetime('Date Expected', readonly=True,required=True, help="Scheduled date for the movement of the products"),
         'product_id': fields.many2one('product.product', 'Product', required=True, select=True),
 
         'product_qty': fields.float('Quantity', required=True),
@@ -1269,7 +1269,8 @@ class stock_move(osv.osv):
         'scraped' : lambda *a: False,
         'date_planned': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
         '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.move', context=c)
+        'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.move', context=c),
+        'date_expected': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),        
     }
 
     def copy(self, cr, uid, id, default=None, context={}):
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 33b62bf768e..054c56ea507 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -318,6 +318,7 @@
                     <field name="location_dest_id" select="1"/>
                     <field name="date" select="1"/>
                     <field name="date_planned" select="1" string="Date"/>
+                    <field name="date_expected" select="1" string="Date Expected"/>
                     <field name="state"/>
                 </tree>
             </field>
@@ -340,6 +341,7 @@
                     <field name="location_dest_id" select="1"/>
                     <field name="date" select="1"/>
                     <field name="date_planned" select="1" string="Date"/>
+ 					<field name="date_expected" select="1" string="Date Expected"/>                    
                     <field name="state"/>
                 </tree>
             </field>
@@ -623,6 +625,7 @@
                                     <field name="location_id"/>
                                     <field name="location_dest_id"/>
                                     <field name="date_planned"/>
+                                    <field name="date_expected" select="1" string="Date Expected"/>
                                     <field name="state"/>
                                     <button
                                         name="%(stock.track_line)d"
@@ -649,6 +652,7 @@
                                             <field colspan="4" invisible="1" name="name"/>
                                             <field invisible="1" name="date"/>
                                             <field name="date_planned"/>
+ 											<field name="date_expected" select="1" string="Date Expected"/>                                            
                                             <field name="address_id" context="{'contact_display':'partner'}"/>
                                             <field groups="base.group_extended" name="product_packaging"/>
                                             <field name="prodlot_id" groups="base.group_extended"
@@ -773,6 +777,7 @@
                                     <field name="location_id"/>
                                     <field name="location_dest_id"/>
                                     <field name="date_planned"/>
+ 									<field name="date_expected" select="1" string="Date Expected"/>                                    
                                     <field name="state"/>
                                     <button
                                            name="%(stock.track_line)d"
@@ -799,6 +804,7 @@
                                             <field colspan="4" invisible="1" name="name"/>
                                             <field invisible="1" name="date"/>
                                             <field name="date_planned"/>
+ 											<field name="date_expected"  string="Date Expected"/>                                            
                                             <field groups="base.group_extended" name="product_packaging"/>
                                             <field name="prodlot_id" groups="base.group_extended"
                                                 context="{'location_id':location_id, 'product_id':product_id}"
@@ -951,6 +957,7 @@
                                     <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"
@@ -977,6 +984,7 @@
                                             <field colspan="4" invisible="1" name="name"/>
                                             <field invisible="1" name="date"/>
                                             <field name="date_planned"/>
+ 											<field name="date_expected"  string="Date Expected"/>                                            
                                             <field groups="base.group_extended" name="product_packaging"/>
                                             <field name="prodlot_id" groups="base.group_extended"
                                                 context="{'location_id':location_id, 'product_id':product_id}"
@@ -1151,6 +1159,7 @@
                                             <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"/>                                            
                                             <newline/>
                                             <newline/>
                                             <field groups="base.group_extended" name="product_packaging"/>
@@ -1314,6 +1323,7 @@
                     <field name="location_id"/>
                     <field name="location_dest_id"/>
                     <field name="date_planned"/>
+					<field name="date_expected"/>              
                     <field name="state"/>
                 </tree>
             </field>
@@ -1352,6 +1362,7 @@
                                 <separator string="Dates &amp; Priority" colspan="2" />
                                 <field name="date"/>
                                 <field name="date_planned"/>
+								<field name="date_expected"/>                                
                                 <field name="priority"/>
                             </group>
 
@@ -1437,6 +1448,7 @@
                     <field name="product_uom" string="Uint Of Measure"/>
                     <field name="prodlot_id" string="Lot" groups="base.group_extended"/>
                     <field name="date_planned"/>
+                    <field name="date_expected"/>
                     <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"/>
@@ -1466,6 +1478,7 @@
                             <field name="date"/>
                             <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                             <field name="date_planned"/>
+                            <field name="date_expected"/>
                             <field name="priority"/>
                             <field name="address_id" context="{'contact_display':'partner'}"/>
                             <newline/>

From 0a6693e99d2bade254430c8aa6d95cb453d24609 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 18 May 2010 19:03:50 +0530
Subject: [PATCH 50/82] stock:  Add the difference between date date_planned
 and date_expected in report

bzr revid: sbh@tinyerp.com-20100518133350-4mamc77r6kdewh84
---
 addons/stock/report/report_stock_move.py       | 5 +++--
 addons/stock/report/report_stock_move_view.xml | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/stock/report/report_stock_move.py b/addons/stock/report/report_stock_move.py
index 11d855e63d9..69ceea1737c 100755
--- a/addons/stock/report/report_stock_move.py
+++ b/addons/stock/report/report_stock_move.py
@@ -44,7 +44,7 @@ class report_stock_move(osv.osv):
         'state': fields.selection([('draft', 'Draft'), ('waiting', 'Waiting'), ('confirmed', 'Confirmed'), ('assigned', 'Available'), ('done', 'Done'), ('cancel', 'Cancelled')], 'State', readonly=True, select=True,
                                   help='When the stock move is created it is in the \'Draft\' state.\n After that it is set to \'Confirmed\' state.\n If stock is available state is set to \'Avaiable\'.\n When the picking it done the state is \'Done\'.\
                                   \nThe state is \'Waiting\' if the move is waiting for another one.'),
-
+        'day_diff':fields.integer('Days difference',readonly=True),
     }
     
     def init(self, cr):
@@ -56,6 +56,7 @@ class report_stock_move(osv.osv):
                     to_char(date_trunc('day',m.date_planned), 'YYYY') as year,
                     to_char(date_trunc('day',m.date_planned), 'MM') as month,
                     to_char(date_trunc('day',m.date_planned), 'YYYY-MM-DD') as day,
+                    (date(m.date_planned)-date(m.date_expected)) as day_diff,
                     m.address_id as partner_id,
                     m.location_id as location_id,
                     m.location_dest_id as location_dest_id,
@@ -69,6 +70,6 @@ class report_stock_move(osv.osv):
                     m.product_id=pp.id and pp.product_tmpl_id=pt.id
                group by 
                     m.id, m.product_id,m.address_id, m.location_id, m.location_dest_id,
-                    m.date_planned, m.state, m.product_uom,pt.standard_price     )      
+                    m.date_planned, m.state, m.product_uom,pt.standard_price,m.date_expected     )      
         """)
 report_stock_move()
diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index 8a72f5182d8..3a7b233504a 100755
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -8,6 +8,7 @@
         <field name="arch" type="xml">
             <tree string="Stock Orders Statistics">
                 <field name="date_planned"/>
+                <field name="day_diff"/>
                 <field name="year" invisible="1" />
                 <field name="month" invisible="1"/>
                 <field name="day" invisible="1"/>

From 8ade28ed3834e098110f2b0043269bc0ad0d9c9a Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 19 May 2010 10:54:23 +0530
Subject: [PATCH 51/82] [IMP]stock: Chagned the name of field in report stock

bzr revid: sbh@tinyerp.com-20100519052423-m45bfitq6o8nrxjt
---
 addons/stock/report/report_stock_move.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/report/report_stock_move.py b/addons/stock/report/report_stock_move.py
index 69ceea1737c..8d905a4c4d7 100755
--- a/addons/stock/report/report_stock_move.py
+++ b/addons/stock/report/report_stock_move.py
@@ -44,7 +44,7 @@ class report_stock_move(osv.osv):
         'state': fields.selection([('draft', 'Draft'), ('waiting', 'Waiting'), ('confirmed', 'Confirmed'), ('assigned', 'Available'), ('done', 'Done'), ('cancel', 'Cancelled')], 'State', readonly=True, select=True,
                                   help='When the stock move is created it is in the \'Draft\' state.\n After that it is set to \'Confirmed\' state.\n If stock is available state is set to \'Avaiable\'.\n When the picking it done the state is \'Done\'.\
                                   \nThe state is \'Waiting\' if the move is waiting for another one.'),
-        'day_diff':fields.integer('Days difference',readonly=True),
+        'day_diff':fields.integer('Expected Performance',readonly=True),
     }
     
     def init(self, cr):

From 6b989fb40a4af91ee87c662676a8ed91cb506e39 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.com>
Date: Wed, 19 May 2010 11:16:38 +0530
Subject: [PATCH 52/82] [IMP] product: Task ID-351: Improved data for product
 UoM.(1) PCE should have a rounding of 1.0. (2) TON is 1000 times bigger than
 KGM.

bzr revid: uco@tinyerp.com-20100519054638-53sq53i9r0o3drk7
---
 addons/product/product_data.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/product/product_data.xml b/addons/product/product_data.xml
index 300a2b0f546..ce2cc1ee632 100644
--- a/addons/product/product_data.xml
+++ b/addons/product/product_data.xml
@@ -22,11 +22,12 @@
             <field name="name">PCE</field>
             <field name="factor">1.0</field>
             <field name="factor_inv_data">1.0</field>
+            <field name="rounding">1.0</field>
         </record>
         <record id="product_uom_kgm" model="product.uom">
             <field name="category_id" ref="product_uom_categ_kgm"/>
             <field name="name">KGM</field>
-            <field name="factor">1.0</field>
+            <field name="factor">1000.0</field>
             <field name="factor_inv_data">1.0</field>
         </record>
         <record id="uom_hour" model="product.uom">

From 8fe03ba26b7a1633c22c2654dd903f82e0550e32 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.com>
Date: Wed, 19 May 2010 14:50:16 +0530
Subject: [PATCH 53/82] [IMP] mrp_procurement, project_mrp: Task ID-574:
 Changed workflow for service product type.

bzr revid: uco@tinyerp.com-20100519092016-bces5rum9aott7ct
---
 addons/mrp/mrp_workflow.xml                   | 34 +----------
 .../mrp_procurement_workflow.xml              | 58 +++++++++----------
 addons/project_mrp/__openerp__.py             |  4 +-
 addons/project_mrp/project_mrp_workflow.xml   |  4 +-
 4 files changed, 35 insertions(+), 65 deletions(-)

diff --git a/addons/mrp/mrp_workflow.xml b/addons/mrp/mrp_workflow.xml
index 791c376ef92..6f7ef00b3d2 100644
--- a/addons/mrp/mrp_workflow.xml
+++ b/addons/mrp/mrp_workflow.xml
@@ -122,41 +122,9 @@
             <field name="subflow_id" search="[('osv','=','mrp.production')]"/>
             <field name="action">action_produce_assign_product()</field>
         </record>
-        <record id="act_produce_check" model="workflow.activity">
-            <field name="wkf_id" ref="mrp_procurement.wkf_procurement"/>
-            <field name="name">produce_check</field>
-        </record>
-        <record id="act_produce_service" model="workflow.activity">
-            <field name="wkf_id" ref="mrp_procurement.wkf_procurement"/>
-            <field name="name">produce_service</field>
-            <field name="kind">function</field>
-            <field name="action">action_produce_assign_service()</field>
-        </record>
-        
-        <record id="trans_confirm_mto_produce_check" model="workflow.transition">
-            <field name="act_from" ref="mrp_procurement.act_confirm_mto"/>
-            <field name="act_to" ref="act_produce_check"/>
-            <field name="condition">check_produce()</field>
-        </record>
-        <record id="trans_product_check_produce_service" model="workflow.transition">
-            <field name="act_from" ref="act_produce_check"/>
-            <field name="act_to" ref="act_produce_service"/>
-            <field name="condition">not check_product()</field>
-        </record>
-        
-        <record id="trans_produce_service_cancel" model="workflow.transition">
-            <field name="act_from" ref="act_produce_service"/>
-            <field name="act_to" ref="mrp_procurement.act_cancel"/>
-            <field name="signal">subflow.cancel</field>
-        </record>
-        
-        <record id="trans_produce_service_make_done" model="workflow.transition">
-            <field name="act_from" ref="act_produce_service"/>
-            <field name="act_to" ref="mrp_procurement.act_make_done"/>
-        </record>
         
         <record id="trans_product_check_produce" model="workflow.transition">
-            <field name="act_from" ref="act_produce_check"/>
+            <field name="act_from" ref="mrp_procurement.act_produce_check"/>
             <field name="act_to" ref="act_produce"/>
             <field name="condition">check_product()</field>
         </record>
diff --git a/addons/mrp_procurement/mrp_procurement_workflow.xml b/addons/mrp_procurement/mrp_procurement_workflow.xml
index 46c4a10fffc..5ab36dd4cb8 100644
--- a/addons/mrp_procurement/mrp_procurement_workflow.xml
+++ b/addons/mrp_procurement/mrp_procurement_workflow.xml
@@ -48,16 +48,16 @@
             <field name="kind">function</field>
             <field name="action">action_move_assigned()</field>
         </record>
-<!--        <record id="act_produce_check" model="workflow.activity">-->
-<!--            <field name="wkf_id" ref="wkf_procurement"/>-->
-<!--            <field name="name">produce_check</field>-->
-<!--        </record>-->
-<!--        <record id="act_produce_service" model="workflow.activity">-->
-<!--            <field name="wkf_id" ref="wkf_procurement"/>-->
-<!--            <field name="name">produce_service</field>-->
-<!--            <field name="kind">function</field>-->
-<!--            <field name="action">action_produce_assign_service()</field>-->
-<!--        </record>-->
+        <record id="act_produce_check" model="workflow.activity">
+            <field name="wkf_id" ref="wkf_procurement"/>
+            <field name="name">produce_check</field>
+        </record>
+        <record id="act_produce_service" model="workflow.activity">
+            <field name="wkf_id" ref="wkf_procurement"/>
+            <field name="name">produce_service</field>
+            <field name="kind">function</field>
+            <field name="action">action_produce_assign_service()</field>
+        </record>
         <record id="act_make_done" model="workflow.activity">
             <field name="wkf_id" ref="wkf_procurement"/>
             <field name="name">ready</field>
@@ -155,16 +155,16 @@
             <field name="act_to" ref="act_make_to_stock"/>
             <field name="condition">check_make_to_stock()</field>
         </record>
-<!--        <record id="trans_confirm_mto_produce_check" model="workflow.transition">-->
-<!--            <field name="act_from" ref="act_confirm_mto"/>-->
-<!--            <field name="act_to" ref="act_produce_check"/>-->
-<!--            <field name="condition">check_produce()</field>-->
-<!--        </record>-->
-<!--        <record id="trans_product_check_produce_service" model="workflow.transition">-->
-<!--            <field name="act_from" ref="act_produce_check"/>-->
-<!--            <field name="act_to" ref="act_produce_service"/>-->
-<!--            <field name="condition">not check_product()</field>-->
-<!--        </record>-->
+        <record id="trans_confirm_mto_produce_check" model="workflow.transition">
+            <field name="act_from" ref="act_confirm_mto"/>
+            <field name="act_to" ref="act_produce_check"/>
+            <field name="condition">check_produce()</field>
+        </record>
+        <record id="trans_product_check_produce_service" model="workflow.transition">
+            <field name="act_from" ref="act_produce_check"/>
+            <field name="act_to" ref="act_produce_service"/>
+            <field name="condition">not check_product()</field>
+        </record>
         <record id="trans_make_to_stock_make_done" model="workflow.transition">
             <field name="act_from" ref="act_make_to_stock"/>
             <field name="act_to" ref="act_make_done"/>
@@ -172,15 +172,15 @@
             <field name="trigger_model" eval="False"/>
             <field name="trigger_expr_id" eval="False"/>
         </record>
-<!--        <record id="trans_produce_service_cancel" model="workflow.transition">-->
-<!--            <field name="act_from" ref="act_produce_service"/>-->
-<!--            <field name="act_to" ref="act_cancel"/>-->
-<!--            <field name="signal">subflow.cancel</field>-->
-<!--        </record>-->
-<!--        <record id="trans_produce_service_make_done" model="workflow.transition">-->
-<!--            <field name="act_from" ref="act_produce_service"/>-->
-<!--            <field name="act_to" ref="act_make_done"/>-->
-<!--        </record>-->
+        <record id="trans_produce_service_cancel" model="workflow.transition">
+            <field name="act_from" ref="act_produce_service"/>
+            <field name="act_to" ref="act_cancel"/>
+            <field name="signal">subflow.cancel</field>
+        </record>
+        <record id="trans_produce_service_make_done" model="workflow.transition">
+            <field name="act_from" ref="act_produce_service"/>
+            <field name="act_to" ref="act_make_done"/>
+        </record>
         <record id="trans_make_done_done" model="workflow.transition">
             <field name="act_from" ref="act_make_done"/>
             <field name="act_to" ref="act_done"/>
diff --git a/addons/project_mrp/__openerp__.py b/addons/project_mrp/__openerp__.py
index 484b9a2e4f1..de8dd93d271 100644
--- a/addons/project_mrp/__openerp__.py
+++ b/addons/project_mrp/__openerp__.py
@@ -49,7 +49,9 @@ automatically created via sale orders.
     'website': 'http://www.openerp.com',
     'depends': ['project', 'mrp_procurement', 'sale', 'mrp_jit'],
     'init_xml': [],
-    'update_xml': ['project_mrp_workflow.xml', 'process/project_mrp_process.xml'],
+    'update_xml': ['project_mrp_workflow.xml', 
+                   #'process/project_mrp_process.xml',
+                   ],
     'demo_xml': [],
     'installable': True,
     'active': False,
diff --git a/addons/project_mrp/project_mrp_workflow.xml b/addons/project_mrp/project_mrp_workflow.xml
index a4f038f4ad2..43217d69f83 100644
--- a/addons/project_mrp/project_mrp_workflow.xml
+++ b/addons/project_mrp/project_mrp_workflow.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <openerp>
 <data>
-    <record model="workflow.transition" id="mrp.trans_produce_service_make_done">
-        <field name="act_from" ref="mrp.act_produce_service"/>
+    <record model="workflow.transition" id="mrp_procurement.trans_produce_service_make_done">
+        <field name="act_from" ref="mrp_procurement.act_produce_service"/>
         <field name="act_to" ref="mrp_procurement.act_make_done"/>
         <field name="signal">subflow.done</field>
     </record>

From d280a8380277365d4f9313eb8c7cdcf87ebeb78b Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 19 May 2010 15:37:21 +0530
Subject: [PATCH 54/82] [IMP] point_of_sale: Improve the yml statement

bzr revid: sbh@tinyerp.com-20100519100721-m94wgrgxjr7t514k
---
 addons/point_of_sale/test/pos_test.yml | 95 ++++++++++++--------------
 1 file changed, 45 insertions(+), 50 deletions(-)

diff --git a/addons/point_of_sale/test/pos_test.yml b/addons/point_of_sale/test/pos_test.yml
index eaafc9c8b2a..2303ccff00e 100644
--- a/addons/point_of_sale/test/pos_test.yml
+++ b/addons/point_of_sale/test/pos_test.yml
@@ -4,7 +4,7 @@
 -
  I  configure all details for the customer,Salesman  and  Product ,Account.
 - 
-  Creating an account.account.type record
+   I create View Account Type.
 - 
   !record {model: account.account.type, id: account_account_type_view0}:
     close_method: none
@@ -14,7 +14,7 @@
     
     
 - 
-  Creating an account.account.type record
+   I create Income Account Type.
 - 
   !record {model: account.account.type, id: account_account_type_income0}:
     close_method: unreconciled
@@ -24,7 +24,7 @@
     
     
 - 
-  Creating an account.account.type record
+   I create Expense Account Type.
 - 
   !record {model: account.account.type, id: account_account_type_expense0}:
     close_method: unreconciled
@@ -34,7 +34,7 @@
     
     
 - 
-  Creating an account.account.type record
+   I create Cash Account Type.
 - 
   !record {model: account.account.type, id: account_account_type_cash0}:
     close_method: balance
@@ -44,7 +44,7 @@
     
     
 - 
-  Creating an account.account record
+  I create Minimal Chart Account.
 - 
   !record {model: account.account, id: account_account_minimalchart0}:
     code: '0'
@@ -56,7 +56,7 @@
     type: view
     user_type: account_account_type_view0
 - 
-  Creating an account.account record
+   I create Payable Account.
 - 
   !record {model: account.account, id: account_account_payable1}:
     code: AP
@@ -72,7 +72,7 @@
     
     
 - 
-  Creating an account.account record
+   I create Receivable Account.
 - 
   !record {model: account.account, id: account_account_receivable0}:
     code: AR
@@ -88,7 +88,7 @@
     
     
 - 
-  Creating an account.account record
+  I create Cash Account.
 - 
   !record {model: account.account, id: account_account_cash0}:
     code: C
@@ -103,7 +103,7 @@
     
     
 - 
-  Creating an account.account record
+  I create Purchases Account.
 - 
   !record {model: account.account, id: account_account_purchases0}:
     code: P
@@ -116,7 +116,7 @@
     type: other
     user_type: account_account_type_expense0
 - 
-  Creating an account.account record
+   I create Sales Account.
 - 
   !record {model: account.account, id: account_account_sales0}:
     code: S
@@ -130,7 +130,7 @@
     user_type: account_account_type_income0
 
 - 
-  Creating an account.journal record
+  I create Purchase Journal.
 - 
   !record {model: account.journal, id: account_journal_purchasejournal0}:
     code: PUJ
@@ -144,7 +144,7 @@
     
     
 - 
-  Creating an account.journal record
+   I create Sale Journal.
 - 
   !record {model: account.journal, id: account_journal_salejournal0}:
     code: SAJ
@@ -158,7 +158,7 @@
     
     
 - 
-  Creating an account.journal record
+   I create Bank Journal.
 - 
   !record {model: account.journal, id: account_journal_bankjournal0}:
     code: BNK
@@ -172,7 +172,7 @@
     
     
 - 
-  Creating a ir.property record
+  I create property for account payable.
 - 
   !record {model: ir.property, id: ir_property_propertyaccountexpensecateg0}:
     company_id: base.main_company
@@ -182,7 +182,7 @@
     
     
 - 
-  Creating a ir.property record
+   I create property for account receivable.
 - 
   !record {model: ir.property, id: ir_property_propertyaccountincomecateg0}:
     company_id: base.main_company
@@ -190,12 +190,12 @@
     name: property_account_income_categ
     value_reference: account.account,6
 - 
-  Creating a res.partner.category record
+  I create Partner category Customers.
 - 
   !record {model: res.partner.category, id: res_partner_category_customers0}:
     name: Customers
 -
-  Creating an res.partner record
+  I create partner
 - 
   !record {model: res.partner, id: res_partner_cleartrail0}:
     category_id:
@@ -204,7 +204,7 @@
     
     
 - 
-  Creating an res.partner.address record
+ I create partner address.
 - 
   !record {model: res.partner.address, id: res_partner_address_1}:
     partner_id: res_partner_cleartrail0
@@ -213,7 +213,7 @@
     
     
 - 
-  Creating an res.partner.address record
+  I create partner  invoice address.
 - 
   !record {model: res.partner.address, id: res_partner_address_2}:
     partner_id: res_partner_cleartrail0
@@ -221,21 +221,18 @@
     
     
 - 
-  Creating an res.partner.address record
+ I create partner delivery address.
 - 
   !record {model: res.partner.address, id: res_partner_address_3}:
     partner_id: res_partner_cleartrail0
     street: sangam house 15 B palasia, A B Road
     type: delivery
 -
-  Customer Cleartrail has specific instrument requirements regarding the stockable products
-- 
-  Creating an product.category record
 - 
   !record {model: product.category, id: product_category_allproductssellable0}:
     name: Mobile Products Sellable
 -
-  Creating a res.partner record
+   I create partner.
 - 
   !record {model: res.partner, id: res_partner_microlinktechnologies0}:
     address:
@@ -246,23 +243,20 @@
     supplier: true        
     
 -
-  Creating a res.partner.address record
+  I create partner address .
 - 
   !record {model: res.partner.address, id: res_partner_address_0}:
     country_id: base.in
     partner_id: res_partner_microlinktechnologies0
     street: Ash House, Ash Road
     title: Ms.
-    
-                   
-    
 - 
-  Creating an product.category record
+  I create product category .
 - 
   !record {model: product.category, id: product_category_services0}:
     name: Mobile Services
 - 
-  Creating an product.template record
+  I create product template .
 - 
   !record {model: product.template, id: product_template_lgviewtysmart0}:
     categ_id: product_category_allproductssellable0
@@ -278,7 +272,7 @@
     uom_po_id: product.product_uom_unit
     
 -    
-  Creating an product.product record
+  I create product  LG Viewty Smart.
 - 
   !record {model: product.product, id: product_product_lgviewtysmart0}:
     categ_id: product_category_allproductssellable0
@@ -296,13 +290,15 @@
     supply_method: produce
     type: product
     uom_id: product.product_uom_unit
-    uom_po_id: product.product_uom_unit    
+    uom_po_id: product.product_uom_unit
+-  
+  I create product category .        
 -
   !record {model: product.category, id: product_category_computer0}:
     name: Computer
 
 - 
-  Creating a product.product record
+  I create product  HP Pavilion Desktop PCs
 - 
   !record {model: product.product, id: product_product_hppaviliondesktoppcs0}:
     categ_id: product_category_computer0
@@ -322,8 +318,10 @@
     property_account_expense: account_account_payable1
     property_account_income: account_account_receivable0
 - 
-  Creating a pos.order record
-- 
+-  
+  I create New Order with adding the details of Salesman and  "Product" as LG Viewty Smart Quantity as 10.
+-
+
   !record {model: pos.order, id: pos_order_pos0}:
     company_id: base.main_company
     date_order: '2010-05-13 15:02:48'
@@ -357,13 +355,13 @@
       ref("pos_order_pos0"), })
     
 - 
-  Creating a pos.open.statement record
+  I Open the registered .
 - 
   !record {model: pos.open.statement, id: pos_open_statement_0}:
     {}
     
 - 
-  Performing an osv_memory action open_statement on module pos.open.statement
+  I Open the statement.
 - 
   !python {model: pos.open.statement}: |
     self.open_statement(cr, uid, [ref("pos_open_statement_0")], {"lang": "en_US", "active_model":
@@ -371,7 +369,7 @@
       False, "active_id": ref("point_of_sale.menu_open_statement"), })
      
 -
- Creating a pos.make.payment record
+  I click on  the wizard "Make Payment" 
 - 
   !record {model: pos.make.payment, id: pos_make_payment_0}:
     amount: 1615.0
@@ -381,7 +379,7 @@
     product_id: product_product_hppaviliondesktoppcs0
     
 - 
-   For payment  I click on  Make Payment. 
+  I make the payment.
 - 
   !python {model: pos.make.payment}: |
     self.check(cr, uid, [ref("pos_make_payment_0")], {"lang": "en_US", "active_model":
@@ -399,16 +397,16 @@
 -
   1. Cancel 2.Return Goods and Exchange 3.Return without Refund
 -
-  When i click on  Return Goods and Exchange   
+  When i click on  Return Goods and Exchange .  
 -  
   Then allows me to define the quantity of products, which will return to the stock. 
 - 
-  Creating a pos.return record
+  I click on Return Picking button.
 - 
   !record {model: pos.return, id: pos_return_0}:
    {}
 - 
-  Performing an osv_memory action create_returns on module pos.return
+  I Return the product.
 - 
   !python {model: pos.return}: |
     self.create_returns(cr, uid, [ref("pos_return_0")], {"lang": "en_US", "active_model":
@@ -419,7 +417,7 @@
 - 
   Then allows me to define the quantity of products, which will return to the stock.
 -
-  I have select the  HP Pavilion Desktop PCs for exchange   
+  I have select the  HP Pavilion Desktop PCs for exchange.   
 - 
   !record {model: pos.add.product, id: pos_add_product_0}:
     product_id: product_product_hppaviliondesktoppcs0
@@ -433,7 +431,7 @@
       })
        
 -    
-  Creating a pos.make.payment record
+  I create payment.
 - 
   !record {model: pos.make.payment, id: pos_make_payment_1}:
     amount: 680.0
@@ -451,12 +449,10 @@
       False, "active_id": ref("pos_order_pos0"), })    
 
 - 
-  Creating a pos.return record
+  To check the Return without Refund . I click button "Return without Refund ".
 - 
   !record {model: pos.return, id: pos_return_0}:
    {}
-- 
-  To check the Return without Refund . I click button "Return without Refund ".
 -
   The quantity which are selected in Return lines wizard are refunded..
 - 
@@ -465,13 +461,12 @@
       "pos.order", "active_ids": [ref("pos_order_pos0")], "tz":
       False, "active_id": ref("pos_order_pos0"), })
 - 
-  Creating a pos.confirm record
+  To Close order   I use the wizard "Sale Confirm".
 - 
   !record {model: pos.confirm, id: pos_confirm_0}:
     {}
-    
 - 
- I have close this order
+  I have close this order.
 - 
   !python {model: pos.confirm}: |
     self.action_confirm(cr, uid, [ref("pos_confirm_0")], {"lang": "en_US", "active_model":

From 3b7c13c1421c0927d18b397425f6bada4b5508b1 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 19 May 2010 15:59:46 +0530
Subject: [PATCH 55/82] [IMP] point_of_sale,delivery, purchase_requisition:
 Improve the yml statement

bzr revid: sbh@tinyerp.com-20100519102946-b04oip1tyrl5c0hx
---
 addons/delivery/test/delivery_test.yml        | 14 ++++++-------
 addons/point_of_sale/test/pos_test.yml        |  2 +-
 .../test/purchase_requisition.yml             | 21 ++++++++-----------
 .../test/purchase_requisition_exclusive.yml   | 16 +++++++-------
 4 files changed, 25 insertions(+), 28 deletions(-)

diff --git a/addons/delivery/test/delivery_test.yml b/addons/delivery/test/delivery_test.yml
index 700ff046a0e..cbc30822368 100644
--- a/addons/delivery/test/delivery_test.yml
+++ b/addons/delivery/test/delivery_test.yml
@@ -5,9 +5,9 @@
      Delivery based on delivered quantities.
   
 -     
- I create the partner associated with the transport
+ I create the partner associated with the transport.
 - 
-  Creating a res.partner record
+  I create partner.
 - 
   !record {model: res.partner, id: res_partner_thepost0}:
     address:
@@ -37,7 +37,7 @@
     
 -    
 
-  I create the Delivery Method
+  I create the Delivery Method.
 - 
   !record {model: delivery.carrier, id: delivery_carrier_theopenerpexperss0}:
     name: The OpenERP Experss
@@ -45,7 +45,7 @@
     product_id: product_product_deliverybypost0
 - 
   I create a delivery grid record and define the region for which the tariffs in the grid will be applicable.
-  Then set the condition for which this rule is applicable
+  Then set the condition for which this rule is applicable.
 - 
   !record {model: delivery.grid, id: delivery_grid_weight0}:
     carrier_id: delivery_carrier_theopenerpexperss0
@@ -76,7 +76,7 @@
     sequence: 1
     
 -
-  To check the Delivery based on order quantities , I have created sale order and picking_policy is direct
+  To check the Delivery based on order quantities , I have created sale order and picking_policy is direct .
 - 
   !record {model: sale.order, id: sale_order_so0}:
     date_order: '2010-05-11'
@@ -150,13 +150,13 @@
 - 
   !workflow {model: sale.order, action: order_confirm, ref: sale_order_test_complete0}
 - 
-  Creating a stock.invoice.onshipping record
+  I Create stock.invoice.onshipping 
 - 
   !record {model: stock.invoice.onshipping, id: stock_invoice_onshipping_0}:
     journal_id: account.sales_journal
     type: out_invoice
 - 
-  Create a Invoice form picking.
+  I Create  Invoice form picking.
 - 
   !python {model: stock.invoice.onshipping}: |
     so=self.pool.get('sale.order').browse(cr,uid,ref('sale_order_test_complete0')) 
diff --git a/addons/point_of_sale/test/pos_test.yml b/addons/point_of_sale/test/pos_test.yml
index 2303ccff00e..427362cc459 100644
--- a/addons/point_of_sale/test/pos_test.yml
+++ b/addons/point_of_sale/test/pos_test.yml
@@ -317,7 +317,7 @@
     uom_po_id: product.product_uom_unit
     property_account_expense: account_account_payable1
     property_account_income: account_account_receivable0
-- 
+ 
 -  
   I create New Order with adding the details of Salesman and  "Product" as LG Viewty Smart Quantity as 10.
 -
diff --git a/addons/purchase_requisition/test/purchase_requisition.yml b/addons/purchase_requisition/test/purchase_requisition.yml
index 6a8d52ed201..ff3f10bc425 100644
--- a/addons/purchase_requisition/test/purchase_requisition.yml
+++ b/addons/purchase_requisition/test/purchase_requisition.yml
@@ -27,7 +27,7 @@
     weight_net: 0.0
     list_price: 100.0    
 - 
-  Then I sell 5 Laptop ACER to the customer Agrolait, sale order TEST/TENDER/0001
+  Then I sell 5 Laptop ACER to the customer Agrolait, sale order TEST/TENDER/0001.
 - 
   !record {model: sale.order, id: sale_order_testtender0}:
     date_order: '2010-05-10'
@@ -54,7 +54,7 @@
     shop_id: sale.shop
         
 - 
-  Performing a workflow action order_confirm on module sale.order
+  I confirm the sale order.
 - 
   !workflow {model: sale.order, action: order_confirm, ref: sale_order_testtender0}
     
@@ -66,17 +66,14 @@
     proc_obj._procure_confirm(cr,uid)
 -
   On the purchase tender, I create a new purchase order for the supplier 'DistriPC' by clicking on
-  
-- 
-  Creating a purchase.requisition.partner record
-  
+  the button 'New RfQ'. This opens a window to ask me the supplier and I set DistriPC . 
 - 
   !record {model: purchase.requisition.partner, id: purchase_requisition_partner_0}:
     partner_address_id: base.res_partner_address_7
     partner_id: base.res_partner_4
     
 - 
-  Performing an osv_memory action create_order on module purchase.requisition.partner
+  I create a new purchase order .
   
 - 
   !python {model: purchase.requisition.partner}: |
@@ -120,7 +117,7 @@
     line_obj.write(cr, uid, order_line1, {'product_qty':2})
     line_obj.write(cr, uid, order_line2, {'product_qty':3})  
 -
-  I confirm and validate both purchase orders
+  I confirm and validate both purchase orders.
   
 -
   !python {model: purchase.order}: |
@@ -132,7 +129,7 @@
       wf_service.trg_validate(uid, 'purchase.order',id,'purchase_approve', cr) 
    
 -
-  I check that the delivery order of the customer is in state 'Waiting Goods'
+  I check that the delivery order of the customer is in state 'Waiting Goods'.
   
 -
   !python {model: stock.picking }: |
@@ -143,7 +140,7 @@
       assert(pick.move_lines[0].state=='wating'),'Order is  not wating"'
 
 -
-  I receive the order of the supplier Asustek from the Incoming Products menu
+  I receive the order of the supplier Asustek from the Incoming Products menu.
   
 -
   !python {model: stock.picking }: |
@@ -167,7 +164,7 @@
       } 
      self.do_partial(cr, uid, picking_id,partial_datas)
 -
- I receive the order of the supplier DistriPC from the Incoming Shipments menu
+ I receive the order of the supplier DistriPC from the Incoming Shipments menu.
  
 -   
   !python {model: stock.picking }: |
@@ -189,7 +186,7 @@
       } 
       self.do_partial(cr, uid, picking_id,partial_datas)
 -
-  Now, I can check that the delivery order of the customer is in the state Available
+  Now, I can check that the delivery order of the customer is in the state Available.
   
 -
   !python {model: stock.picking }: |
diff --git a/addons/purchase_requisition/test/purchase_requisition_exclusive.yml b/addons/purchase_requisition/test/purchase_requisition_exclusive.yml
index 030b80b2260..42eb34ea725 100644
--- a/addons/purchase_requisition/test/purchase_requisition_exclusive.yml
+++ b/addons/purchase_requisition/test/purchase_requisition_exclusive.yml
@@ -50,19 +50,19 @@
     pricelist_id: product.list0
     shop_id: sale.shop    
 - 
-  Performing a workflow action order_confirm on module sale.order
+  I confirm  sale order.
 - 
   !workflow {model: sale.order, action: order_confirm, ref: sale_order_testtender1}
 
 - 
-  I launch he scheduler to compute all procurements, and planify all requisitions orders
+  I launch he scheduler to compute all procurements, and planify all requisitions orders.
 -  
   !python {model: mrp.procurement.compute.all}: |
     proc_obj = self.pool.get('mrp.procurement')
     proc_obj._procure_confirm(cr,uid)
 -
   I should find a purchase requisition with the origin 'TEST/TENDER/0002', that includes a request for
-  5 Laptop ACER, and a purchase order on the default supplier for this product
+  5 Laptop ACER, and a purchase order on the default supplier for this product.
 -    
  !python {model: purchase.requisition}: |
     requisition_ids =self.search(cr, uid, [('origin','=','TEST/TENDER/0002')])
@@ -70,16 +70,16 @@
     assert len(requisition_ids), "Purchase requisition  hasn't Created"
 -
   On the purchase tender, I create a new purchase order for the supplier 'DistriPC' by clicking on
-  the button 'New RfQ'. This opens a window to ask me the supplier and I set DistriPC  
+  the button 'New RfQ'. This opens a window to ask me the supplier and I set DistriPC .
 - 
-  Creating a purchase.requisition.partner record
+  I Create  purchase.requisition.partner .
 - 
   !record {model: purchase.requisition.partner, id: purchase_requisition_partner_0}:
     partner_address_id: base.res_partner_address_7
     partner_id: base.res_partner_4
         
 - 
-  Performing an osv_memory action create_order on module purchase.requisition.partner
+  I create a new purchase order for the supplier 'DistriPC'.
 - 
   !python {model: purchase.requisition.partner}: |
     req_obj = self.pool.get('purchase.requisition')
@@ -91,11 +91,11 @@
 -
   I set the purchase tender as 'Exclusive'      
 - 
- !python {model: purchase.requisition}: |
+  !python {model: purchase.requisition}: |
     ids =self.search(cr, uid, [('origin','=','TEST/TENDER/0002')])
     self.write(cr,uid,ids[0],{'exclusive': 'exclusive' })
 -
- I confirm and validate the RfQ of ASUStek      
+  I confirm and validate the RfQ of ASUStek.      
 -
  !python {model: purchase.order}: |
     partner_id=self.pool.get('res.partner').search(cr,uid,[('name','=','ASUStek')])[0]

From 21d71d4d96f3bdfe340a1e0459ef3d0e20810db8 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 19 May 2010 16:18:42 +0530
Subject: [PATCH 56/82] [IMP] stock : Improve the yml statement

bzr revid: sbh@tinyerp.com-20100519104842-2xbh3qs7yk9ni5ol
---
 addons/stock/test/stock_test.yml | 56 +++++++++++++-------------------
 1 file changed, 23 insertions(+), 33 deletions(-)

diff --git a/addons/stock/test/stock_test.yml b/addons/stock/test/stock_test.yml
index 0922c2f975e..6a9bf3ff9f3 100644
--- a/addons/stock/test/stock_test.yml
+++ b/addons/stock/test/stock_test.yml
@@ -4,7 +4,7 @@
   create physical inventory ,fill inventory lines from location,split inventory line into production lot
      
 - 
-  Creating a account.account.type record
+  I create Asset Account Type.
 - 
   !record {model: account.account.type, id: account_account_type_asset0}:
     close_method: balance
@@ -12,18 +12,8 @@
     name: Asset
     sign: 1
     
-    
 - 
-  Creating a account.account.type record
-- 
-  !record {model: account.account.type, id: account_account_type_liability0}:
-    close_method: balance
-    code: liability
-    name: Liability
-    sign: 1    
-    
-- 
-  Creating a account.account.type record
+   I create Income Account Type.
 - 
   !record {model: account.account.type, id: account_account_type_income0}:
     close_method: unreconciled
@@ -33,7 +23,7 @@
     
     
 - 
-  Creating a account.account.type record
+  I create Expense Account Type.
 - 
   !record {model: account.account.type, id: account_account_type_expense0}:
     close_method: unreconciled
@@ -41,7 +31,7 @@
     name: Expense
     sign: 1    
 - 
-  Creating a account.account.type record
+  I create Cash Account Type.
 - 
   !record {model: account.account.type, id: account_account_type_cash0}:
     close_method: balance
@@ -51,7 +41,7 @@
     
     
 - 
-  Creating a account.account.type record
+  I create Receivable Account Type.
 - 
   !record {model: account.account.type, id: account_account_type_receivable0}:
     close_method: balance
@@ -60,7 +50,7 @@
     sign: 1
 -
  
-  Creating a account.account record
+  I create Receivable Account .
 - 
   !record {model: account.account, id: account_account_receivable0}:
     code: '40000'
@@ -72,7 +62,7 @@
     type: receivable
     user_type: account_account_type_receivable0
 - 
-  Creating a account.account record
+  I create Payable Account.
 - 
   !record {model: account.account, id: account_account_payable0}:
     code: '440000'
@@ -84,7 +74,7 @@
     type: payable
     user_type: account_account_type_expense0    
 - 
-  Creating a account.journal record
+  I create Purchase Journal.
 - 
   !record {model: account.journal, id: account_journal_purchasejournal0}:
     code: pur
@@ -95,18 +85,18 @@
     view_id: account.account_journal_bank_view
     
 - 
-  Creating a account.journal record
+  I create Sale Journal.
 - 
   !record {model: account.journal, id: account_journal_salejouran0}:
     code: sal
     company_id: base.main_company
-    name: Sale Jouran
+    name: Sale Journal
     sequence_id: account.sequence_sale_journal
     type: sale
     view_id: account.account_journal_view
     
 - 
-  Creating a account.account record
+  I create Expense Account.
 - 
   !record {model: account.account, id: account_account_expenseaccount0}:
     code: Expe
@@ -118,7 +108,7 @@
     type: consolidation
     user_type: account_account_type_asset0
 - 
-  Creating a account.account record
+  I create Product Sale Account.
 - 
   !record {model: account.account, id: account_account_productsale0}:
     code: '001'
@@ -130,7 +120,7 @@
     
     
 - 
-  Creating a account.account record
+  I create Product Purchase Account.
 - 
   !record {model: account.account, id: account_account_productpurchase0}:
     code: '0002'
@@ -141,7 +131,7 @@
     user_type: account_account_type_expense0
         
 - 
-  Creating a res.partner record
+  I create partner.
 - 
   !record {model: res.partner, id: res_partner_shawtrust0}:
     address:
@@ -152,7 +142,7 @@
     property_account_payable: account_account_payable0
     property_account_receivable: account_account_receivable0
 -    
-  Creating a res.partner record
+  I create partner.
 - 
   !record {model: res.partner, id: res_partner_diasorinltd0}:
     address:
@@ -163,7 +153,7 @@
     
         
 -
-  Creating a res.partner record
+  I create partner.
 - 
   !record {model: res.partner, id: res_partner_microlinktechnologies0}:
     address:
@@ -174,7 +164,7 @@
     supplier: true        
     
 -
-  Creating a res.partner.address record
+  I create partner address.
 - 
   !record {model: res.partner.address, id: res_partner_address_0}:
     country_id: base.in
@@ -184,13 +174,13 @@
     
                
 -     
-  Creating a product.category record
+  I create  product.category .
 - 
   !record {model: product.category, id: product_category_computer0}:
     name: Computer
 
 - 
-  Creating a product.product record
+   I create  product HP Pavilion Desktop PCs .
 - 
   !record {model: product.product, id: product_product_hppaviliondesktoppcs0}:
     categ_id: stock.product_category_computer0
@@ -211,7 +201,7 @@
     property_account_income: account_account_productsale0    
     
 - 
-  Creating a product.product record
+  I create  product HP CD writers.
 - 
   !record {model: product.product, id: product_product_hpcdwriters0}:
     categ_id: stock.product_category_computer0
@@ -259,7 +249,7 @@
   !python {model: stock.inventory}: |
    self.action_done(cr,uid,[ref('stock_inventory_physicalinventoy0')])
 - 
-  Creating a stock.fill.inventory record
+  I create stock.fill.inventory .
 - 
   !record {model: stock.fill.inventory, id: stock_fill_inventory_0}:
     location_id: stock.stock_location_stock
@@ -273,7 +263,7 @@
       [ref("stock_inventory_physicalinventoy0")], "active_id": ref("stock_inventory_physicalinventoy0"), })
 
 - 
-  Creating a stock.move.split record.
+  I create stock.move.split record.
 - 
   !record {model: stock.move.split, id: stock_move_split_0}:
     line_ids:
@@ -283,7 +273,7 @@
     
     
 - 
-  Split into production line.
+  I Split into production line.
 - 
   !python {model: stock.move.split}: |
     move_obj=self.pool.get('stock.move')

From 0cfb77445ffd84b94172dddbc294250cc9e88e39 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 19 May 2010 17:14:36 +0530
Subject: [PATCH 57/82] Task-ID 506:put help tooltips for pruchase_requisition
 module in installer wizard and change and improve the label of button in
 quotation tab

bzr revid: sbh@tinyerp.com-20100519114436-il3v5xl7w9ivuj09
---
 addons/purchase/wizard/purchase_installer.py                    | 2 +-
 addons/purchase_requisition/purchase_requisition_view.xml       | 2 +-
 .../wizard/purchase_requisition_partner_view.xml                | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/purchase/wizard/purchase_installer.py b/addons/purchase/wizard/purchase_installer.py
index da2c3f41cca..a6e25375bc1 100644
--- a/addons/purchase/wizard/purchase_installer.py
+++ b/addons/purchase/wizard/purchase_installer.py
@@ -25,7 +25,7 @@ class purchase_installer(osv.osv_memory):
     _inherit = 'res.config.installer'
 
     _columns = {
-        'purchase_requisition':fields.boolean('Purchase Requisition'),
+        'purchase_requisition':fields.boolean('Purchase Requisition',help="Manage your Purchase Requisition and regroup and  allow you to easily keep track and order all your purchase orders."),
         }
 purchase_installer()
 
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index 96488f4eb72..174bfe11bf2 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -72,7 +72,7 @@
                     </page>
                     <page string="Quotations">
                      	<group col="8" colspan="4">
-                    	<button name="%(action_purchase_requisition_partner)d" string="New RfQr" type="action" />
+                    	<button name="%(action_purchase_requisition_partner)d" string="Requests for Quotation" type="action" icon="gtk-execute" />
                     	 <label colspan="6"  string=""/>
                     	  </group>
                     	<field name="purchase_ids" nolabel="1" colspan="4"/>
diff --git a/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml b/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml
index abac95bba16..c7a38cf64e1 100644
--- a/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml
+++ b/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml
@@ -9,6 +9,7 @@
               	<form string="Purchase Requisition">
               		 <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
               		 <field domain="[('partner_id','=',partner_id)]" name="partner_address_id"/>
+              		  <separator string="" colspan="4" />
 		              <group colspan="4" col="6">
 		            		<button  icon="gtk-cancel" special="cancel" string="_Cancel"/>
 		            		<button icon="gtk-ok" name="create_order" string="Create Orders" type="object"/>

From 58cc50fcb171e54efc204cdc9934253aaa86cd61 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 19 May 2010 17:36:47 +0530
Subject: [PATCH 58/82] [IMP] purchase_requisition: Improve the view

bzr revid: sbh@tinyerp.com-20100519120647-7g9usd9k6frl0v39
---
 .../purchase_requisition_view.xml             | 28 +++++++++++++------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index 174bfe11bf2..6b31d75e70e 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -67,16 +67,28 @@
 						<button name="tender_cancel" states="draft,in_progress" string="Cancel" type="object" icon="gtk-cancel" />
 	                </group>                        
                     </page>
-                    <page string="Notes">
+                    <page string="Quotations">
+						<field colspan="4" name="purchase_ids" nolabel="1" mode="tree,form">
+							<tree string="Purchase Order">
+			                    <field name="name" string="Reference"/>
+			                    <field name="date_order" string="Order Date"/>
+			                    <field name="partner_id"/>
+			                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+			                    <field name="location_id"/>
+			                    <field name="minimum_planned_date"/>
+			                    <field name="origin"/>
+			                    <field name="state"/>	
+			                    </tree>	
+                     	</field>
+						<separator colspan="4" string=""/>
+                     	<group col="8" colspan="4">
+                     	 <label colspan="6"  string=""/>
+						<button name="%(action_purchase_requisition_partner)d" string="Requests for Quotation" type="action" icon="gtk-execute" />
+                    	</group>
+                   </page>
+					<page string="Notes">
                         <field name="description" colspan="4" nolabel="1"/>
                     </page>
-                    <page string="Quotations">
-                     	<group col="8" colspan="4">
-                    	<button name="%(action_purchase_requisition_partner)d" string="Requests for Quotation" type="action" icon="gtk-execute" />
-                    	 <label colspan="6"  string=""/>
-                    	  </group>
-                    	<field name="purchase_ids" nolabel="1" colspan="4"/>
-                   </page>
                 </notebook>
             </form>
         </field>

From 8c85100d8deebc0a89c5578702cca526cf653ee7 Mon Sep 17 00:00:00 2001
From: mso <mso@mso>
Date: Wed, 19 May 2010 18:53:58 +0530
Subject: [PATCH 59/82] [FIX] sale, purchase_manual: grouped field is removed
 from the sale order line invoice wizard and purchase_manual folder removed

bzr revid: mso@mso-20100519132358-d5saa7guv5rmzghz
---
 addons/sale/wizard/sale_line_invoice.py  | 7 -------
 addons/sale/wizard/sale_line_invoice.xml | 2 --
 2 files changed, 9 deletions(-)

diff --git a/addons/sale/wizard/sale_line_invoice.py b/addons/sale/wizard/sale_line_invoice.py
index 4bf3074db54..5ce0ac1c62f 100644
--- a/addons/sale/wizard/sale_line_invoice.py
+++ b/addons/sale/wizard/sale_line_invoice.py
@@ -29,13 +29,6 @@ import pooler
 class sale_order_line_make_invoice(osv.osv_memory):
     _name = "sale.order.line.make.invoice"
     _description = "Sale OrderLine Make_invoice"
-    _columns = {
-        'grouped': fields.boolean('Group the invoices'),
-    }
-    _default = {
-        'grouped' : lambda *a: False
-    }
-
     def make_invoices(self, cr, uid, ids, context):
         """ 
              To make invoices.
diff --git a/addons/sale/wizard/sale_line_invoice.xml b/addons/sale/wizard/sale_line_invoice.xml
index 90bdf2a6828..436fabc91fc 100644
--- a/addons/sale/wizard/sale_line_invoice.xml
+++ b/addons/sale/wizard/sale_line_invoice.xml
@@ -8,8 +8,6 @@
             <field name="arch" type="xml">
              <form string="Create invoices">
     			<separator colspan="4" string="Do you really want to create the invoices ?" />
-    			<field name="grouped" />
-             	<separator string="" colspan="6" />
               	<button special="cancel" string="Cancel" icon="gtk-cancel"/>
                	<button name="make_invoices" string="Create Invoices" type="object" icon="gtk-ok"/>
              </form>

From 9186cf6e51f3ce6799957654b9b612b7f0b13b9c Mon Sep 17 00:00:00 2001
From: Launchpad Code Hosting <codehost@crowberry>
Date: Thu, 20 May 2010 06:23:30 +0100
Subject: [PATCH 60/82] Launchpad automatic translations update.

bzr revid: codehost@crowberry-20100520052330-o8ookyl26b0drea8
---
 addons/account_chart/i18n/th.po     |  23 +++
 addons/base_setup/i18n/th.po        | 277 ++++++++++++++++++++++++++++
 addons/board_association/i18n/lt.po |   8 +-
 addons/project/i18n/lt.po           |  12 +-
 4 files changed, 310 insertions(+), 10 deletions(-)
 create mode 100644 addons/account_chart/i18n/th.po
 create mode 100644 addons/base_setup/i18n/th.po

diff --git a/addons/account_chart/i18n/th.po b/addons/account_chart/i18n/th.po
new file mode 100644
index 00000000000..9b4d7b21560
--- /dev/null
+++ b/addons/account_chart/i18n/th.po
@@ -0,0 +1,23 @@
+# Thai 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-05-20 04:33+0000\n"
+"Last-Translator: Songpon Phusing <p.songpon@gmail.com>\n"
+"Language-Team: Thai <th@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-20 05:23+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_chart
+#: model:ir.module.module,description:account_chart.module_meta_information
+msgid "Remove minimal account chart"
+msgstr "ทำการลบตัวอย่างผังบัญชีแบบง่าย"
diff --git a/addons/base_setup/i18n/th.po b/addons/base_setup/i18n/th.po
new file mode 100644
index 00000000000..e4c04634f12
--- /dev/null
+++ b/addons/base_setup/i18n/th.po
@@ -0,0 +1,277 @@
+# Thai 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-05-20 04:32+0000\n"
+"Last-Translator: Songpon Phusing <p.songpon@gmail.com>\n"
+"Language-Team: Thai <th@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-20 05:23+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: base_setup
+#: wizard_field:base_setup.base_setup,company,city:0
+#: wizard_field:base_setup.base_setup,init,city:0
+#: wizard_field:base_setup.base_setup,update,city:0
+msgid "City"
+msgstr "อำเภอ"
+
+#. module: base_setup
+#: wizard_view:base_setup.base_setup,finish:0
+msgid ""
+"You can start configuring the system or connect directly to the database "
+"using the default setup."
+msgstr "คุณอาจจะเริ่มตั้งค่าหรือใช้ค่าพื้นฐานเบื้องต้น"
+
+#. module: base_setup
+#: wizard_field:base_setup.base_setup,company,zip:0
+#: wizard_field:base_setup.base_setup,init,zip:0
+#: wizard_field:base_setup.base_setup,update,zip:0
+msgid "Zip code"
+msgstr "รหัสไปรษณีย์"
+
+#. module: base_setup
+#: wizard_view:base_setup.base_setup,init:0
+msgid "Select a Profile"
+msgstr "เลือกแบบ"
+
+#. module: base_setup
+#: wizard_view:base_setup.base_setup,company:0
+msgid "Report header"
+msgstr "หัวรายงาน"
+
+#. module: base_setup
+#: wizard_button:base_setup.base_setup,finish,config:0
+msgid "Start Configuration"
+msgstr "เริ่มการตั้งค่า"
+
+#. module: base_setup
+#: wizard_view:base_setup.base_setup,init:0
+msgid ""
+"You'll be able to install more modules later through the Administration menu."
+msgstr "คุณสามารถลงโมดูลใหม่ๆได้ในเมนูการบริหารระบบ"
+
+#. module: base_setup
+#: wizard_view:base_setup.base_setup,init:0
+msgid ""
+"A profile sets a pre-selection of modules for specific needs. These profiles "
+"have been setup to help you discover the different aspects of OpenERP. This "
+"is just an overview, we have 300+ available modules."
+msgstr ""
+"รูปแบบโมดูลเป็นเพียงการตั้งค่าแนะนำในการใช้งานเพื่อตั้งค่าได้ง่ายขึ้น "
+"แต่เรามีโมดูลที่สามารถหาติดตั้งได้มากกว่า 500 โมดูล"
+
+#. module: base_setup
+#: wizard_button:base_setup.base_setup,company,update:0
+#: wizard_button:base_setup.base_setup,init,company:0
+msgid "Next"
+msgstr "ถัดไป"
+
+#. module: base_setup
+#: wizard_field:base_setup.base_setup,company,email:0
+#: wizard_field:base_setup.base_setup,init,email:0
+#: wizard_field:base_setup.base_setup,update,email:0
+msgid "E-mail"
+msgstr "อีเมล์"
+
+#. module: base_setup
+#: wizard_field:base_setup.base_setup,company,state_id:0
+#: wizard_field:base_setup.base_setup,init,state_id:0
+#: wizard_field:base_setup.base_setup,update,state_id:0
+msgid "State"
+msgstr "จังหวัด"
+
+#. module: base_setup
+#: wizard_view:base_setup.base_setup,finish:0
+msgid "Your new database is now fully installed."
+msgstr "ฐานข้อมูลใหม่ตั้งตั้งเสร็จสิ้น"
+
+#. module: base_setup
+#: wizard_field:base_setup.base_setup,company,profile:0
+#: wizard_field:base_setup.base_setup,init,profile:0
+#: wizard_field:base_setup.base_setup,update,profile:0
+msgid "Profile"
+msgstr "รูปแบบ"
+
+#. module: base_setup
+#: wizard_field:base_setup.base_setup,company,rml_footer1:0
+#: wizard_field:base_setup.base_setup,init,rml_footer1:0
+#: wizard_field:base_setup.base_setup,update,rml_footer1:0
+msgid "Report Footer 1"
+msgstr "หัวรายงาน 1"
+
+#. module: base_setup
+#: wizard_field:base_setup.base_setup,company,rml_footer2:0
+#: wizard_field:base_setup.base_setup,init,rml_footer2:0
+#: wizard_field:base_setup.base_setup,update,rml_footer2:0
+msgid "Report Footer 2"
+msgstr "ท้ายรายงาน 2"
+
+#. module: base_setup
+#: wizard_view:base_setup.base_setup,company:0
+msgid "General Information"
+msgstr "ข้อมูลทั่วไป"
+
+#. module: base_setup
+#: wizard_field:base_setup.base_setup,company,street2:0
+#: wizard_field:base_setup.base_setup,init,street2:0
+#: wizard_field:base_setup.base_setup,update,street2:0
+msgid "Street2"
+msgstr "ตำบล"
+
+#. module: base_setup
+#: wizard_view:base_setup.base_setup,company:0
+msgid "Report Information"
+msgstr "ข้อมูลรายงาน"
+
+#. module: base_setup
+#: wizard_field:base_setup.base_setup,company,phone:0
+#: wizard_field:base_setup.base_setup,init,phone:0
+#: wizard_field:base_setup.base_setup,update,phone:0
+msgid "Phone"
+msgstr "โทรศัพท์"
+
+#. module: base_setup
+#: wizard_view:base_setup.base_setup,company:0
+msgid "Define Main Company"
+msgstr "ตั้งบริษัทหลัก"
+
+#. module: base_setup
+#: wizard_field:base_setup.base_setup,company,name:0
+#: wizard_field:base_setup.base_setup,init,name:0
+#: wizard_field:base_setup.base_setup,update,name:0
+msgid "Company Name"
+msgstr "ชื่อบริษัท"
+
+#. module: base_setup
+#: help:base_setup.base_setup,company,rml_footer2:0
+#: help:base_setup.base_setup,init,rml_footer2:0
+#: help:base_setup.base_setup,update,rml_footer2:0
+msgid ""
+"This sentence will appear at the bottom of your reports.\n"
+"We suggest you to put bank information here:\n"
+"IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
+msgstr ""
+"ข้อมูลนี่จะอยู่ในท้ายกระดาษของรายงาน\n"
+"เราแนะนำให้เปลี่ยนโดยใส่ข้อมูลของธนาคาร\n"
+"IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
+
+#. module: base_setup
+#: wizard_field:base_setup.base_setup,company,country_id:0
+#: wizard_field:base_setup.base_setup,init,country_id:0
+#: wizard_field:base_setup.base_setup,update,country_id:0
+msgid "Country"
+msgstr "ประเทศ"
+
+#. module: base_setup
+#: wizard_view:base_setup.base_setup,company:0
+#: wizard_view:base_setup.base_setup,finish:0
+#: wizard_view:base_setup.base_setup,init:0
+#: wizard_view:base_setup.base_setup,update:0
+#: model:ir.actions.wizard,name:base_setup.action_wizard_setup
+#: model:ir.actions.wizard,name:base_setup.wizard_base_setup
+msgid "Setup"
+msgstr "ตั้งค่า"
+
+#. module: base_setup
+#: help:base_setup.base_setup,company,rml_footer1:0
+#: help:base_setup.base_setup,init,rml_footer1:0
+#: help:base_setup.base_setup,update,rml_footer1:0
+msgid ""
+"This sentence will appear at the bottom of your reports.\n"
+"We suggest you to write legal sentences here:\n"
+"Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
+msgstr ""
+"ข้อมูลนี่จะอยู่ในท้ายกระดาษของรายงาน\n"
+"เราแนะนำให้ท่านนำข้อมูลเกี่ยวกับทางกฏหมาย\n"
+"Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
+
+#. module: base_setup
+#: wizard_view:base_setup.base_setup,update:0
+msgid "Summary"
+msgstr "สรุป"
+
+#. module: base_setup
+#: wizard_button:base_setup.base_setup,update,finish:0
+msgid "Install"
+msgstr "ติดตั้ง"
+
+#. module: base_setup
+#: wizard_view:base_setup.base_setup,finish:0
+msgid "Installation Done"
+msgstr "ติดตั้งเสร็จสิ้น"
+
+#. module: base_setup
+#: help:base_setup.base_setup,company,rml_header1:0
+#: help:base_setup.base_setup,init,rml_header1:0
+#: help:base_setup.base_setup,update,rml_header1:0
+msgid ""
+"This sentence will appear at the top right corner of your reports.\n"
+"We suggest you to put a slogan here:\n"
+"\"Open Source Business Solutions\"."
+msgstr ""
+"ข้อมูลนี่จะอยู่ในด้านบนขวาของรายงานท่าน\n"
+"กรุณาใส่ สโลแกน\n"
+"\"Open Source Business Solutions\"."
+
+#. module: base_setup
+#: wizard_field:base_setup.base_setup,company,rml_header1:0
+#: wizard_field:base_setup.base_setup,init,rml_header1:0
+#: wizard_field:base_setup.base_setup,update,rml_header1:0
+msgid "Report Header"
+msgstr "หัวรายงาน"
+
+#. module: base_setup
+#: wizard_view:base_setup.base_setup,company:0
+msgid "Your Logo - Use a size of about 450x150 pixels."
+msgstr "กรุณาใช้โลโก้ขนาด 450X150 px"
+
+#. module: base_setup
+#: wizard_field:base_setup.base_setup,company,currency:0
+#: wizard_field:base_setup.base_setup,init,currency:0
+#: wizard_field:base_setup.base_setup,update,currency:0
+msgid "Currency"
+msgstr "อัตราแลกเปลี่ยน"
+
+#. module: base_setup
+#: wizard_field:base_setup.base_setup,company,street:0
+#: wizard_field:base_setup.base_setup,init,street:0
+#: wizard_field:base_setup.base_setup,update,street:0
+msgid "Street"
+msgstr "ที่อยู่"
+
+#. module: base_setup
+#: wizard_button:base_setup.base_setup,finish,menu:0
+msgid "Use Directly"
+msgstr "ใช้ทันที"
+
+#. module: base_setup
+#: wizard_button:base_setup.base_setup,init,menu:0
+msgid "Cancel"
+msgstr "ยกเลิก"
+
+#. module: base_setup
+#: wizard_field:base_setup.base_setup,company,logo:0
+#: wizard_field:base_setup.base_setup,init,logo:0
+#: wizard_field:base_setup.base_setup,update,logo:0
+msgid "Logo"
+msgstr "โลโก้"
+
+#. module: base_setup
+#: model:ir.module.module,shortdesc:base_setup.module_meta_information
+msgid "Base Setup"
+msgstr "โครงสร้าง ตั้งค่า"
+
+#. module: base_setup
+#: wizard_button:base_setup.base_setup,company,init:0
+#: wizard_button:base_setup.base_setup,update,company:0
+msgid "Previous"
+msgstr "ก่อนหน้า"
diff --git a/addons/board_association/i18n/lt.po b/addons/board_association/i18n/lt.po
index cf53291f10b..581b5bc4c83 100644
--- a/addons/board_association/i18n/lt.po
+++ b/addons/board_association/i18n/lt.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-09-08 15:20+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-05-19 09:15+0000\n"
+"Last-Translator: Rytis Ūsalis <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 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-05-20 05:23+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_association
@@ -40,7 +40,7 @@ msgstr ""
 #. module: board_association
 #: view:board.board:0
 msgid "My tasks"
-msgstr ""
+msgstr "Mano užduotys"
 
 #. module: board_association
 #: view:board.board:0
diff --git a/addons/project/i18n/lt.po b/addons/project/i18n/lt.po
index 50591b5ccd0..27d4cb3fc9f 100644
--- a/addons/project/i18n/lt.po
+++ b/addons/project/i18n/lt.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-11-18 05:51+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-05-19 09:19+0000\n"
+"Last-Translator: Rytis Ūsalis <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 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-05-20 05:23+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
@@ -206,7 +206,7 @@ msgstr ""
 #: view:project.task:0
 #: field:project.task,notes:0
 msgid "Notes"
-msgstr ""
+msgstr "Pastabos"
 
 #. module: project
 #: selection:res.company,project_time_mode:0
@@ -216,7 +216,7 @@ msgstr ""
 #. module: project
 #: model:project.task.type,name:project.project_tt_analysis
 msgid "Analysis"
-msgstr ""
+msgstr "Analizė"
 
 #. module: project
 #: model:ir.model,name:project.model_project_project
@@ -224,7 +224,7 @@ msgstr ""
 #: field:project.task,project_id:0
 #: model:res.request.link,name:project.req_link_project
 msgid "Project"
-msgstr ""
+msgstr "Projektas"
 
 #. module: project
 #: view:project.task:0

From 5b4c90f604aaedfe35f6aef36e4f9d2e397aa816 Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Thu, 20 May 2010 11:11:30 +0530
Subject: [PATCH 61/82] [FIX] Account : ._company_default_get() should have
 context as parameterized argument

bzr revid: jvo@tinyerp.com-20100520054130-mbgw3au7r32jjr4v
---
 addons/account/account_analytic_line.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account_analytic_line.py b/addons/account/account_analytic_line.py
index 20181514341..1fa0a5c6cfa 100644
--- a/addons/account/account_analytic_line.py
+++ b/addons/account/account_analytic_line.py
@@ -42,7 +42,7 @@ class account_analytic_line(osv.osv):
     }
     _defaults = {
         'date': lambda *a: time.strftime('%Y-%m-%d'),
-        'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.analytic.line', c),
+        'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.analytic.line', context=c),
     }
     _order = 'date'
     

From 9ba3031e879c4f9c65d96f538cfffe98a7e083dd Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 20 May 2010 09:53:42 +0200
Subject: [PATCH 62/82] [IMP] fix on project views

bzr revid: fp@tinyerp.com-20100520075342-qtnhmzst2j5nyioq
---
 addons/project/project_view.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index ef7919356fa..8b65468c158 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -423,10 +423,10 @@
                     </group>
                     <newline/>
                     <group expand="1" string="Group By..." colspan="4" col="20">
-                        <filter string="Users" name="user_id" icon="terp-project" domain="[]"  context="{'group_by':'user_id'}"/>
-                        <filter string="Project" icon="terp-project" domain="[]" context="{'group_by':'project_id'}" default = "1"/>
-                        <filter string="Stage" icon="terp-project" domain="[]" context="{'group_by':'type'}"/>
-                        <filter string="State" icon="terp-project" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Users" name="group_user_id" icon="terp-project" domain="[]"  context="{'group_by':'user_id'}"/>
+                        <filter string="Project" name="group_project_id" icon="terp-project" domain="[]" context="{'group_by':'project_id'}" default = "1"/>
+                        <filter string="Stage" name="group_stage_id" icon="terp-project" domain="[]" context="{'group_by':'type'}"/>
+                        <filter string="State" name="group_state" icon="terp-project" domain="[]" context="{'group_by':'state'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Deadline" icon="terp-project" domain="[]" context="{'group_by':'date_deadline'}"/>
                         <filter string="Start Date" icon="terp-project" domain="[]" context="{'group_by':'date_start'}"/>

From edf42894039e41e8af69024034574c1653415042 Mon Sep 17 00:00:00 2001
From: Quentin De Paoli <qdp@cyan>
Date: Thu, 20 May 2010 11:34:53 +0200
Subject: [PATCH 63/82] [FIX] mrp/mrp_procurement: commited work of team1

bzr revid: qdp@cyan-20100520093453-suu4n8d0305gb19j
---
 addons/mrp/__openerp__.py                     |   6 +-
 addons/mrp/mrp_view.xml                       |  23 +-
 addons/mrp/mrp_workflow.xml                   |  34 +-
 .../mrp/report/mrp_production_order_view.xml  |   6 +-
 addons/mrp/report/order.rml                   |  95 ++++-
 addons/mrp/test/mrp_phantom_bom.yml           |  16 +-
 addons/mrp/test/mrp_procurement.yml           | 336 ++++++++++++++++++
 addons/mrp/test/mrp_production_order.yml      |  12 +-
 .../mrp_procurement/mrp_procurement_view.xml  |  21 +-
 .../mrp_procurement_workflow.xml              |  58 +--
 addons/project_mrp/project_mrp_workflow.xml   |   4 +-
 11 files changed, 494 insertions(+), 117 deletions(-)
 create mode 100644 addons/mrp/test/mrp_procurement.yml

diff --git a/addons/mrp/__openerp__.py b/addons/mrp/__openerp__.py
index 0fa66ac7bd1..97e23f3488d 100644
--- a/addons/mrp/__openerp__.py
+++ b/addons/mrp/__openerp__.py
@@ -77,7 +77,11 @@
         'report/mrp_production_order_view.xml',
     ],
     'demo_xml': ['mrp_demo.xml', 'mrp_order_point.xml'],
-#    'test': ['test/mrp_phantom_bom.yml','test/mrp_production_order.yml'],
+    'test': [
+             'test/mrp_phantom_bom.yml',
+             'test/mrp_production_order.yml',
+             'test/mrp_procurement.yml'
+    ],
     'installable': True,
     'active': False,
     'certificate': '0032052481373',
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index dcea7ac4f9e..1c7dce6e30b 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -249,7 +249,7 @@
                         <newline/>
                         <field name="product_uom"/>
                         <field name="product_qty"/>
-                        <field name="routing_id" groups="base.group_extended"/>
+                        <field name="routing_id" groups="base.group_extended" select="1"/>
                         <newline/>
                         <field name="product_uos" groups="product.group_uos"/>
                         <field name="product_uos_qty" groups="product.group_uos"/>
@@ -471,10 +471,10 @@
             <field name="arch" type="xml">
                 <form string="Manufacturing Orders">
                     <group colspan="4" col="6">
-                        <field name="name" select="1" string="Reference"/>
-                        <field name="date_planned" select="1"/>
-                        <field name="origin" select="1"/>
-                        <field name="product_id" on_change="product_id_change(product_id)" select="1"/>
+                        <field name="name" string="Reference"/>
+                        <field name="date_planned"/>
+                        <field name="origin"/>
+                        <field name="product_id" on_change="product_id_change(product_id)"/>
                         <field name="product_qty"/>
                         <group colspan="2" col="3">
                         <field name="product_uom"/>
@@ -493,7 +493,7 @@
                     <notebook colspan="4">
                         <page string="Consumed Products">
                             <field name="bom_id" domain="[('product_id','=',product_id),('bom_id','=',False)]" on_change="bom_id_change(bom_id)"/>
-                            <field name="routing_id" groups="base.group_extended" select="1"/>
+                            <field name="routing_id" groups="base.group_extended"/>
                             <field name="location_src_id" domain="[('usage','=','internal')]" on_change="location_id_change(location_src_id,location_dest_id)"/>
                             <field name="location_dest_id" domain="[('usage','=','internal')]"/>
                             <separator string="" colspan="4"/>
@@ -592,8 +592,8 @@
                         <page string="Work Orders" groups="base.group_extended">
                             <field colspan="4" name="workcenter_lines" nolabel="1">
                                 <form string="Production Work Centers">
-                                    <field colspan="4" name="name" select="1"/>
-                                    <field colspan="4" name="workcenter_id" select="1"/>
+                                    <field colspan="4" name="name"/>
+                                    <field colspan="4" name="workcenter_id"/>
                                     <field name="sequence"/>
                                     <field name="cycle"/>
                                     <field name="hour"/>
@@ -611,7 +611,7 @@
                             <field colspan="4" name="product_lines" nolabel="1" widget="one2many_list"/>
                         </page>
                         <page string="Extra Information">
-                            <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
+                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                             <field name="priority" groups="base.group_extended"/>
                             <newline/>
                             <field name="date_start"/>
@@ -636,8 +636,7 @@
                        <filter icon="terp-mrp" string="Draft"
                            domain="[('state','=','draft')]"
                            help="Non confirmed manufacturing orders"/>
-                       <filter icon="terp-mrp" string="Current"
-                           default="1"
+                       <filter icon="terp-mrp" name="current" string="Current"
                            domain="[('state','in',('confirmed','ready'))]"
                            help="Manufacturing Orders which are waiting for raw materials"/>
                        <filter icon="terp-mrp" string="Ready"
@@ -674,6 +673,7 @@
             <field name="res_model">mrp.production</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph,gantt</field>
+             <field name="context">{'search_default_current':1}</field>
             <field name="view_id" eval="False"/>
             <field name="search_view_id" ref="view_mrp_production_filter"/>
         </record>
@@ -799,6 +799,7 @@
         		</xpath>
         	</field>
         </record>
+
         <act_window
             id="action_product_bom_structure"
             name="Product BoM Structure"
diff --git a/addons/mrp/mrp_workflow.xml b/addons/mrp/mrp_workflow.xml
index 791c376ef92..6f7ef00b3d2 100644
--- a/addons/mrp/mrp_workflow.xml
+++ b/addons/mrp/mrp_workflow.xml
@@ -122,41 +122,9 @@
             <field name="subflow_id" search="[('osv','=','mrp.production')]"/>
             <field name="action">action_produce_assign_product()</field>
         </record>
-        <record id="act_produce_check" model="workflow.activity">
-            <field name="wkf_id" ref="mrp_procurement.wkf_procurement"/>
-            <field name="name">produce_check</field>
-        </record>
-        <record id="act_produce_service" model="workflow.activity">
-            <field name="wkf_id" ref="mrp_procurement.wkf_procurement"/>
-            <field name="name">produce_service</field>
-            <field name="kind">function</field>
-            <field name="action">action_produce_assign_service()</field>
-        </record>
-        
-        <record id="trans_confirm_mto_produce_check" model="workflow.transition">
-            <field name="act_from" ref="mrp_procurement.act_confirm_mto"/>
-            <field name="act_to" ref="act_produce_check"/>
-            <field name="condition">check_produce()</field>
-        </record>
-        <record id="trans_product_check_produce_service" model="workflow.transition">
-            <field name="act_from" ref="act_produce_check"/>
-            <field name="act_to" ref="act_produce_service"/>
-            <field name="condition">not check_product()</field>
-        </record>
-        
-        <record id="trans_produce_service_cancel" model="workflow.transition">
-            <field name="act_from" ref="act_produce_service"/>
-            <field name="act_to" ref="mrp_procurement.act_cancel"/>
-            <field name="signal">subflow.cancel</field>
-        </record>
-        
-        <record id="trans_produce_service_make_done" model="workflow.transition">
-            <field name="act_from" ref="act_produce_service"/>
-            <field name="act_to" ref="mrp_procurement.act_make_done"/>
-        </record>
         
         <record id="trans_product_check_produce" model="workflow.transition">
-            <field name="act_from" ref="act_produce_check"/>
+            <field name="act_from" ref="mrp_procurement.act_produce_check"/>
             <field name="act_to" ref="act_produce"/>
             <field name="condition">check_product()</field>
         </record>
diff --git a/addons/mrp/report/mrp_production_order_view.xml b/addons/mrp/report/mrp_production_order_view.xml
index a97abe846de..1ae2e6b32bb 100644
--- a/addons/mrp/report/mrp_production_order_view.xml
+++ b/addons/mrp/report/mrp_production_order_view.xml
@@ -48,8 +48,8 @@
             <field name="arch" type="xml">
                 <search string="Search">
                   <group col="16" colspan="6">
-                   		<filter string="This Year" icon="terp-mrp" domain="[('name','=',time.localtime()[0])]" default="1" />
-						<filter string="This Month" icon="terp-mrp" domain="[('month','=',time.strftime('%%m'))]" default="1"/>
+                   		<filter string="This Year" name="this_year" icon="terp-mrp" domain="[('name','=',time.localtime()[0])]"/>
+						<filter string="This Month" name="this_month" icon="terp-mrp" domain="[('month','=',time.strftime('%%m'))]"/>
                         <separator orientation="vertical"/>
 						<filter string="Current" icon="terp-mrp" domain="[('state','in',('open','draft'))]"/>
 						<separator orientation="vertical"/>
@@ -101,7 +101,7 @@
             <field name="view_mode">tree,graph</field>
             <field name="view_id" ref="view_report_mrp_production_order_tree"/>
             <field name="search_view_id" ref="view_report_mrp_production_order_filter"/>
-          <field name="context">{'search_default_Product': 1}</field>
+          <field name="context">{'search_default_Product': 1,'search_default_this_year':1,'search_default_this_month':1}</field>
             
         </record>
 
diff --git a/addons/mrp/report/order.rml b/addons/mrp/report/order.rml
index 7bc2e7e7ee5..af55afce91b 100644
--- a/addons/mrp/report/order.rml
+++ b/addons/mrp/report/order.rml
@@ -135,19 +135,36 @@
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
     </blockTableStyle>
+    <blockTableStyle id="Table7">
+      <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"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table10">
+      <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"/>
+    </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="Standard" fontName="Times-Roman"/>
-    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Standard" fontName="Helvetica"/>
+    <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Table Contents" fontName="Times-Roman"/>
-    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/>
-    <paraStyle name="Caption" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Index" fontName="Times-Roman"/>
-    <paraStyle name="Footer" fontName="Times-Roman"/>
-    <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+    <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Contents" fontName="Helvetica"/>
+    <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER"/>
+    <paraStyle name="Caption" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Helvetica"/>
+    <paraStyle name="Footer" fontName="Helvetica"/>
+    <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
     <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
@@ -172,6 +189,7 @@
   </stylesheet>
   <images/>
   <story>
+   <section>
     <para style="terp_default_8">[[ repeatIn(objects,'o') ]] </para>
     <para style="terp_default_8">
       <font color="white"> </font>
@@ -313,7 +331,10 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
+    <section>
+    <para style="terp_default_Bold_9">Products to Consume</para>
     <blockTable colWidths="235.0,82.0,107.0,104.0" style="Table8">
+	  <para> <font color="white"> [[ o.move_lines ==[] and removeParentNode('section')]]</font></para>    
       <tr>
         <td>
           <para style="terp_tblheader_Details">Product </para>
@@ -329,9 +350,10 @@
         </td>
       </tr>
     </blockTable>
+    </section>
     <section>
-      <para style="terp_default_8">[[ repeatIn(o.move_lines,'line') ]]</para>
       <blockTable colWidths="235.0,47.0,34.0,108.0,104.0" style="Table9">
+       <para style="terp_default_8">[[ repeatIn(o.move_lines,'line') ]]</para>
         <tr>
           <td>
             <para style="terp_default_9">[[ line.product_id.code ]] [[ line.product_id.name ]]</para>
@@ -350,9 +372,54 @@
           </td>
         </tr>
       </blockTable>
-      <para style="terp_default_2">
-        <font color="white"> </font>
-      </para>
+      </section>
+	  <para style="terp_default_space">
+      <font color="white"> </font>
+    </para>
+    <section>
+    <para style="terp_default_Bold_9">Consumed Products</para>
+	   
+      <blockTable colWidths="235.0,82.0,107.0,104.0" style="Table7">
+      <para> <font color="white"> [[ o.move_lines2 ==[] and removeParentNode('section')]]</font></para>
+        <tr>
+          <td>
+            <para style="terp_tblheader_Details">Product </para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Centre">Quantity</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Centre">Source Location</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Centre">Destination Location</para>
+          </td>
+        </tr>
+      </blockTable>
+      </section>
+      <section>
+      <blockTable colWidths="235.0,47.0,34.0,108.0,104.0" style="Table10">
+	  <para style="terp_default_8">[[ repeatIn(o.move_lines2,'line2') ]]</para>      
+        <tr>
+          <td>
+            <para style="terp_default_9">[[ line2.product_id.code ]] [[ line2.product_id.name ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ formatLang( line2.product_qty) ]] </para>
+          </td>
+          <td>
+            <para style="terp_default_9">[[line2.product_uom.name]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Centre_9">[[ line2.location_id.name ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Centre_9">[[ line2.location_dest_id.name ]]</para>
+          </td>
+        </tr>
+      </blockTable>
+    
     </section>
+     </section>
   </story>
-</document>
+</document>
\ No newline at end of file
diff --git a/addons/mrp/test/mrp_phantom_bom.yml b/addons/mrp/test/mrp_phantom_bom.yml
index df4ade1cb6e..5475d54ffd4 100644
--- a/addons/mrp/test/mrp_phantom_bom.yml
+++ b/addons/mrp/test/mrp_phantom_bom.yml
@@ -2,7 +2,7 @@
   In order to test the mrp phantom bom type in OpenERP, I will create products 
   and then I will create Phantom bom structure for those products.
 -
-  I create the products required to produce some orange juices: Oranges, Sugar and Water.
+  I create the products required to produce some orange juices with Oranges, Sugar and Water.
 -
   !record {model: product.uom, id: product_uom_litre0}:
     category_id: product.product_uom_categ_kgm
@@ -129,7 +129,6 @@
     date_planned: '2010-04-16 15:53:36'
     location_dest_id: stock.stock_location_output
     location_src_id: stock.stock_location_stock
-    name: MO/00002
     product_id: product_product_orangejuice0
     product_qty: 100.0
     product_uom: product_uom_litre0
@@ -171,7 +170,7 @@
 -
   !python {model: mrp.procurement}: |
     from tools.translate import _
-    proc_ids = self.search(cr, uid, [('origin','=',':MO/00002')])
+    proc_ids = self.search(cr, uid, [('state','!=','cofirmed')])
     assert proc_ids, _('No Procurements!')
 -
   The scheduler runs.
@@ -196,7 +195,7 @@
   !python {model: purchase.order}: |
     from tools.translate import _
     import netsvc
-    purch_ids = self.search(cr, uid, [('origin','in',['SCHEDULER','OP/00002','OP/00003'])])
+    purch_ids = self.search(cr, uid, [('state','=','draft')])
     assert purch_ids, _('No Purchase Orders were made!')
     wf_service = netsvc.LocalService("workflow")
     for p_id in purch_ids:
@@ -207,7 +206,7 @@
   !python {model: purchase.order}: |
     from tools.translate import _
     import netsvc
-    purch_ids = self.search(cr, uid, [('origin','in',['SCHEDULER','OP/00002','OP/00003']),('state','=','confirmed')])
+    purch_ids = self.search(cr, uid, [('state','=','confirmed')])
     assert purch_ids, _('No Confirmed Purchase Orders found!')
     wf_service = netsvc.LocalService("workflow")
     for p_id in purch_ids:
@@ -217,7 +216,7 @@
 -
   !python {model: stock.picking}: |
     from tools.translate import _
-    pick_ids = self.search(cr, uid, [('origin','in',['PO00001:SCHEDULER','PO00002:SCHEDULER','PO00003:OP/00002','PO00004:OP/00003']),('type','=','in')])
+    pick_ids = self.search(cr, uid, [('type','=','in')])
     assert pick_ids, _('No Incoming Shipments found!')
 -
   I receive both the products. My incoming pickings are done.
@@ -229,6 +228,7 @@
 -
   !python {model: stock.partial.picking}: |
      pick_obj = self.pool.get('stock.picking')
-     picking_ids = pick_obj.search(cr, uid, [('origin','in',['PO00001:SCHEDULER','PO00002:SCHEDULER','PO00003:OP/00002','PO00004:OP/00003']),('type','=','in')])
-     self.do_partial(cr, uid, [1],context={'active_ids': picking_ids})
+     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/mrp/test/mrp_procurement.yml b/addons/mrp/test/mrp_procurement.yml
new file mode 100644
index 00000000000..37d0de5c5a9
--- /dev/null
+++ b/addons/mrp/test/mrp_procurement.yml
@@ -0,0 +1,336 @@
+-
+  In order to test the flow of procurement orders. I will put some orders with
+  different procurement methods. I have installed sale, mrp and purchase modules.
+-
+  I am creating products.   
+- 
+  Creating a product.product record
+- 
+  !record {model: product.product, id: product_product_shirt0}:
+    categ_id: product.cat1
+    cost_method: standard
+    list_price: 350.0
+    mes_type: fixed
+    name: Shirt
+    procure_method: make_to_stock
+    property_stock_inventory: stock.location_inventory
+    property_stock_procurement: stock.location_procurement
+    property_stock_production: stock.location_production
+    seller_delay: '1'
+    standard_price: 300.0
+    supply_method: produce
+    type: product
+    uom_id: product.product_uom_unit
+    uom_po_id: product.product_uom_unit
+    volume: 0.0
+    warranty: 0.0
+    weight: 0.0
+    weight_net: 0.0
+- 
+  Creating a product.product record
+- 
+  !record {model: product.product, id: product_product_cloth0}:
+    categ_id: product.cat1
+    cost_method: standard
+    mes_type: fixed
+    name: Cloth
+    procure_method: make_to_order
+    property_stock_inventory: stock.location_inventory
+    property_stock_procurement: stock.location_procurement
+    property_stock_production: stock.location_production
+    seller_delay: '1'
+    seller_ids:
+      - delay: 1
+        name: base.res_partner_maxtor
+        qty: 300.0
+    standard_price: 1.0
+    supply_method: buy
+    type: product
+    uom_id: product.product_uom_unit
+    uom_po_id: product.product_uom_unit
+    volume: 0.0
+    warranty: 0.0
+    weight: 0.0
+    weight_net: 0.0
+- 
+  Creating a product.product record
+- 
+  !record {model: product.product, id: product_product_buttons0}:
+    categ_id: product.cat1
+    cost_method: standard
+    mes_type: fixed
+    name: Buttons
+    procure_method: make_to_stock
+    property_stock_inventory: stock.location_inventory
+    property_stock_procurement: stock.location_procurement
+    property_stock_production: stock.location_production
+    seller_delay: '1'
+    seller_ids:
+      - delay: 1
+        name: base.res_partner_asus
+        qty: 100.0
+    standard_price: 1.0
+    supply_method: buy
+    type: product
+    uom_id: product.product_uom_kgm
+    uom_po_id: product.product_uom_kgm
+    volume: 0.0
+    warranty: 0.0
+    weight: 0.0
+    weight_net: 0.0
+-
+  I am creating bills of material for 'Shirt'.      
+- 
+  Creating a mrp.bom record
+- 
+  !record {model: mrp.bom, id: mrp_bom_shirt0}:
+    bom_lines:
+      - company_id: base.main_company
+        name: Cloth
+        product_efficiency: 1.0
+        product_id: product_product_cloth0
+        product_qty: 1.0
+        product_uom: product.product_uom_unit
+        product_uos_qty: 0.0
+        sequence: 0.0
+        type: normal
+      - company_id: base.main_company
+        name: Buttons
+        product_efficiency: 1.0
+        product_id: product_product_buttons0
+        product_qty: 8.0
+        product_uom: product.product_uom_unit
+        product_uos_qty: 0.0
+        sequence: 0.0
+        type: normal
+    company_id: base.main_company
+    name: Shirt
+    product_efficiency: 1.0
+    product_id: product_product_shirt0
+    product_qty: 1.0
+    product_uom: product.product_uom_unit
+    product_uos_qty: 0.0
+    sequence: 0.0
+    type: normal
+-
+  I create minimum stock rule for product Buttons
+-
+  !record {model: stock.warehouse.orderpoint, id: stock_warehouse_orderpoint_op0}:
+    company_id: base.main_company
+    location_id: stock.stock_location_stock
+    logic: max
+    name: OP/00007
+    product_id: mrp.product_product_buttons0
+    product_max_qty: 50.0
+    product_min_qty: 10.0
+    product_uom: product.product_uom_unit
+    qty_multiple: 1
+    warehouse_id: stock.warehouse0
+-
+  I create a procurement order for product Shirt.
+-
+  !record {model: mrp.procurement, id: mrp_procurement_shirt0}:
+    name: 'PROC: Shirt'
+    product_id: product_product_shirt0
+    product_qty: 5.00
+    location_id: stock.stock_location_stock
+    product_uom: product.product_uom_unit
+-
+  I confirm the procurement order.
+-
+  !workflow {model: mrp.procurement, action: button_confirm, ref: mrp_procurement_shirt0}
+-
+  I run the procurement.
+-
+  !workflow {model: mrp.procurement, action: button_check, ref: mrp_procurement_shirt0} 
+-
+  I see that there is a manufacturing order for Shirt.
+-
+  !python {model: mrp.production}: |
+    from tools.translate import _
+    order_ids = self.search(cr, uid, [('product_id','=',ref('product_product_shirt0'))])
+    assert order_ids, 'No Manufacturing Order.'
+-
+  I also check that there are two more procurement orders for sub products Cloth and Buttons.
+-
+  !python {model: mrp.procurement}: |
+    from tools.translate import _
+    proc_ids = self.search(cr, uid, [('product_id','in',[ref('product_product_cloth0'),ref('product_product_buttons0')])])
+    assert proc_ids, 'No Procurements.'
+-
+  The scheduler runs.
+-
+  !function {model: mrp.procurement, name: run_scheduler}:
+    - model: mrp.procurement
+      search: "[]"
+-
+  I check that there is one purchase order for Cloth.
+-
+  !python {model: purchase.order}: |
+    purch_ids = self.search(cr, uid, [('partner_id.name','=','Maxtor')])
+    assert purch_ids, 'No Purchase Orders.'
+-
+  I confirm purchase order for Cloth.
+-
+  !python {model: purchase.order}: |
+    import netsvc
+    purch_ids = self.search(cr, uid, [('partner_id.name','=','Maxtor')])
+    wf_service = netsvc.LocalService("workflow")
+    for p_id in purch_ids:
+    	wf_service.trg_validate(uid, 'purchase.order', p_id, 'purchase_confirm', cr)
+-
+  I get the approval from the supplier. So I approve my purchase orders.
+-
+  !python {model: purchase.order}: |
+    from tools.translate import _
+    import netsvc
+    purch_ids = self.search(cr, uid, [('state','=','confirmed')])
+    assert purch_ids, _('No Confirmed Purchase Orders found!')
+    wf_service = netsvc.LocalService("workflow")
+    for p_id in purch_ids:
+    	wf_service.trg_validate(uid, 'purchase.order', p_id, 'purchase_approve', cr)
+-
+  I confirm purchase order for Buttons.
+-
+  !python {model: purchase.order}: |
+    import netsvc
+    purch_ids = self.search(cr, uid, [('partner_id.name','=','ASUStek')])
+    wf_service = netsvc.LocalService("workflow")
+    for p_id in purch_ids:
+    	wf_service.trg_validate(uid, 'purchase.order', p_id, 'purchase_confirm', cr)
+-
+  I get the approval from the supplier. So I approve my purchase orders.
+-
+  !python {model: purchase.order}: |
+    from tools.translate import _
+    import netsvc
+    purch_ids = self.search(cr, uid, [('state','=','confirmed')])
+    assert purch_ids, _('No Confirmed Purchase Orders found!')
+    wf_service = netsvc.LocalService("workflow")
+    for p_id in purch_ids:
+    	wf_service.trg_validate(uid, 'purchase.order', p_id, 'purchase_approve', cr)
+-
+  I Check incoming shipments for cloth. And receive products.
+-
+  !python {model: stock.picking}: |
+    from tools.translate import _
+    pick_ids = self.search(cr, uid, [('address_id.name','=','Wong'),('state','=','assigned')])
+    assert pick_ids, _('No Incoming Shipments found!')
+-
+  !record {model: stock.partial.picking, id: stock_partial_picking0}:
+    date: '2010-04-30 16:53:36'
+    partner_id: base.res_partner_maxtor
+    address_id: base.res_partner_address_wong
+-
+  !python {model: stock.partial.picking}: |
+     pick_obj = self.pool.get('stock.picking')
+     picking_ids = pick_obj.search(cr, uid, [('address_id.name','=','Wong'),('state','=','assigned')])
+     partial = self.browse(cr, uid, 1, 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):
+        for m in pick.move_lines:
+           partial_datas['move%s'%(m.id)] = {
+                    'product_id' : m.product_id.id,
+                    'product_qty' : m.product_qty,
+                    'product_uom' : m.product_uom.id
+           }
+           if (pick.type == 'in') and (m.product_id.cost_method == 'average'):   
+                    partial_datas['move%s'%(m.id)].update({             
+                        'product_price' : m.product_price,
+                        'product_currency': m.product_currency
+                    })
+     pick_obj.do_partial(cr, uid, picking_ids, partial_datas, context=context)
+-
+  I Check incoming shipments for buttons. And receive products.
+-
+  !python {model: stock.picking}: |
+    from tools.translate import _
+    pick_ids = self.search(cr, uid, [('address_id.name','=','Tang'),('state','=','assigned')])
+    assert pick_ids, _('No Incoming Shipments found!')
+-
+  !record {model: stock.partial.picking, id: stock_partial_picking0}:
+    date: '2010-04-30 16:53:36'
+    partner_id: base.res_partner_maxtor
+    address_id: base.res_partner_address_wong
+-
+  !python {model: stock.partial.picking}: |
+     pick_obj = self.pool.get('stock.picking')
+     picking_ids = pick_obj.search(cr, uid, [('address_id.name','=','Tang'),('state','=','assigned')])
+     partial = self.browse(cr, uid, 1, 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):
+        for m in pick.move_lines:
+           partial_datas['move%s'%(m.id)] = {
+                    'product_id': m.product_id.id,
+                    'product_qty': m.product_qty,
+                    'product_uom': m.product_uom.id
+           }
+           if (pick.type == 'in') and (m.product_id.cost_method == 'average'):   
+                    partial_datas['move%s'%(m.id)].update({             
+                        'product_price': m.product_price,
+                        'product_currency': m.product_currency
+                    })
+     pick_obj.do_partial(cr, uid, picking_ids, partial_datas, context=context)
+-
+  Run scheduler again.
+-
+  !function {model: mrp.procurement, name: run_scheduler}:
+    - model: mrp.procurement
+      search: "[]"
+-
+  Check state of manufacturing order for Shirt.
+-
+  !python {model: mrp.production}: |
+    from tools.translate import _
+    order_ids = self.search(cr, uid, [('product_id','=',ref('product_product_shirt0')),('state','=','ready')])
+    assert order_ids, 'No Manufacturing Order in Ready state.'
+-
+  I start production order for Shirt.
+-
+  !python {model: mrp.production}: |
+    from tools.translate import _
+    import netsvc
+    prod_ids = self.search(cr, uid, [('state','=','ready')])
+    assert prod_ids, _('No Ready Manufacturing Orders found!')
+    wf_service = netsvc.LocalService("workflow")
+    for p_id in prod_ids:
+    	wf_service.trg_validate(uid, 'mrp.production', p_id, 'button_produce', cr)
+-
+  !record {model: mrp.product.produce, id: mrp_product_produce0}:
+    product_qty: 5.00
+    mode: 'consume_produce'
+-
+  !python {model: mrp.product.produce}: |
+    from tools.translate import _
+    prod_obj = self.pool.get('mrp.production')
+    prod_ids = prod_obj.search(cr, uid, [('product_id.name','=','Shirt')])
+    self.do_produce(cr, uid, [1], context={'active_ids': prod_ids})
+-
+  !record {model: stock.move.consume, id: stock_move_consume0}:
+    product_id: product_product_buttons0
+    product_qty: 35.00
+    product_uom: product.product_uom_unit
+    location_id: stock.stock_location_stock
+-
+  !python {model: stock.move.consume}: |
+    from tools.translate import _
+    stock_obj = self.pool.get('stock.move')
+    stock_ids = stock_obj.search(cr, uid, [('product_id.name','=','Buttons')])
+    self.do_move_consume(cr, uid, [1], context={'active_ids': stock_ids})
+-
+  And finally production order is done.
+-
+  !python {model: mrp.product.produce}: |
+    from tools.translate import _
+    prod_obj = self.pool.get('mrp.production')
+    prod_ids = prod_obj.search(cr, uid, [('product_id.name','=','Shirt')])
+    self.do_produce(cr, uid, [1], context={'active_ids': prod_ids})
+    
\ No newline at end of file
diff --git a/addons/mrp/test/mrp_production_order.yml b/addons/mrp/test/mrp_production_order.yml
index 023a9f22f31..5de26180723 100644
--- a/addons/mrp/test/mrp_production_order.yml
+++ b/addons/mrp/test/mrp_production_order.yml
@@ -86,27 +86,27 @@
 -
   !python {model: mrp.procurement}: |
     from tools.translate import _
-    proc_ids = self.search(cr, uid, [('origin','=',':MO/00004')])
+    proc_ids = self.search(cr, uid, [('state','!=','confirmed')])
     assert proc_ids, _('No Procurements!')
 -
   The scheduler runs.
 -
   !function {model: mrp.procurement, name: run_scheduler}:
     - model: mrp.procurement
-      search: "[('origin','=',':MO/00004')]"
+      search: "[('state','=','confirmed')]"
 -
   I am checking Internal picking.
 -
   !python {model: stock.picking}: |
     from tools.translate import _
-    pick_ids = self.search(cr, uid, [('origin','=',':MO/00004'),('type','=','internal')])
+    pick_ids = self.search(cr, uid, [('state','!=','done'),('type','=','internal')])
     assert pick_ids, _('No Internal Pickings!')
 -
   I see that there is a manufacturing order for the subproduct of PC1 with ready state.
 -
   !python {model: mrp.production}: |
     from tools.translate import _
-    order_ids = self.search(cr, uid, [('origin','=',':MO/00004'),('state','=','ready')])
+    order_ids = self.search(cr, uid, [('state','=','confirmed')])
     assert order_ids, _('No manufacturing order!')
 -
   I start producing that product first. So I marked it as started.
@@ -117,7 +117,7 @@
 -
   !python {model: mrp.product.produce}: |
     prod_obj = self.pool.get('mrp.production')
-    prod_ids = prod_obj.search(cr, uid, [('origin','=',':MO/00004')])
+    prod_ids = prod_obj.search(cr, uid, [('state','=','confirmed')])
     self.do_produce(cr, uid, [1], context={'active_ids': prod_ids})
 -
   Now the manufacturing order for subproduct CPU_GEN is done. And manufacturing
@@ -125,7 +125,7 @@
 -
   !python {model: mrp.production}: |
     from tools.translate import _
-    prod_ids = self.search(cr, uid, [('origin','=',':MO/00004'),('state','=','done')])
+    prod_ids = self.search(cr, uid, [('state','!=','done')])
     assert prod_ids, _('Manufacturing order is yet not done!')
 -
   I start producing the product PC1.
diff --git a/addons/mrp_procurement/mrp_procurement_view.xml b/addons/mrp_procurement/mrp_procurement_view.xml
index 84b47ee516d..94ee009d7df 100644
--- a/addons/mrp_procurement/mrp_procurement_view.xml
+++ b/addons/mrp_procurement/mrp_procurement_view.xml
@@ -29,20 +29,20 @@
                 <form string="Procurement">
                     <group col="2" colspan="2">
                         <separator colspan="2" string="References"/>
-                        <field name="name" select="1" string="Procurement Reason"/>
+                        <field name="name" string="Procurement Reason"/>
                         <field name="origin"/>
-                        <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
+                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     </group>
                     <group col="2" colspan="2">
                         <separator colspan="2" string="Planification"/>
-                        <field name="date_planned" select="1"/>
+                        <field name="date_planned"/>
                         <field name="procure_method"/>
                         <field name="priority" groups="base.group_extended"/>
                     </group>
                     <notebook colspan="4">
                     <page string="Procurement Details">
                         <separator colspan="4" string="Product &amp; Location"/>
-                        <field name="product_id" select="1" on_change="onchange_product_id(product_id)"/>
+                        <field name="product_id" on_change="onchange_product_id(product_id)"/>
                         <field name="location_id" domain="[('usage','=','internal')]"/>
                         <field name="product_qty"/>
                         <field name="product_uom"/>
@@ -85,7 +85,7 @@
             <field name="arch" type="xml">
                 <search string="Search Procurement">
                     <group col='10' colspan='4'>
-                       <filter icon="terp-mrp" string="Current" domain="[('state','in',('draft','confirmed'))]" default="1" help="Procurement Orders in draft or open state."/>
+                       <filter icon="terp-mrp" string="Current" domain="[('state','in',('draft','confirmed'))]" name="current" help="Procurement Orders in draft or open state."/>
                        <filter icon="terp-mrp" string="Exceptions" domain="[('state','=','exception')]" help="Procurement Orders with exceptions"/>
                        <filter icon="terp-mrp" string="Late"
                            domain="['&amp;', ('date_planned::date','&lt;', current_date), ('state', 'in', ('draft', 'confirmed'))]"
@@ -112,6 +112,7 @@
             <field name="res_model">mrp.procurement</field>
             <field name="view_type">form</field>
             <field name="view_id" eval="False"/>
+            <field name="context">{'search_default_current':1}</field>
             <field name="search_view_id" ref="view_mrp_procurement_filter"/>
         </record>
 
@@ -179,11 +180,11 @@
             <field name="arch" type="xml">
                 <search string="Minimum Stock Rules Search">
                     <group col="10" colspan="4">
-                        <field name="name" select="1" />
-                        <field name="warehouse_id" select="1" widget="selection"/>
-                        <field name="location_id" select="1" />
-                        <field name="company_id" select="1" widget="selection"/>
-                        <field name="product_id" select="1"/>
+                        <field name="name"/>
+                        <field name="warehouse_id" widget="selection"/>
+                        <field name="location_id"/>
+                        <field name="company_id" widget="selection"/>
+                        <field name="product_id"/>
                     </group>
                     <newline/>
                     <group expand="1" string="Group By..." colspan="4" col="10">
diff --git a/addons/mrp_procurement/mrp_procurement_workflow.xml b/addons/mrp_procurement/mrp_procurement_workflow.xml
index 46c4a10fffc..5ab36dd4cb8 100644
--- a/addons/mrp_procurement/mrp_procurement_workflow.xml
+++ b/addons/mrp_procurement/mrp_procurement_workflow.xml
@@ -48,16 +48,16 @@
             <field name="kind">function</field>
             <field name="action">action_move_assigned()</field>
         </record>
-<!--        <record id="act_produce_check" model="workflow.activity">-->
-<!--            <field name="wkf_id" ref="wkf_procurement"/>-->
-<!--            <field name="name">produce_check</field>-->
-<!--        </record>-->
-<!--        <record id="act_produce_service" model="workflow.activity">-->
-<!--            <field name="wkf_id" ref="wkf_procurement"/>-->
-<!--            <field name="name">produce_service</field>-->
-<!--            <field name="kind">function</field>-->
-<!--            <field name="action">action_produce_assign_service()</field>-->
-<!--        </record>-->
+        <record id="act_produce_check" model="workflow.activity">
+            <field name="wkf_id" ref="wkf_procurement"/>
+            <field name="name">produce_check</field>
+        </record>
+        <record id="act_produce_service" model="workflow.activity">
+            <field name="wkf_id" ref="wkf_procurement"/>
+            <field name="name">produce_service</field>
+            <field name="kind">function</field>
+            <field name="action">action_produce_assign_service()</field>
+        </record>
         <record id="act_make_done" model="workflow.activity">
             <field name="wkf_id" ref="wkf_procurement"/>
             <field name="name">ready</field>
@@ -155,16 +155,16 @@
             <field name="act_to" ref="act_make_to_stock"/>
             <field name="condition">check_make_to_stock()</field>
         </record>
-<!--        <record id="trans_confirm_mto_produce_check" model="workflow.transition">-->
-<!--            <field name="act_from" ref="act_confirm_mto"/>-->
-<!--            <field name="act_to" ref="act_produce_check"/>-->
-<!--            <field name="condition">check_produce()</field>-->
-<!--        </record>-->
-<!--        <record id="trans_product_check_produce_service" model="workflow.transition">-->
-<!--            <field name="act_from" ref="act_produce_check"/>-->
-<!--            <field name="act_to" ref="act_produce_service"/>-->
-<!--            <field name="condition">not check_product()</field>-->
-<!--        </record>-->
+        <record id="trans_confirm_mto_produce_check" model="workflow.transition">
+            <field name="act_from" ref="act_confirm_mto"/>
+            <field name="act_to" ref="act_produce_check"/>
+            <field name="condition">check_produce()</field>
+        </record>
+        <record id="trans_product_check_produce_service" model="workflow.transition">
+            <field name="act_from" ref="act_produce_check"/>
+            <field name="act_to" ref="act_produce_service"/>
+            <field name="condition">not check_product()</field>
+        </record>
         <record id="trans_make_to_stock_make_done" model="workflow.transition">
             <field name="act_from" ref="act_make_to_stock"/>
             <field name="act_to" ref="act_make_done"/>
@@ -172,15 +172,15 @@
             <field name="trigger_model" eval="False"/>
             <field name="trigger_expr_id" eval="False"/>
         </record>
-<!--        <record id="trans_produce_service_cancel" model="workflow.transition">-->
-<!--            <field name="act_from" ref="act_produce_service"/>-->
-<!--            <field name="act_to" ref="act_cancel"/>-->
-<!--            <field name="signal">subflow.cancel</field>-->
-<!--        </record>-->
-<!--        <record id="trans_produce_service_make_done" model="workflow.transition">-->
-<!--            <field name="act_from" ref="act_produce_service"/>-->
-<!--            <field name="act_to" ref="act_make_done"/>-->
-<!--        </record>-->
+        <record id="trans_produce_service_cancel" model="workflow.transition">
+            <field name="act_from" ref="act_produce_service"/>
+            <field name="act_to" ref="act_cancel"/>
+            <field name="signal">subflow.cancel</field>
+        </record>
+        <record id="trans_produce_service_make_done" model="workflow.transition">
+            <field name="act_from" ref="act_produce_service"/>
+            <field name="act_to" ref="act_make_done"/>
+        </record>
         <record id="trans_make_done_done" model="workflow.transition">
             <field name="act_from" ref="act_make_done"/>
             <field name="act_to" ref="act_done"/>
diff --git a/addons/project_mrp/project_mrp_workflow.xml b/addons/project_mrp/project_mrp_workflow.xml
index a4f038f4ad2..43217d69f83 100644
--- a/addons/project_mrp/project_mrp_workflow.xml
+++ b/addons/project_mrp/project_mrp_workflow.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <openerp>
 <data>
-    <record model="workflow.transition" id="mrp.trans_produce_service_make_done">
-        <field name="act_from" ref="mrp.act_produce_service"/>
+    <record model="workflow.transition" id="mrp_procurement.trans_produce_service_make_done">
+        <field name="act_from" ref="mrp_procurement.act_produce_service"/>
         <field name="act_to" ref="mrp_procurement.act_make_done"/>
         <field name="signal">subflow.done</field>
     </record>

From 917eb7cafaebef0235dd9251df39790fbc960697 Mon Sep 17 00:00:00 2001
From: "mra (Open ERP)" <mra@tinyerp.com>
Date: Thu, 20 May 2010 15:15:44 +0530
Subject: [PATCH 64/82] [FIX] account: account_unreconcile

bzr revid: mra@tinyerp.com-20100520094544-wqp329twjdu8u6md
---
 .../wizard/account_automatic_reconcile.py      | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/addons/account/wizard/account_automatic_reconcile.py b/addons/account/wizard/account_automatic_reconcile.py
index 2370c6dbe13..f40ed23bb13 100644
--- a/addons/account/wizard/account_automatic_reconcile.py
+++ b/addons/account/wizard/account_automatic_reconcile.py
@@ -65,11 +65,14 @@ class account_automatic_reconcile(osv.osv_memory):
         if context is None:
             context = {}
         def check2(value, move_list, power):
+            print "::::::check2::::::::::",value, move_list, power
             def check(value, move_list, power):
                 for i in range(len(move_list)):
                     move = move_list[i]
+                    print "::::::::::::::::::",value,max_amount,move,move[1]
                     if power == 1:
                         if abs(value - move[1]) <= max_amount + 0.00001:
+                            print "^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^6"
                             return [move[0]]
                     else:
                         del move_list[i]
@@ -91,6 +94,7 @@ class account_automatic_reconcile(osv.osv_memory):
         # depending on the power. It starts with a power of one and goes up
         # to the max power allowed
         def check4(list1, list2, power):
+            print "::::::check4::::::::::",list1, list2, power
             def check3(value, list1, list2, list1power, power):
                 for i in range(len(list1)):
                     move = list1[i]
@@ -115,9 +119,12 @@ class account_automatic_reconcile(osv.osv_memory):
             return False
 
         def check5(list1, list2, max_power):
+            print "\n\n%%%%%%%%check5%%%%%%%%%%%%%%%%%%%",list1,list2,max_power
             for p in range(2, max_power+1):
                 res = check4(list1, list2, p)
+                print "RRRRRRRcheck5RRRRRRRR",res
                 if res:
+                    print "RRRRRRcheck5REtrunrn...",res
                     return res
 
         ok = True
@@ -125,10 +132,12 @@ class account_automatic_reconcile(osv.osv_memory):
         while credits and debits and ok:
             res = check5(credits, debits, power)
             if res:
+                print "Finallllllllllll RES",res
                 move_line_obj.reconcile(cr, uid, res[0] + res[1], 'auto', writeoff_acc_id, period_id, journal_id, context)
                 reconciled += len(res[0]) + len(res[1])
                 credits = [(id, credit) for (id, credit) in credits if id not in res[0]]
                 debits = [(id, debit) for (id, debit) in debits if id not in res[1]]
+                print "=================================",reconciled,credits,debits
             else:
                 ok = False
         return (reconciled, len(credits)+len(debits))
@@ -145,6 +154,7 @@ class account_automatic_reconcile(osv.osv_memory):
         reconciled = unreconciled = 0
         if not form['account_ids']:
             raise osv.except_osv(_('UserError'), _('You must select accounts to reconcile'))
+        print ">>>>START<<<<\n",form['account_ids']
         for account_id in form['account_ids']:
             # reconcile automatically all transactions from partners whose balance is 0
             cr.execute(
@@ -157,6 +167,7 @@ class account_automatic_reconcile(osv.osv_memory):
                 "HAVING ABS(SUM(debit-credit)) < %s AND count(*)>0",
                 (account_id, max_amount or 0.0))
             partner_ids = [id for (id,) in cr.fetchall()]
+            print "partner_ids:::::::::::::::::::::::::>>>",partner_ids
             for partner_id in partner_ids:
                 cr.execute(
                     "SELECT id " \
@@ -167,6 +178,7 @@ class account_automatic_reconcile(osv.osv_memory):
                     "AND reconcile_id IS NULL",
                     (account_id, partner_id))
                 line_ids = [id for (id,) in cr.fetchall()]
+                print "LLLLLLLLLLLLLLLLLLLLline idsssss....",line_ids
                 if len(line_ids):
                     move_line_obj.reconcile(cr, uid, line_ids, 'auto', form['writeoff_acc_id'], form['period_id'], form['journal_id'], context)
                     reconciled += len(line_ids)
@@ -183,6 +195,7 @@ class account_automatic_reconcile(osv.osv_memory):
                 "HAVING count(*)>1",
                 (account_id,))
             partner_ids = [id for (id,) in cr.fetchall()]
+            print "second partner idssssssssssssss",partner_ids
             #filter?
             for partner_id in partner_ids:
                 # get the list of unreconciled 'debit transactions' for this partner
@@ -196,6 +209,7 @@ class account_automatic_reconcile(osv.osv_memory):
                     "AND debit > 0",
                     (account_id, partner_id))
                 debits = cr.fetchall()
+                print "UUUUUUUUUUUUUUUUUU Debitssssssss",debits
 
                 # get the list of unreconciled 'credit transactions' for this partner
                 cr.execute(
@@ -208,14 +222,17 @@ class account_automatic_reconcile(osv.osv_memory):
                     "AND credit > 0",
                     (account_id, partner_id))
                 credits = cr.fetchall()
+                print "CCCCCCCCCCCCCCCCCCcreditttt.....",credits
 
                 (rec, unrec) = self.do_reconcile(cr, uid, credits, debits, max_amount, power, form['writeoff_acc_id'], form['period_id'], form['journal_id'], context)
+                print "()(()(((rec, unrec))((()()()",(rec, unrec)
                 reconciled += rec
                 unreconciled += unrec
 
             # add the number of transactions for partners who have only one
             # unreconciled transactions to the unreconciled count
             partner_filter = partner_ids and 'AND partner_id not in (%s)' % ','.join(map(str, filter(None, partner_ids))) or ''
+            print "Partner fileterrrrrrrrrrrr",partner_filter
             cr.execute(
                 "SELECT count(*) " \
                 "FROM account_move_line " \
@@ -224,6 +241,7 @@ class account_automatic_reconcile(osv.osv_memory):
                 "AND state <> 'draft' " + partner_filter,
                 (account_id,))
             additional_unrec = cr.fetchone()[0]
+            print "^^^^^^^^^^^^^^^^^^^^^",additional_unrec
         context.update({'reconciled': reconciled, 'unreconciled': unreconciled + additional_unrec})
         model_data_ids = obj_model.search(cr,uid,[('model','=','ir.ui.view'),('name','=','account_automatic_reconcile_view1')])
         resource_id = obj_model.read(cr, uid, model_data_ids, fields=['res_id'])[0]['res_id']

From be5cd712c591b7f25362cf6701116802ee89e69a Mon Sep 17 00:00:00 2001
From: Quentin De Paoli <qdp@cyan>
Date: Thu, 20 May 2010 12:01:51 +0200
Subject: [PATCH 65/82] [FIX] temporary comment

bzr revid: qdp@cyan-20100520100151-59ae13nfrw3zvvua
---
 addons/project_mrp/__openerp__.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/project_mrp/__openerp__.py b/addons/project_mrp/__openerp__.py
index e94f43b3ad2..ee5a94208aa 100644
--- a/addons/project_mrp/__openerp__.py
+++ b/addons/project_mrp/__openerp__.py
@@ -49,7 +49,9 @@ automatically created via sale orders.
     'website': 'http://www.openerp.com',
     'depends': ['project', 'mrp_procurement', 'sale', 'mrp_jit'],
     'init_xml': [],
-    'update_xml': ['project_mrp_workflow.xml', 'process/project_mrp_process.xml'],
+    'update_xml': ['project_mrp_workflow.xml', 
+                   #'process/project_mrp_process.xml',
+                   ],
     'demo_xml': [],
     'installable': True,
     'active': False,

From 6e8e41be7e83a56f686e578eaaa39759a468d6d1 Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Thu, 20 May 2010 16:37:21 +0530
Subject: [PATCH 66/82] [IMP]: improve the idea vore wzard

bzr revid: mga@tinyerp.com-20100520110721-pqmchd3zocbnrac0
---
 addons/idea/idea.py                  | 3 +--
 addons/idea/idea_view.xml            | 7 ++++++-
 addons/idea/wizard/idea_post_vote.py | 6 ++++--
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/addons/idea/idea.py b/addons/idea/idea.py
index e46115c5639..ba91389246b 100644
--- a/addons/idea/idea.py
+++ b/addons/idea/idea.py
@@ -150,11 +150,10 @@ class idea_idea(osv.osv):
             if int(field_value) >= 0:
                 vote_obj.create(cr, uid, {'idea_id': id, 'user_id': uid, 'score': textual_value })
 
-
     _columns = {
         'user_id': fields.many2one('res.users', 'Creator', required=True, readonly=True),
         'title': fields.char('Idea Summary', size=64, required=True),
-        'description': fields.text('Description', required=True, help='Content of the idea'),
+        'description': fields.text('Description', help='Content of the idea'),
         'comment_ids': fields.one2many('idea.comment', 'idea_id', 'Comments'),
         'create_date': fields.datetime('Creation date', readonly=True),
         'vote_ids': fields.one2many('idea.vote', 'idea_id', 'Vote'),
diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index b268a64d991..053aca6f203 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -152,7 +152,12 @@
                     </field>
                 </page>
                 <page string="Vote" groups="base.group_extended">
-                    <field name="vote_ids" nolabel="1" colspan="4" readonly="True"/>
+                    <field name="vote_ids" nolabel="1" colspan="4" readonly="True">
+                        <tree string="Votes">
+                            <field name="user_id"/>
+                            <field name="score" />
+                        </tree>
+                    </field>
                 </page>
                 <page string="Statistics">
                     <group col="6" colspan="4">
diff --git a/addons/idea/wizard/idea_post_vote.py b/addons/idea/wizard/idea_post_vote.py
index f68496c8ae5..fb36f7945a4 100644
--- a/addons/idea/wizard/idea_post_vote.py
+++ b/addons/idea/wizard/idea_post_vote.py
@@ -89,6 +89,7 @@ class idea_post_vote(osv.osv_memory):
         
         vote_id = context and context.get('active_id', False) or False
         vote_pool = self.pool.get('idea.vote')
+        idea_pool = self.pool.get('idea.idea')
         comment_pool = self.pool.get('idea.comment')
 
         for do_vote_obj in self.read(cr, uid, ids):
@@ -106,8 +107,9 @@ class idea_post_vote(osv.osv_memory):
                     'content': comment,
                 }
                 comment = comment_pool.create(cr, uid, comment)
-                
-            vote = vote_pool.create(cr, uid, vote)
+
+            idea_pool._vote_save(cr, uid, vote_id, None, score, context)
+            #vote = vote_pool.create(cr, uid, vote)
             return {}
 
 idea_post_vote()

From 129cfb45727e84c0b10daf933a6f730fdd5b5e56 Mon Sep 17 00:00:00 2001
From: mso <mso@mso>
Date: Thu, 20 May 2010 16:40:36 +0530
Subject: [PATCH 67/82] [FIX]purchase_requisition:small change in
 onchange_product_id method

bzr revid: mso@mso-20100520111036-i6f05dgllwr9ecyx
---
 addons/purchase_requisition/purchase_requisition.py | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/addons/purchase_requisition/purchase_requisition.py b/addons/purchase_requisition/purchase_requisition.py
index 77234889391..85c35b277c5 100644
--- a/addons/purchase_requisition/purchase_requisition.py
+++ b/addons/purchase_requisition/purchase_requisition.py
@@ -93,22 +93,17 @@ class purchase_requisition_line(osv.osv):
         @param product_id: Changed product_id
         @return:  Dictionary of changed values
         """
-        value = {}
-        
+        value = {'product_uom_id': ''}
         if product_id:
             prod = self.pool.get('product.product').browse(cr, uid, [product_id])[0]
             value = {'product_uom_id': prod.uom_id.id}
-            if product_uom_id != prod.uom_id.id:
-                value = {'product_uom_id': prod.uom_id.id}            
         return {'value': value}
 
     _defaults = {
                  'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
                  }
-
 purchase_requisition_line()
 
-
 class purchase_order(osv.osv):
     _inherit = "purchase.order"
     _columns = {

From 9db96a7573c0fd97a59e540609bc95b867087da4 Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Thu, 20 May 2010 17:32:51 +0530
Subject: [PATCH 68/82] [REF]

bzr revid: jvo@tinyerp.com-20100520120251-e1n70n8j3iyu2s5a
---
 addons/account/account_bank_statement.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index 9b1497b563f..81b6e3157a1 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -630,7 +630,7 @@ class account_bank_statement_line(osv.osv):
         'statement_id': fields.many2one('account.bank.statement', 'Statement',
             select=True, required=True, ondelete='cascade'),
         'reconcile_id': fields.many2one('account.bank.statement.reconcile',
-            'Reconcile', states={'confirm':[('readonly',True)]}),
+            'Reconcile'),
         'move_ids': fields.many2many('account.move',
             'account_bank_statement_line_move_rel', 'move_id','statement_id',
             'Moves'),

From ecd8f4b46ed1d7cd08d22eda63c0ffc65b1c9733 Mon Sep 17 00:00:00 2001
From: "mra (Open ERP)" <mra@tinyerp.com>
Date: Thu, 20 May 2010 17:54:18 +0530
Subject: [PATCH 69/82] [IMP] account

bzr revid: mra@tinyerp.com-20100520122418-x5tj5nmvmyf3b0ny
---
 .../wizard/account_automatic_reconcile.py      | 18 ------------------
 addons/account/wizard/account_unreconcile.py   |  6 +++---
 2 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/addons/account/wizard/account_automatic_reconcile.py b/addons/account/wizard/account_automatic_reconcile.py
index f40ed23bb13..2370c6dbe13 100644
--- a/addons/account/wizard/account_automatic_reconcile.py
+++ b/addons/account/wizard/account_automatic_reconcile.py
@@ -65,14 +65,11 @@ class account_automatic_reconcile(osv.osv_memory):
         if context is None:
             context = {}
         def check2(value, move_list, power):
-            print "::::::check2::::::::::",value, move_list, power
             def check(value, move_list, power):
                 for i in range(len(move_list)):
                     move = move_list[i]
-                    print "::::::::::::::::::",value,max_amount,move,move[1]
                     if power == 1:
                         if abs(value - move[1]) <= max_amount + 0.00001:
-                            print "^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^6"
                             return [move[0]]
                     else:
                         del move_list[i]
@@ -94,7 +91,6 @@ class account_automatic_reconcile(osv.osv_memory):
         # depending on the power. It starts with a power of one and goes up
         # to the max power allowed
         def check4(list1, list2, power):
-            print "::::::check4::::::::::",list1, list2, power
             def check3(value, list1, list2, list1power, power):
                 for i in range(len(list1)):
                     move = list1[i]
@@ -119,12 +115,9 @@ class account_automatic_reconcile(osv.osv_memory):
             return False
 
         def check5(list1, list2, max_power):
-            print "\n\n%%%%%%%%check5%%%%%%%%%%%%%%%%%%%",list1,list2,max_power
             for p in range(2, max_power+1):
                 res = check4(list1, list2, p)
-                print "RRRRRRRcheck5RRRRRRRR",res
                 if res:
-                    print "RRRRRRcheck5REtrunrn...",res
                     return res
 
         ok = True
@@ -132,12 +125,10 @@ class account_automatic_reconcile(osv.osv_memory):
         while credits and debits and ok:
             res = check5(credits, debits, power)
             if res:
-                print "Finallllllllllll RES",res
                 move_line_obj.reconcile(cr, uid, res[0] + res[1], 'auto', writeoff_acc_id, period_id, journal_id, context)
                 reconciled += len(res[0]) + len(res[1])
                 credits = [(id, credit) for (id, credit) in credits if id not in res[0]]
                 debits = [(id, debit) for (id, debit) in debits if id not in res[1]]
-                print "=================================",reconciled,credits,debits
             else:
                 ok = False
         return (reconciled, len(credits)+len(debits))
@@ -154,7 +145,6 @@ class account_automatic_reconcile(osv.osv_memory):
         reconciled = unreconciled = 0
         if not form['account_ids']:
             raise osv.except_osv(_('UserError'), _('You must select accounts to reconcile'))
-        print ">>>>START<<<<\n",form['account_ids']
         for account_id in form['account_ids']:
             # reconcile automatically all transactions from partners whose balance is 0
             cr.execute(
@@ -167,7 +157,6 @@ class account_automatic_reconcile(osv.osv_memory):
                 "HAVING ABS(SUM(debit-credit)) < %s AND count(*)>0",
                 (account_id, max_amount or 0.0))
             partner_ids = [id for (id,) in cr.fetchall()]
-            print "partner_ids:::::::::::::::::::::::::>>>",partner_ids
             for partner_id in partner_ids:
                 cr.execute(
                     "SELECT id " \
@@ -178,7 +167,6 @@ class account_automatic_reconcile(osv.osv_memory):
                     "AND reconcile_id IS NULL",
                     (account_id, partner_id))
                 line_ids = [id for (id,) in cr.fetchall()]
-                print "LLLLLLLLLLLLLLLLLLLLline idsssss....",line_ids
                 if len(line_ids):
                     move_line_obj.reconcile(cr, uid, line_ids, 'auto', form['writeoff_acc_id'], form['period_id'], form['journal_id'], context)
                     reconciled += len(line_ids)
@@ -195,7 +183,6 @@ class account_automatic_reconcile(osv.osv_memory):
                 "HAVING count(*)>1",
                 (account_id,))
             partner_ids = [id for (id,) in cr.fetchall()]
-            print "second partner idssssssssssssss",partner_ids
             #filter?
             for partner_id in partner_ids:
                 # get the list of unreconciled 'debit transactions' for this partner
@@ -209,7 +196,6 @@ class account_automatic_reconcile(osv.osv_memory):
                     "AND debit > 0",
                     (account_id, partner_id))
                 debits = cr.fetchall()
-                print "UUUUUUUUUUUUUUUUUU Debitssssssss",debits
 
                 # get the list of unreconciled 'credit transactions' for this partner
                 cr.execute(
@@ -222,17 +208,14 @@ class account_automatic_reconcile(osv.osv_memory):
                     "AND credit > 0",
                     (account_id, partner_id))
                 credits = cr.fetchall()
-                print "CCCCCCCCCCCCCCCCCCcreditttt.....",credits
 
                 (rec, unrec) = self.do_reconcile(cr, uid, credits, debits, max_amount, power, form['writeoff_acc_id'], form['period_id'], form['journal_id'], context)
-                print "()(()(((rec, unrec))((()()()",(rec, unrec)
                 reconciled += rec
                 unreconciled += unrec
 
             # add the number of transactions for partners who have only one
             # unreconciled transactions to the unreconciled count
             partner_filter = partner_ids and 'AND partner_id not in (%s)' % ','.join(map(str, filter(None, partner_ids))) or ''
-            print "Partner fileterrrrrrrrrrrr",partner_filter
             cr.execute(
                 "SELECT count(*) " \
                 "FROM account_move_line " \
@@ -241,7 +224,6 @@ class account_automatic_reconcile(osv.osv_memory):
                 "AND state <> 'draft' " + partner_filter,
                 (account_id,))
             additional_unrec = cr.fetchone()[0]
-            print "^^^^^^^^^^^^^^^^^^^^^",additional_unrec
         context.update({'reconciled': reconciled, 'unreconciled': unreconciled + additional_unrec})
         model_data_ids = obj_model.search(cr,uid,[('model','=','ir.ui.view'),('name','=','account_automatic_reconcile_view1')])
         resource_id = obj_model.read(cr, uid, model_data_ids, fields=['res_id'])[0]['res_id']
diff --git a/addons/account/wizard/account_unreconcile.py b/addons/account/wizard/account_unreconcile.py
index c1de3294c79..02e6ee2515e 100644
--- a/addons/account/wizard/account_unreconcile.py
+++ b/addons/account/wizard/account_unreconcile.py
@@ -29,7 +29,7 @@ class account_unreconcile(osv.osv_memory):
         obj_move_reconcile = self.pool.get('account.move.reconcile')
         if context is None:
             context = {}
-        recs = pool.get('account.move.line').read(cr, uid, data['ids'], ['reconcile_id','reconcile_partial_id'])
+        recs = obj_move_line.read(cr, uid, data['ids'], ['reconcile_id','reconcile_partial_id'])
         unlink_ids = []
         full_recs = filter(lambda x: x['reconcile_id'], recs)
         rec_ids = [rec['reconcile_id'][0] for rec in full_recs]
@@ -37,9 +37,9 @@ class account_unreconcile(osv.osv_memory):
         part_rec_ids = [rec['reconcile_partial_id'][0] for rec in part_recs]
         unlink_ids += rec_ids
         unlink_ids += part_rec_ids
-    
+
         if len(unlink_ids):
-            pooler.get_pool(cr.dbname).get('account.move.reconcile').unlink(cr, uid, unlink_ids)
+            self.pool.get('account.move.reconcile').unlink(cr, uid, unlink_ids)
         return {}
 
 account_unreconcile()

From bd5ac7295680272b0bc6e0ef46cec62c52b9d475 Mon Sep 17 00:00:00 2001
From: mso <mso@mso>
Date: Thu, 20 May 2010 19:47:02 +0530
Subject: [PATCH 70/82] [FIX] select=1 is removed from tree views, form views
 whose search view exist; tracking_id is renamed to tracking_lot in context

bzr revid: mso@mso-20100520141702-m5rkxyda8n5yw1db
---
 addons/mrp/mrp_view.xml                   |  4 +-
 addons/stock/stock.py                     | 36 ++++++++--------
 addons/stock/stock_view.xml               | 50 +++++++++++------------
 addons/stock/wizard/stock_partial_move.py |  8 ++--
 4 files changed, 48 insertions(+), 50 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 1c7dce6e30b..3a478495efb 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -166,7 +166,7 @@
             <field name="arch" type="xml">
                 <tree string="Routing Work Centers">
                     <field name="sequence"/>
-                    <field name="workcenter_id" select="1"/>
+                    <field name="workcenter_id"/>
                     <field name="cycle_nbr"/>
                     <field name="hour_nbr"/>
                 </tree>
@@ -249,7 +249,7 @@
                         <newline/>
                         <field name="product_uom"/>
                         <field name="product_qty"/>
-                        <field name="routing_id" groups="base.group_extended" select="1"/>
+                        <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"/>
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index f4fad43086c..27930c8a3e7 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -351,20 +351,18 @@ class stock_tracking(osv.osv):
     _name = "stock.tracking"
     _description = "Stock Tracking Lots"
     
-    def get_create_tracking_lot(self, cr, uid, ids, context):
-        tracking_id = context.get('tracking_id', False)
-        tracking_id_list = self.search(cr, uid, [('name', '=', tracking_id)],
+    def get_create_tracking_lot(self, cr, uid, ids, tracking_lot):
+        tracking_lot_list = self.search(cr, uid, [('name', '=', tracking_lot)],
                                             limit=1)
-        if tracking_id_list:
-            tracking_id = tracking_id_list[0]
-        tracking_obj = self.browse(cr, uid, tracking_id)
+        if tracking_lot_list:
+            tracking_lot = tracking_lot_list[0]
+        tracking_obj = self.browse(cr, uid, tracking_lot)
         if not tracking_obj:
             tracking_lot_vals = {
-                'name': tracking_id
+                'name': tracking_lot
                 }
-            tracking_id = self.create(cr, uid, tracking_lot_vals,
-                    context=context)
-        return tracking_id
+            tracking_lot = self.create(cr, uid, tracking_lot_vals)
+        return tracking_lot
     def checksum(sscc):
         salt = '31' * 8 + '3'
         sum = 0
@@ -1650,15 +1648,15 @@ class stock_move(osv.osv):
                         'line_id': lines,
                         'ref': ref,
                     })
-        tracking_id = False                    
+        tracking_lot = False                    
         if context:
-            tracking_id = context.get('tracking_id', False)
-            if tracking_id:
+            tracking_lot = context.get('tracking_lot', False)
+            if tracking_lot:
                 rec_id = context and context.get('active_id', False)
                 tracking = self.pool.get('stock.tracking')
-                tracking_id = tracking.get_create_tracking_lot(cr, uid,[rec_id], context=context )        
+                tracking_lot = tracking.get_create_tracking_lot(cr, uid,[rec_id], tracking_lot)        
                  
-        self.write(cr, uid, ids, {'state': 'done', 'date_planned': time.strftime('%Y-%m-%d %H:%M:%S'), 'tracking_id': tracking_id or False})
+        self.write(cr, uid, ids, {'state': 'done', 'date_planned': time.strftime('%Y-%m-%d %H:%M:%S'), 'tracking_id': tracking_lot or False})
         picking_obj = self.pool.get('stock.picking')
         for pick in picking_obj.browse(cr, uid, picking_ids):
             if all(move.state == 'done' for move in pick.move_lines):
@@ -1878,7 +1876,7 @@ class stock_move(osv.osv):
         partner_id = partial_datas.get('partner_id', False)
         address_id = partial_datas.get('address_id', False)
         delivery_date = partial_datas.get('delivery_date', False)
-        tracking_id = context.get('tracking_id', False)
+        tracking_lot = context.get('tracking_lot', False)
         
         new_moves = []
 
@@ -1897,7 +1895,7 @@ class stock_move(osv.osv):
             if move.product_qty == product_qty:
                 self.write(cr, uid, move.id,
                 {
-                    'tracking_id': tracking_id
+                    'tracking_id': tracking_lot
                 })
                 complete.append(move)
             elif move.product_qty > product_qty:
@@ -1943,7 +1941,7 @@ class stock_move(osv.osv):
                         'state': 'assigned',
                         'move_dest_id': False,
                         'price_unit': move.price_unit,
-                        'tracking_id': tracking_id,
+                        'tracking_id': tracking_lot,
                     })
                 complete.append(self.browse(cr, uid, new_move))
             self.write(cr, uid, move.id,
@@ -1958,7 +1956,7 @@ class stock_move(osv.osv):
                     {
                         'product_qty': move.product_qty,
                         'product_uos_qty': move.product_qty,
-                        'tracking_id': tracking_id
+                        'tracking_id': tracking_lot
                     })
             complete.append(move)
 
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 13ee27bd6c0..5cb543b748e 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -192,9 +192,9 @@
             <field name="field_parent">child_ids</field>
             <field name="arch" type="xml">
                 <tree colors="grey:not active" string="Tracking Number">
-                    <field name="name" select="1"/>
-                    <field name="serial" select="1"/>
-                    <field name="date" select="1"/>
+                    <field name="name" />
+                    <field name="serial" />
+                    <field name="date" />
                 </tree>
             </field>
         </record>
@@ -308,17 +308,17 @@
             <field name="field_parent">move_history_ids</field>
             <field name="arch" type="xml">
                 <tree colors="grey:state in ('cancel')" string="Moves">
-                    <field name="product_id" select="1"/>
-                    <field name="product_qty" select="1"/>
-                    <field name="product_uom" select="1" string="UOM"/>
-                    <field name="prodlot_id" select="1" groups="base.group_extended"/>
+                    <field name="product_id" />
+                    <field name="product_qty" />
+                    <field name="product_uom"  string="UOM"/>
+                    <field name="prodlot_id"  groups="base.group_extended"/>
                     <field name="product_packaging" domain="[('product_id','=',product_id)]" groups="base.group_extended"/>
                     <field name="picking_id"/>
-                    <field name="location_id" select="1"/>
-                    <field name="location_dest_id" select="1"/>
-                    <field name="date" select="1"/>
-                    <field name="date_planned" select="1" string="Date"/>
-                    <field name="date_expected" select="1" string="Date Expected"/>
+                    <field name="location_id" />
+                    <field name="location_dest_id" />
+                    <field name="date"/>
+                    <field name="date_planned" string="Date"/>
+                    <field name="date_expected" string="Date Expected"/>
                     <field name="state"/>
                 </tree>
             </field>
@@ -331,17 +331,17 @@
             <field name="field_parent">move_history_ids2</field>
             <field name="arch" type="xml">
                 <tree colors="grey:state in ('cancel')" string="Moves">
-                    <field name="product_id" select="1"/>
-                    <field name="product_qty" select="1"/>
-                    <field name="product_uom" select="1" string="UOM"/>
-                    <field name="prodlot_id" select="1" groups="base.group_extended"/>
+                    <field name="product_id" />
+                    <field name="product_qty" />
+                    <field name="product_uom"  string="UOM"/>
+                    <field name="prodlot_id"  groups="base.group_extended"/>
                     <field name="product_packaging" domain="[('product_id','=',product_id)]" groups="base.group_extended"/>
                     <field name="picking_id"/>
-                    <field name="location_id" select="1"/>
-                    <field name="location_dest_id" select="1"/>
-                    <field name="date" select="1"/>
-                    <field name="date_planned" select="1" string="Date"/>
- 					<field name="date_expected" select="1" string="Date Expected"/>                    
+                    <field name="location_id" />
+                    <field name="location_dest_id" />
+                    <field name="date" />
+                    <field name="date_planned" string="Date"/>
+ 					<field name="date_expected" string="Date Expected"/>                    
                     <field name="state"/>
                 </tree>
             </field>
@@ -625,7 +625,7 @@
                                     <field name="location_id"/>
                                     <field name="location_dest_id"/>
                                     <field name="date_planned"/>
-                                    <field name="date_expected" select="1" string="Date Expected"/>
+                                    <field name="date_expected" string="Date Expected"/>
                                     <field name="state"/>
                                     <button
                                         name="%(stock.track_line)d"
@@ -652,7 +652,7 @@
                                             <field colspan="4" invisible="1" name="name"/>
                                             <field invisible="1" name="date"/>
                                             <field name="date_planned"/>
- 											<field name="date_expected" select="1" string="Date Expected"/>                                            
+ 											<field name="date_expected" string="Date Expected"/>                                            
                                             <field name="address_id" context="{'contact_display':'partner'}"/>
                                             <field groups="base.group_extended" name="product_packaging" domain="[('product_id','=',product_id)]"/>
                                             <field name="prodlot_id" groups="base.group_extended"
@@ -777,7 +777,7 @@
                                     <field name="location_id"/>
                                     <field name="location_dest_id"/>
                                     <field name="date_planned"/>
- 									<field name="date_expected" select="1" string="Date Expected"/>                                    
+ 									<field name="date_expected" string="Date Expected"/>                                    
                                     <field name="state"/>
                                     <button
                                            name="%(stock.track_line)d"
@@ -1528,7 +1528,7 @@
                     </group>
                     <newline/>
                     <group col='8' colspan='14' expand="1" string="Tracking Lots">
-                       <field name="tracking_id" context="{'tracking_id': self}" />
+                       <field name="tracking_id" context="{'tracking_lot': self}" />
                     </group>
                     <newline/>
                     <group expand="1" string="Group By..." colspan="4" col="8">
diff --git a/addons/stock/wizard/stock_partial_move.py b/addons/stock/wizard/stock_partial_move.py
index dc4e6d465db..4a5206d1ef0 100644
--- a/addons/stock/wizard/stock_partial_move.py
+++ b/addons/stock/wizard/stock_partial_move.py
@@ -187,11 +187,11 @@ class stock_partial_move(osv.osv_memory):
 
     def do_partial(self, cr, uid, ids, context):    
         rec_id = context and context.get('active_id', False)
-        tracking_id = context.get('tracking_id', False)
-        if tracking_id:
+        tracking_lot = context.get('tracking_lot', False)
+        if tracking_lot:
             tracking = self.pool.get('stock.tracking')
-            tracking_id = tracking.get_create_tracking_lot(cr, uid,[rec_id], context=context )        
-            context ['tracking_id'] = tracking_id 
+            tracking_lot = tracking.get_create_tracking_lot(cr, uid,[rec_id], tracking_lot)        
+            context ['tracking_lot'] = tracking_lot 
         move_obj = self.pool.get('stock.move')    
         move_ids = context.get('active_ids', False)
         partial = self.browse(cr, uid, ids[0], context)

From d7cad67e0b8ec4a4956dc30f22e2c6e215eb057f Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Thu, 20 May 2010 20:03:43 +0530
Subject: [PATCH 71/82] [IMP]: implement new method that computes the level of
 account ref: developer by vra

bzr revid: mga@tinyerp.com-20100520143343-cjk2u4fmjni6xjq9
---
 addons/account/account.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/addons/account/account.py b/addons/account/account.py
index 88a9848f3bb..a3f66530bc3 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -297,6 +297,17 @@ class account_account(osv.osv):
 
         return result
 
+    def _get_level(self, cr, uid, ids, field_name, arg, context={}):
+        res={}
+        accounts = self.browse(cr, uid, ids)
+        for account in accounts:
+            level = 0
+            if account.parent_id :
+                obj = self.browse(cr, uid, account.parent_id.id)
+                level = obj.level + 1
+            res[account.id] = level
+        return res
+    
     _columns = {
         'name': fields.char('Name', size=128, required=True, select=True),
         'currency_id': fields.many2one('res.currency', 'Secondary Currency', help="Forces all moves for this account to have this secondary currency."),
@@ -343,6 +354,7 @@ class account_account(osv.osv):
         'check_history': fields.boolean('Display History',
             help="Check this box if you want to print all entries when printing the General Ledger, "\
             "otherwise it will only print its balance."),
+        'level': fields.function(_get_level, string='Level', method=True, store=True, type='integer'),
     }
 
     def _default_company(self, cr, uid, context={}):

From 42f66754af684925b78f568e97edb38167785d9d Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Thu, 20 May 2010 20:12:16 +0530
Subject: [PATCH 72/82] [IMP]: improvement in account voucher [MOVE]: account
 opening balance functionalities move to trunk-extra-addons

bzr revid: mga@tinyerp.com-20100520144216-dekfsekc64lnjgc2
---
 addons/account_voucher/__init__.py            |   1 -
 addons/account_voucher/__openerp__.py         |   3 +-
 addons/account_voucher/account.py             | 219 ------------------
 addons/account_voucher/account_report.xml     |  22 --
 addons/account_voucher/account_view.xml       |  76 ------
 .../account_voucher/report/report_voucher.py  |   1 -
 .../account_voucher/report/report_voucher.rml |   2 +-
 .../report/report_voucher_amount.py           |   3 +-
 .../wizard/account_voucher_open_view.xml      |  42 ++--
 9 files changed, 24 insertions(+), 345 deletions(-)
 delete mode 100644 addons/account_voucher/account.py
 delete mode 100644 addons/account_voucher/account_report.xml
 delete mode 100644 addons/account_voucher/account_view.xml

diff --git a/addons/account_voucher/__init__.py b/addons/account_voucher/__init__.py
index 8a2c3e40699..3d27cf04c78 100644
--- a/addons/account_voucher/__init__.py
+++ b/addons/account_voucher/__init__.py
@@ -20,6 +20,5 @@
 ##############################################################################
 
 import voucher
-import account
 import report
 import wizard
diff --git a/addons/account_voucher/__openerp__.py b/addons/account_voucher/__openerp__.py
index a3813f47fee..14265e3403a 100644
--- a/addons/account_voucher/__openerp__.py
+++ b/addons/account_voucher/__openerp__.py
@@ -46,10 +46,9 @@
     "update_xml" : [
         "security/ir.model.access.csv",
         "voucher_sequence.xml",
-        "account_report.xml",
+        "voucher_report.xml",
         "voucher_view.xml",
         "voucher_wizard.xml",
-        "account_view.xml",
         "wizard/account_voucher_open_view.xml",
     ],
     'certificate': '0037580727101',
diff --git a/addons/account_voucher/account.py b/addons/account_voucher/account.py
deleted file mode 100644
index 7cdbfc6b444..00000000000
--- a/addons/account_voucher/account.py
+++ /dev/null
@@ -1,219 +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 time
-import netsvc
-from osv import fields, osv
-import ir
-import pooler
-import mx.DateTime
-from mx.DateTime import RelativeDateTime
-from tools import config
-
-class account_account(osv.osv):
-    _inherit = "account.account"
-    
-    def _get_level(self, cr, uid, ids, field_name, arg, context={}):
-        res={}
-        acc_obj=self.browse(cr,uid,ids)
-        for aobj in acc_obj:
-            level = 0
-            if aobj.parent_id :
-                obj=self.browse(cr,uid,aobj.parent_id.id)
-                level= obj.level + 1
-            res[aobj.id] = level
-        return res
-    
-    def _get_children_and_consol(self, cr, uid, ids, context={}):
-        ids2=[]
-        temp=[]
-        read_data= self.read(cr, uid, ids,['id','child_id'], context)
-        for data in read_data:
-            ids2.append(data['id'])
-            if data['child_id']:
-                temp=[]
-                for x in data['child_id']:
-                    temp.append(x)
-                ids2 += self._get_children_and_consol(cr, uid, temp, context)
-        return ids2
-
-    _columns = {
-        'journal_id':fields.many2one('account.journal', 'Journal',domain=[('type','=','situation')]),
-        'open_bal' : fields.float('Opening Balance',digits=(16,2)),
-        'level': fields.function(_get_level, string='Level', method=True, store=True, type='integer'),
-        'type1':fields.selection([('dr','Debit'),('cr','Credit'),('none','None')], 'Dr/Cr',store=True),
-    }
-    
-    def compute_total(self, cr, uid, ids, yr_st_date, yr_end_date, st_date, end_date, field_names, context={}):
-        if not (st_date >= yr_st_date and end_date <= yr_end_date):
-            return {}
-        query = "l.date >= '%s' AND l.date <= '%s'" % (st_date, end_date)
-        return self.__compute(cr, uid, ids, field_names, context=context, query=query)
-        
-    def create(self, cr, uid, vals, context={}):
-        name=self.search(cr,uid,[('name','ilike',vals['name']),('company_id','=',vals['name'])])
-        if name:
-            raise osv.except_osv('Error', 'Account is Already Created !')
-        obj=self.pool.get('account.account.type').browse(cr,uid,vals['user_type'])
-        if obj.code in ('cash','asset','expense'):
-            vals['type1'] = 'dr'
-        elif obj.code in ('equity','income','liability') : 
-             vals['type1'] = 'cr'
-        else:
-             vals['type1'] = 'none'
-        journal_ids=self.pool.get('account.journal').search(cr,uid,[('name','=','Opening Journal')])
-        vals['journal_id'] = journal_ids and journal_ids[0] or False
-        account_id = super(account_account, self).create(cr, uid, vals, context)
-        if vals.get('type1', False) != False:
-            journal_id = vals.get('journal_id',False)
-            if journal_id and vals.has_key('open_bal'):
-                if vals['open_bal'] != 0.0:
-                    journal = self.pool.get('account.journal').browse(cr, uid, [journal_id])
-                    if journal and journal[0].sequence_id:
-                        name = self.pool.get('ir.sequence').get_id(cr, uid, journal[0].sequence_id.id)
-                    move=self.pool.get('account.move').search(cr,uid,[('journal_id','=',journal_id)])
-                    if not move:
-                        move = False
-                        move_data = {'name': name, 'journal_id': journal_id}
-                        move_id=self.pool.get('account.move').create(cr,uid,move_data)
-                        move_obj=self.pool.get('account.move').browse(cr,uid,move_id)
-                    else:
-                        move_obj=self.pool.get('account.move').browse(cr,uid,move[0])
-                    self_obj=self.browse(cr,uid,account_id)
-                    move_line = {
-                         'name':journal[0].name,
-                         'debit':self_obj.debit or False,
-                         'credit':self_obj.credit or False,
-                         'account_id':account_id or False,
-                         'move_id':move and move[0] or move_id,
-                         'journal_id':journal_id ,
-                         'period_id':move_obj.period_id.id,
-                 }
-                    if vals['type1'] == 'dr':
-                        move_line['debit'] = vals['open_bal'] or False
-                    elif vals['type1'] == 'cr':
-                        move_line['credit'] = vals['open_bal'] or False
-                    self.pool.get('account.move.line').create(cr,uid,move_line)
-        return account_id
-
-    def write(self, cr, uid, ids, vals, context=None, check=True, update_check=True):
-        res_temp={}
-        if vals.has_key('name'):
-            if not vals.has_key('company_id'):
-                vals['company_id']=self.browse(cr,uid,ids)[0].company_id.id
-            name=self.search(cr,uid,[('name','ilike',vals['name']),('company_id','=',vals['company_id'])])
-            if name:
-                raise osv.except_osv('Error', 'Same Account Name is Already present !')
-        if vals.has_key('user_type'):
-            obj=self.pool.get('account.account.type').browse(cr,uid,vals['user_type'])
-            if obj.code in ('asset','expense'):
-                vals['type1'] = 'dr'
-            elif obj.code in ('income','liability') : 
-                 vals['type1'] = 'cr'
-            else:
-                 vals['type1'] = 'none'
-        super(account_account, self).write(cr, uid,ids, vals, context)
-        if vals.has_key('open_bal'):
-            self_obj= self.browse(cr,uid,ids)
-            move_pool=self.pool.get('account.move')
-            if vals:
-                for obj in self_obj:
-                    flg=0
-                    if obj.journal_id and obj.journal_id.type == 'situation':
-                        move=move_pool.search(cr,uid,[('journal_id','=',obj.journal_id.id)])
-                        if move:
-                            move_obj=move_pool.browse(cr,uid,move[0])
-                            move=move[0]
-                        else:
-                            name = self.pool.get('ir.sequence').get_id(cr, uid, obj.journal_id.sequence_id.id)
-                            move_data = {'name': name, 'journal_id': obj.journal_id.id}
-                            move=self.pool.get('account.move').create(cr,uid,move_data)
-                            move_obj=move_pool.browse(cr,uid,move)
-                        move_line_data={'name':obj.journal_id.name,
-                                               'debit':obj.debit or 0.0,
-                                               'credit':obj.credit or 0.0,
-                                               'account_id':obj.id,
-                                               'move_id':move,
-                                               'journal_id':obj.journal_id.id,
-                                               'period_id':move_obj.period_id.id,
-                                               }
-                        if obj.type1:
-                            if obj.type1 == 'dr':
-                                move_line_data['debit'] = obj.open_bal
-                            elif obj.type1 == 'cr':
-                                move_line_data['credit'] = obj.open_bal
-                        if move_obj and move:
-                            for move_line in move_obj.line_id:
-                                if move_line.account_id.id == obj.id:
-                                    if move_line_data['debit'] == 0.0 and move_line_data['credit']== 0.0:
-                                        self.pool.get('account.move.line').unlink(cr,uid,[move_line.id])
-                                    else:
-                                        self.pool.get('account.move.line').write(cr,uid,[move_line.id],move_line_data)
-                                    flg=1
-                            if not flg:
-                                self.pool.get('account.move.line').create(cr,uid,move_line_data)
-        return True
-
-    def onchange_type(self, cr, uid, ids,user_type,type1):
-        if not user_type:
-            return {'value' : {}}
-        type_obj=self.pool.get('account.account.type').browse(cr,uid,user_type)
-        if type_obj.code in ('asset','expense'):
-            type1 = 'dr'
-        elif type_obj.code in ('income','liability') :
-            type1 = 'cr'
-        else:
-            type1 = 'none'
-
-        return {
-            'value' : {'type1' : type1}
-    }
-account_account()
-
-class account_move(osv.osv):
-    _inherit = "account.move"
-    _columns = {
-        'name':fields.char('Name', size=256, required=True, readonly=True, states={'draft':[('readonly',False)]}),
-    }
-account_move()
-
-class res_currency(osv.osv):
-    _inherit = "res.currency"
-
-    _columns = {
-                'sub_name': fields.char('Sub Currency', size=32, required=True)
-            }
-    _defaults = {
-        'sub_name': lambda *a: 'cents',
-
-    }
-res_currency()
-
-class account_account_template(osv.osv):
-        _inherit = "account.account.template"
-        
-        _columns = {
-        'type1':fields.selection([('dr','Debit'),('cr','Credit'),('none','None')], 'Dr/Cr',store=True),
-    }
-
-account_account_template()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_voucher/account_report.xml b/addons/account_voucher/account_report.xml
deleted file mode 100644
index e4806f6e8f2..00000000000
--- a/addons/account_voucher/account_report.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-	<data>
-		<report id="report_account_voucher"
-			string="Voucher Report (Cr/Dr)"
-			model="account.voucher"
-			name="voucher.cash_receipt.drcr"
-			rml="account_voucher/report/report_voucher.rml"
-			auto="False"
-			header = "False"
-			menu="True"/>
-			
-		<report id="report_account_voucher_amt"
-			string="Voucher Report"
-			model="account.voucher"
-			name="voucher.cash_amount"
-			rml="account_voucher/report/report_voucher_amount.rml"
-			auto="False"
-			header = "False"
-			menu="True"/>
-	</data>
-</openerp>
diff --git a/addons/account_voucher/account_view.xml b/addons/account_voucher/account_view.xml
deleted file mode 100644
index 11f3e82dfa0..00000000000
--- a/addons/account_voucher/account_view.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <record model="ir.ui.view" id="account_form1">
-            <field name="name">account.form1</field>
-            <field name="inherit_id" ref="account.view_account_form"/>
-            <field name="model">account.account</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <field name="user_type" position="after">
-                    <field name="balance" string="Closing Balance"/>
-                    <field name="type1" />
-                    <field name="open_bal"/>
-                    <field name="journal_id"/>
-                </field>
-            </field>
-        </record>
-        
-        <record model="ir.ui.view" id="account_form2">
-            <field name="name">account.form2</field>
-            <field name="inherit_id" ref="account.view_account_form"/>
-            <field name="model">account.account</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <field name="user_type" position="replace">
-                        <field name="user_type" select="1" on_change="onchange_type(user_type,type1)"/>
-                </field>
-            </field>
-        </record>
-        
-        <record model="ir.ui.view" id="account_tree1">
-            <field name="name">account.tree1</field>
-            <field name="inherit_id" ref="account.view_account_tree"/>
-            <field name="model">account.account</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <field name="name" position="after">
-                        <field name="open_bal" select="1"/>
-                </field>
-            </field>
-        </record>
-        
-        <record model="ir.ui.view" id="account_tree2">
-            <field name="name">account.tree2</field>
-            <field name="inherit_id" ref="account.view_account_tree"/>
-            <field name="model">account.account</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <field name="company_currency_id" position="before">
-                    <field name="type1"/>
-                </field>
-            </field>
-        </record>
-    
-        <!--    sub_currency    -->
-        <record model="ir.ui.view" id="sub_currency_form">
-            <field name="name">sub.currency.form</field>
-            <field name="inherit_id" ref="base.view_currency_form" />
-            <field name="model">res.currency</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <field name="name" position="after">
-                    <field name="sub_name" />
-                </field>
-            </field>
-        </record>
-        
-        <act_window name="Opening Balance Entry"
-            domain="[('journal_id', '=', journal_id)]"
-            res_model="account.move.line"
-            src_model="account.account"
-            id="act_account_acount_move_line_open1"/>
-
-    </data>
-</openerp>
diff --git a/addons/account_voucher/report/report_voucher.py b/addons/account_voucher/report/report_voucher.py
index de30a3d11e2..5a84969c52f 100644
--- a/addons/account_voucher/report/report_voucher.py
+++ b/addons/account_voucher/report/report_voucher.py
@@ -23,7 +23,6 @@ import time
 from report import report_sxw
 from tools import amount_to_text_en
 
-
 class report_voucher(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
         super(report_voucher, self).__init__(cr, uid, name, context)
diff --git a/addons/account_voucher/report/report_voucher.rml b/addons/account_voucher/report/report_voucher.rml
index 93b767e5416..10f4b06c470 100755
--- a/addons/account_voucher/report/report_voucher.rml
+++ b/addons/account_voucher/report/report_voucher.rml
@@ -364,7 +364,7 @@
       <tr>
         <td>
           <para style="P17">
-            <font color="white"> </font>
+            <font color="white"></font>
           </para>
         </td>
         <td>
diff --git a/addons/account_voucher/report/report_voucher_amount.py b/addons/account_voucher/report/report_voucher_amount.py
index 819c59b4391..7c0cfffe317 100644
--- a/addons/account_voucher/report/report_voucher_amount.py
+++ b/addons/account_voucher/report/report_voucher_amount.py
@@ -23,7 +23,6 @@ import time
 from report import report_sxw
 from tools import amount_to_text_en
 
-
 class report_voucher_amount(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
         super(report_voucher_amount, self).__init__(cr, uid, name, context)
@@ -42,4 +41,4 @@ report_sxw.report_sxw(
     'account.voucher',
     'addons/account_voucher/report/report_voucher_amount.rml',
     parser=report_voucher_amount,header=False
-)
\ No newline at end of file
+)
diff --git a/addons/account_voucher/wizard/account_voucher_open_view.xml b/addons/account_voucher/wizard/account_voucher_open_view.xml
index 0d67c455c3f..11ab3d1ca8a 100644
--- a/addons/account_voucher/wizard/account_voucher_open_view.xml
+++ b/addons/account_voucher/wizard/account_voucher_open_view.xml
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <openerp>
-	<data>
+    <data>
 
         <record id="account_open_vouchers_view" model="ir.ui.view">
              <field name="name">Open Vouchers</field>
              <field name="model">account.open.voucher</field>
              <field name="type">form</field>
              <field name="arch" type="xml">
-				<form string="Open Vouchers">
-				    <field name="type"/>
-				    <field name="state"/>
-				    <field name="period_ids" colspan="4"/>
-	 				<group colspan="4" col="6">
-	                   	<separator colspan="6"/>
-	 					<button special="cancel" string="Cancel" icon="gtk-cancel"/>
-	           			<button name="action_open_window" string="Open Voucher Entries" type="object" icon="gtk-ok"/>
-					</group>
-				</form>
+                <form string="Open Vouchers">
+                    <field name="type"/>
+                    <field name="state"/>
+                    <field name="period_ids" colspan="4"/>
+                    <group colspan="4" col="6">
+                           <separator colspan="6"/>
+                           <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                           <button name="action_open_window" string="Open Voucher Entries" type="object" icon="gtk-ok"/>
+                    </group>
+                </form>
              </field>
- 		</record>
+        </record>
 
         <record id="action_account_open_vouchers" model="ir.actions.act_window">
              <field name="name">Open Vouchers</field>
@@ -28,15 +28,15 @@
              <field name="view_mode">tree,form</field>
              <field name="view_id" ref="account_open_vouchers_view"/>
              <field name="context">{'record_id':active_id}</field>
-             <field name="target">new</field>
+            <field name="target">new</field>
        </record>
 
- 	   <menuitem
- 	   		icon="STOCK_EXECUTE"
- 	   		name="Open Vouchers"
- 	   		action="action_account_open_vouchers"
- 			id="menu_account_voucher_open"
- 			parent="menu_action_voucher_list"/>
+       <menuitem
+            icon="STOCK_EXECUTE"
+            name="Open Vouchers"
+            action="action_account_open_vouchers"
+            id="menu_account_voucher_open"
+            parent="menu_action_voucher_list"/>
 
-	</data>
-</openerp>
\ No newline at end of file
+    </data>
+</openerp>

From cfd643a37e427a73d373734c04a2060b55529bac Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Thu, 20 May 2010 20:13:34 +0530
Subject: [PATCH 73/82] [MOVE]: rename file

bzr revid: mga@tinyerp.com-20100520144334-2v0qv7besou3io1z
---
 addons/account_voucher/voucher_report.xml | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 addons/account_voucher/voucher_report.xml

diff --git a/addons/account_voucher/voucher_report.xml b/addons/account_voucher/voucher_report.xml
new file mode 100644
index 00000000000..56353628bd1
--- /dev/null
+++ b/addons/account_voucher/voucher_report.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+        <report id="report_account_voucher"
+            string="Print Voucher"
+            model="account.voucher"
+            name="voucher.cash_receipt.drcr"
+            rml="account_voucher/report/report_voucher.rml"
+            auto="False"
+            header = "False"
+            menu="True"/>
+            
+        <report id="report_account_voucher_amt"
+            string="Print Receipt"
+            model="account.voucher"
+            name="voucher.cash_amount"
+            rml="account_voucher/report/report_voucher_amount.rml"
+            auto="False"
+            header = "False"
+            menu="True"/>
+    </data>
+</openerp>

From ed8fdb876be2db5a1beac5f9fa5e775c1a853b3f Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Thu, 20 May 2010 20:13:58 +0530
Subject: [PATCH 74/82] [ADD]: add indan chart of acount to addons

bzr revid: mga@tinyerp.com-20100520144358-wf8g9iuzxzypz12v
---
 addons/l10n_in/__init__.py            |  31 ++
 addons/l10n_in/__openerp__.py         |  43 ++
 addons/l10n_in/account_chart.xml      | 562 ++++++++++++++++++++++++++
 addons/l10n_in/account_tax.xml        |  16 +
 addons/l10n_in/account_tax_code.xml   |  35 ++
 addons/l10n_in/account_wizard.xml     |  14 +
 addons/l10n_in/i18n/fr_BE.po          |  80 ++++
 addons/l10n_in/i18n/l10n_chart_in.pot |  80 ++++
 8 files changed, 861 insertions(+)
 create mode 100644 addons/l10n_in/__init__.py
 create mode 100644 addons/l10n_in/__openerp__.py
 create mode 100644 addons/l10n_in/account_chart.xml
 create mode 100644 addons/l10n_in/account_tax.xml
 create mode 100644 addons/l10n_in/account_tax_code.xml
 create mode 100644 addons/l10n_in/account_wizard.xml
 create mode 100644 addons/l10n_in/i18n/fr_BE.po
 create mode 100644 addons/l10n_in/i18n/l10n_chart_in.pot

diff --git a/addons/l10n_in/__init__.py b/addons/l10n_in/__init__.py
new file mode 100644
index 00000000000..19de03b504c
--- /dev/null
+++ b/addons/l10n_in/__init__.py
@@ -0,0 +1,31 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2004 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#                    Fabien Pinckaers <fp@tiny.Be>
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/l10n_in/__openerp__.py b/addons/l10n_in/__openerp__.py
new file mode 100644
index 00000000000..1f74c5f7f8e
--- /dev/null
+++ b/addons/l10n_in/__openerp__.py
@@ -0,0 +1,43 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 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" : "Indian Chart of Account",
+    "version" : "1.0",
+    "description":"""
+    Indian Accounting : chart of Account
+    """,
+    "author" : 'Tiny & Axelor',
+    "category": "Localisation/Account Charts",
+    "depends" : [
+        "account",
+        "account_chart"
+    ],
+    "demo_xml" : [],
+    "update_xml" : [
+        "account_chart.xml",
+        "l10n_in_wizard.xml",
+    ],
+    "active": False,
+    "installable": True
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/l10n_in/account_chart.xml b/addons/l10n_in/account_chart.xml
new file mode 100644
index 00000000000..8303314d8fc
--- /dev/null
+++ b/addons/l10n_in/account_chart.xml
@@ -0,0 +1,562 @@
+<?xml version="1.0"?>
+<openerp>
+	<data noupdate="1">
+	<!--  
+	#
+	# Indian Accounts tree
+	#
+	-->
+	<!--
+	Account Type
+	-->
+	<record model="account.account.type" id="account_type_root_ind1">
+		<field name="name">View</field>
+		<field name="code">view</field>
+	</record>
+	<record model="account.account.type" id="account_type_asset1">
+		<field name="name">Asset</field>
+		<field name="code">asset</field>
+	</record>
+	<record model="account.account.type" id="account_type_liability1">
+		<field name="name">Liability</field>
+		<field name="code">liability</field>
+	</record>
+	<record model="account.account.type" id="account_type_expense1">
+		<field name="name">Expense</field>
+		<field name="code">expense</field>
+	</record>
+	<record model="account.account.type" id="account_type_income1" >
+		<field name="name">Income</field>
+		<field name="code">income</field>
+	</record>
+	<record model="account.account.type" id="account_type_closed1">
+		<field name="name">Closed</field>
+		<field name="code">closed</field>
+	</record>
+	
+	<!-- ## account chart -->
+	
+        <record model="account.account.template" id="root">
+			<field name="name">Account Chart-India</field>
+			<field name="code">0</field>
+			<field name="type">view</field>
+			<field name="user_type" ref="account_type_root_ind1"/>
+			
+			<field name="reconcile" eval="False"/>
+			
+		</record>
+
+		<record model="account.account.template" id="IA_AC0">
+			<field name="name">Balance Sheet</field>
+			<field name="code">IA_AC0</field>
+			<field name="type">view</field>
+			<field name="user_type" ref="account_type_root_ind1"/>
+			
+			<field name="reconcile" eval="False"/>
+			
+            <field name="parent_id" ref="root"/>
+		</record>
+		
+			<record model="account.account.template" id="IA_AC01">
+				<field name="name">Assets</field>
+				<field name="code">IA_AC01</field>
+				<field name="type">view</field>
+				<field name="user_type" ref="account_type_root_ind1"/>
+				
+				<field name="reconcile" eval="False"/>
+				
+	            <field name="parent_id" ref="IA_AC0"/>
+			</record>
+			
+				<record model="account.account.template" id="IA_AC011">
+					<field name="name">Current Assets</field>
+					<field name="code">IA_AC011</field>
+					<field name="type">view</field>
+					<field name="user_type" ref="account_type_asset1"/>
+					
+					<field name="reconcile" eval="False"/>
+					
+		            <field name="parent_id" ref="IA_AC01"/>
+				</record>
+				
+					<record model="account.account.template" id="IA_AC0111">
+						<field name="name">Bank Account</field>
+						<field name="code">IA_AC0111</field>
+						<field name="type">receivable</field>
+						<field name="user_type" ref="account_type_asset1"/>
+						
+						<field name="reconcile" eval="False"/>
+						
+			            <field name="parent_id" ref="IA_AC011"/>
+					</record>
+					
+					<record model="account.account.template" id="IA_AC0112">
+						<field name="name">Cash In Hand Account</field>
+						<field name="code">IA_AC0112</field>
+						<field name="type">view</field>
+						<field name="user_type" ref="account_type_asset1"/>
+						
+						<field name="reconcile" eval="False"/>
+						
+			            <field name="parent_id" ref="IA_AC011"/>
+					</record>
+						
+						<record model="account.account.template" id="IA_AC01121">
+							<field name="name">Cash Account</field>
+							<field name="code">IA_AC01121</field>
+							<field name="type">receivable</field>
+							<field name="user_type" ref="account_type_asset1"/>
+							
+							<field name="reconcile" eval="False"/>
+							
+				            <field name="parent_id" ref="IA_AC0112"/>
+						</record>
+					
+					<record model="account.account.template" id="IA_AC0113">
+						<field name="name">Deposit Account</field>
+						<field name="code">IA_AC0113</field>
+						<field name="type">receivable</field>
+						<field name="user_type" ref="account_type_asset1"/>
+						
+						<field name="reconcile" eval="False"/>
+						
+			            <field name="parent_id" ref="IA_AC011"/>
+					</record>
+					
+					<record model="account.account.template" id="IA_AC0114">
+						<field name="name">Loan &amp; Advance(Assets) Account</field>
+						<field name="code">IA_AC0114</field>
+						<field name="type">receivable</field>
+						<field name="user_type" ref="account_type_asset1"/>
+						
+						<field name="reconcile" eval="False"/>
+						
+			            <field name="parent_id" ref="IA_AC011"/>
+					</record>
+					
+<!--					<record model="account.account.template" id="IA_AC0115">-->
+<!--						<field name="name">Stock In Hand Account</field>-->
+<!--						<field name="code">IA_AC0115</field>-->
+<!--						<field name="type">receivable</field>-->
+<!--						<field name="user_type" ref="account_type_asset1"/>
+							-->
+<!--						<field name="reconcile" eval="False"/>-->
+<!--						-->
+<!--			            <field name="parent_id" ref="IA_AC011"/>-->
+<!--					</record>-->
+
+					<record model="account.account.template" id="IA_AC0116">
+						<field name="name">Total Sundry Debtors Account</field>
+						<field name="code">IA_AC0116</field>
+						<field name="type">view</field>
+						<field name="user_type" ref="account_type_asset1"/>
+						
+						<field name="reconcile" eval="False"/>
+						
+			            <field name="parent_id" ref="IA_AC011"/>
+					</record>
+
+
+						<record model="account.account.template" id="IA_AC01161">
+							<field name="name">Sundry Debtors Account</field>
+							<field name="code">IA_AC01161</field>
+							<field name="type">receivable</field>
+							<field name="user_type" ref="account_type_asset1"/>
+							
+							<field name="reconcile" eval="False"/>
+							
+				            <field name="parent_id" ref="IA_AC0116"/>
+						</record>
+	
+				<record model="account.account.template" id="IA_AC012">
+					<field name="name">Fixed Assets</field>
+					<field name="code">IA_AC012</field>
+					<field name="type">receivable</field>
+					<field name="user_type" ref="account_type_asset1"/>
+					
+					<field name="reconcile" eval="False"/>
+					
+		            <field name="parent_id" ref="IA_AC01"/>
+				</record>
+
+				<record model="account.account.template" id="IA_AC013">
+					<field name="name">Investment</field>
+					<field name="code">IA_AC013</field>
+					<field name="type">receivable</field>
+					<field name="user_type" ref="account_type_asset1"/>
+					
+					<field name="reconcile" eval="False"/>
+					
+		            <field name="parent_id" ref="IA_AC01"/>
+				</record>
+
+				<record model="account.account.template" id="IA_AC014">
+					<field name="name">Misc. Expenses(Asset)</field>
+					<field name="code">IA_AC014</field>
+					<field name="type">receivable</field>
+					<field name="user_type" ref="account_type_asset1"/>
+					
+					<field name="reconcile" eval="False"/>
+					
+		            <field name="parent_id" ref="IA_AC01"/>
+				</record>
+				
+			
+			<record model="account.account.template" id="IA_AC02">
+				<field name="name">Liabilities</field>
+				<field name="code">IA_AC02</field>
+				<field name="type">view</field>
+				<field name="user_type" ref="account_type_root_ind1"/>
+				
+				<field name="reconcile" eval="False"/>
+				
+	            <field name="parent_id" ref="IA_AC0"/>
+			</record>
+			
+				<record model="account.account.template" id="IA_AC021">
+					<field name="name">Current Liabilities</field>
+					<field name="code">IA_AC021</field>
+					<field name="type">view</field>
+					<field name="user_type" ref="account_type_liability1"/>
+					
+					<field name="reconcile" eval="False"/>
+					
+		            <field name="parent_id" ref="IA_AC02"/>
+				</record>
+					
+					<record model="account.account.template" id="IA_AC0211">
+						<field name="name">Duties &amp; Taxes</field>
+						<field name="code">IA_AC0211</field>
+						<field name="type">payable</field>
+						<field name="user_type" ref="account_type_liability1"/>
+						
+						<field name="reconcile" eval="False"/>
+						
+			            <field name="parent_id" ref="IA_AC021"/>
+					</record>
+					
+					<record model="account.account.template" id="IA_AC0212">
+						<field name="name">Provision</field>
+						<field name="code">IA_AC0212</field>
+						<field name="type">payable</field>
+						<field name="user_type" ref="account_type_liability1"/>
+						
+						<field name="reconcile" eval="False"/>
+						
+			            <field name="parent_id" ref="IA_AC021"/>
+					</record>
+
+					<record model="account.account.template" id="IA_AC0213">
+						<field name="name">Total Sundry Creditors</field>
+						<field name="code">IA_AC0213</field>
+						<field name="type">view</field>
+						<field name="user_type" ref="account_type_liability1"/>
+						
+						<field name="reconcile" eval="False"/>
+						
+			            <field name="parent_id" ref="IA_AC021"/>
+					</record>
+					
+						<record model="account.account.template" id="IA_AC02131">
+							<field name="name">Sundry Creditors</field>
+							<field name="code">IA_AC02131</field>
+							<field name="type">payable</field>
+							<field name="user_type" ref="account_type_liability1"/>
+							
+							<field name="reconcile" eval="False"/>
+							
+				            <field name="parent_id" ref="IA_AC0213"/>
+						</record>
+
+				<record model="account.account.template" id="IA_AC022">
+					<field name="name">Branch/Division</field>
+					<field name="code">IA_AC022</field>
+					<field name="type">payable</field>
+					<field name="user_type" ref="account_type_liability1"/>
+					
+					<field name="reconcile" eval="False"/>
+					
+		            <field name="parent_id" ref="IA_AC02"/>
+				</record>
+				
+				<record model="account.account.template" id="IA_AC023">
+					<field name="name">Share Holder/Owner Fund</field>
+					<field name="code">IA_AC023</field>
+					<field name="type">view</field>
+					<field name="user_type" ref="account_type_liability1"/>
+					
+					<field name="reconcile" eval="False"/>
+					
+		            <field name="parent_id" ref="IA_AC02"/>
+				</record>
+				
+				
+					<record model="account.account.template" id="IA_AC0231">
+						<field name="name">Capital Account</field>
+						<field name="code">IA_AC0231</field>
+						<field name="type">payable</field>
+						<field name="user_type" ref="account_type_liability1"/>
+						
+						<field name="reconcile" eval="False"/>
+						
+			            <field name="parent_id" ref="IA_AC023"/>
+					</record>
+				
+					<record model="account.account.template" id="IA_AC0232">
+						<field name="name">Reserve &amp; Surplus Account</field>
+						<field name="code">IA_AC0232</field>
+						<field name="type">payable</field>
+						<field name="user_type" ref="account_type_liability1"/>
+						
+						<field name="reconcile" eval="False"/>
+						
+			            <field name="parent_id" ref="IA_AC023"/>
+					</record>
+			
+				<record model="account.account.template" id="IA_AC024">
+					<field name="name">Loan(Liability) Account</field>
+					<field name="code">IA_AC024</field>
+					<field name="type">view</field>
+					<field name="user_type" ref="account_type_liability1"/>
+					
+					<field name="reconcile" eval="False"/>
+					
+		            <field name="parent_id" ref="IA_AC02"/>
+				</record>
+					
+					<record model="account.account.template" id="IA_AC0241">
+						<field name="name">Bank OD Account</field>
+						<field name="code">IA_AC0241</field>
+						<field name="type">payable</field>
+						<field name="user_type" ref="account_type_liability1"/>
+						
+						<field name="reconcile" eval="False"/>
+						
+			            <field name="parent_id" ref="IA_AC024"/>
+					</record>
+						
+					<record model="account.account.template" id="IA_AC0242">
+						<field name="name">Secured Loan Account</field>
+						<field name="code">IA_AC0242</field>
+						<field name="type">payable</field>
+						<field name="user_type" ref="account_type_liability1"/>
+						
+						<field name="reconcile" eval="False"/>
+						
+			            <field name="parent_id" ref="IA_AC024"/>
+					</record>
+					
+					<record model="account.account.template" id="IA_AC0243">
+						<field name="name">Unsecured Loan Account</field>
+						<field name="code">IA_AC0243</field>
+						<field name="type">payable</field>
+						<field name="user_type" ref="account_type_liability1"/>
+						
+						<field name="reconcile" eval="False"/>
+						
+			            <field name="parent_id" ref="IA_AC024"/>
+					</record>
+						
+				<record model="account.account.template" id="IA_AC025">
+					<field name="name">Suspense Account</field>
+					<field name="code">IA_AC025</field>
+					<field name="type">payable</field>
+					<field name="user_type" ref="account_type_liability1"/>
+					
+					<field name="reconcile" eval="False"/>
+					
+		            <field name="parent_id" ref="IA_AC02"/>
+				</record>
+
+		
+		<record model="account.account.template" id="IA_AC1">
+			<field name="name">Profit And Loss Account</field>
+			<field name="code">IA_AC1</field>
+			<field name="type">view</field>
+			<field name="user_type" ref="account_type_root_ind1"/>
+			
+			<field name="reconcile" eval="False"/>
+			
+            <field name="parent_id" ref="root"/>
+		</record>
+		
+			<record model="account.account.template" id="IA_AC11">
+				<field name="name">Expense</field>
+				<field name="code">IA_AC11</field>
+				<field name="type">view</field>
+				<field name="user_type" ref="account_type_root_ind1"/>
+				
+				<field name="reconcile" eval="False"/>
+				
+	            <field name="parent_id" ref="IA_AC1"/>
+			</record>
+			
+				<record model="account.account.template" id="IA_AC111">
+					<field name="name">Direct Expenses</field>
+					<field name="code">IA_AC111</field>
+					<field name="type">other</field>
+					<field name="user_type" ref="account_type_expense1"/>
+					
+					<field name="reconcile" eval="False"/>
+					
+		            <field name="parent_id" ref="IA_AC11"/>
+				</record>
+			
+				<record model="account.account.template" id="IA_AC112">
+					<field name="name">Indirect Expenses</field>
+					<field name="code">IA_AC112</field>
+					<field name="type">other</field>
+					<field name="user_type" ref="account_type_expense1"/>
+					
+					<field name="reconcile" eval="False"/>
+					
+		            <field name="parent_id" ref="IA_AC11"/>
+				</record>
+				
+				<record model="account.account.template" id="IA_AC113">
+					<field name="name">Purchase</field>
+					<field name="code">IA_AC113</field>
+					<field name="type">other</field>
+					<field name="user_type" ref="account_type_expense1"/>
+					
+					<field name="reconcile" eval="False"/>
+					
+		            <field name="parent_id" ref="IA_AC11"/>
+				</record>
+				<record model="account.account.template" id="IA_AC114">
+					<field name="name">Opening Stock</field>
+					<field name="code">IA_AC114</field>
+					<field name="type">other</field>
+					<field name="user_type" ref="account_type_expense1"/>
+					
+					<field name="reconcile" eval="False"/>
+					
+		            <field name="parent_id" ref="IA_AC11"/>
+				</record>
+
+				
+			<record model="account.account.template" id="IA_AC12">
+				<field name="name">Income</field>
+				<field name="code">IA_AC12</field>
+				<field name="type">view</field>
+				<field name="user_type" ref="account_type_root_ind1"/>
+				
+				<field name="reconcile" eval="False"/>
+				
+	            <field name="parent_id" ref="IA_AC1"/>
+			</record>
+			
+				<record model="account.account.template" id="IA_AC121">
+					<field name="name">Direct Incomes</field>
+					<field name="code">IA_AC121</field>
+					<field name="type">other</field>
+					<field name="user_type" ref="account_type_income1"/>
+					
+					<field name="reconcile" eval="False"/>
+					
+		            <field name="parent_id" ref="IA_AC12"/>
+				</record>
+				
+				<record model="account.account.template" id="IA_AC122">
+					<field name="name">Indirect Incomes</field>
+					<field name="code">IA_AC122</field>
+					<field name="type">other</field>
+					<field name="user_type" ref="account_type_income1"/>
+					
+					<field name="reconcile" eval="False"/>
+					
+		            <field name="parent_id" ref="IA_AC12"/>
+				</record>
+				
+				<record model="account.account.template" id="IA_AC123">
+					<field name="name">Sales Account</field>
+					<field name="code">IA_AC123</field>
+					<field name="type">other</field>
+					<field name="user_type" ref="account_type_income1"/>
+					
+					<field name="reconcile" eval="False"/>
+					
+		            <field name="parent_id" ref="IA_AC12"/>
+				</record>
+				<record model="account.account.template" id="IA_AC124">
+					<field name="name">Goods Given Account</field>
+					<field name="code">IA_AC124</field>
+					<field name="type">other</field>
+					<field name="user_type" ref="account_type_income1"/>
+					
+					<field name="reconcile" eval="False"/>
+					
+		            <field name="parent_id" ref="IA_AC12"/>
+				</record>
+
+				<!-- Tax detail -->		
+				
+				<record model="account.tax.code.template" id="vat_code_tax1">
+					<field name="name">Tax</field>
+				</record>
+				
+				<record model="account.tax.code.template" id="vat_code_balance_net">
+					<field name="name">Tax Balance to Pay</field>
+					<field name="parent_id" ref="vat_code_tax1"/>
+				</record>
+			
+				<record model="account.tax.code.template" id="vat_code_due_tva">
+					<field name="name">Tax Due (Tax to pay)</field>
+					<field name="parent_id" ref="vat_code_balance_net"/>
+				</record>
+			
+				<record model="account.tax.code.template" id="vat_code_payable">
+					<field name="name">Tax Payable</field>
+					<field name="parent_id" ref="vat_code_balance_net"/>
+				</record>
+			
+				<record model="account.tax.code.template" id="vat_code_base_net">
+					<field name="name">Tax Bases</field>
+					<field name="parent_id" ref="vat_code_tax1"/>
+				</record>
+			
+			
+				<record model="account.tax.code.template" id="vat_code_base_due">
+					<field name="name">Base of Taxed Sales</field>
+					<field name="parent_id" ref="vat_code_base_net"/>
+				</record>
+			
+			
+				<record model="account.tax.code.template" id="vat_code_receivable_net">
+					<field name="name">Base of Taxed Purchases</field>
+					<field name="parent_id" ref="vat_code_base_net"/>
+				</record>
+		
+				
+				
+		<record id="opening_journal" model="account.journal">
+            <field name="name">Opening Journal</field>
+            <field name="code">OPJ</field>
+            <field name="type">situation</field>
+            <field name="view_id" ref="account.account_journal_view"/>
+            <field name="sequence_id" ref="account.sequence_journal"/>
+            <field name="user_id" ref="base.user_root"/>
+        </record>
+        
+        <record id="cose_journal_opening" model="account.analytic.journal">
+            <field name="code">OPJ</field>
+            <field name="name">Opening Journal</field>
+            <field name="type">situation</field>
+        </record>
+        
+				
+				<!-- Chart template -->
+				<record id="indian_chart_template" model="account.chart.template">
+				    <field name="name">India - Chart of Accounts </field>
+				    <field name="account_root_id" ref="root"/>
+				    <field name="tax_code_root_id" ref="vat_code_tax1"/>
+				    <field name="bank_account_view_id" ref="IA_AC01121"/>
+				    <field name="property_account_receivable" ref="IA_AC01161"/>
+			        <field name="property_account_payable" ref="IA_AC02131"/>
+			        <field name="property_account_expense_categ" ref="IA_AC112"/>
+			        <field name="property_account_income_categ" ref="IA_AC122"/>
+				</record>
+				
+
+	</data>
+</openerp>
diff --git a/addons/l10n_in/account_tax.xml b/addons/l10n_in/account_tax.xml
new file mode 100644
index 00000000000..857e5977e0b
--- /dev/null
+++ b/addons/l10n_in/account_tax.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data noupdate="1">
+<record id="tax1" model="account.tax">
+	<field name="name">PPn (10%)(10.0%)</field>
+	<field name="amount">0.100000</field>
+	<field name="type">percent</field>
+	<field name="account_collected_id" ref="chart2310"/>
+	<field name="account_paid_id" ref="chart2310"/>
+	<field name="base_code_id" ref="vat_code_base_due"/>
+	<field name="tax_code_id" ref="vat_code_due_tva"/>
+	<field name="ref_base_code_id" ref="vat_code_receivable_net"/>
+	<field name="ref_tax_code_id" ref="vat_code_payable"/>
+</record>
+</data>
+</openerp>
diff --git a/addons/l10n_in/account_tax_code.xml b/addons/l10n_in/account_tax_code.xml
new file mode 100644
index 00000000000..2fba08e5f5a
--- /dev/null
+++ b/addons/l10n_in/account_tax_code.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<openerp>
+    <data noupdate="True">
+
+        <record model="account.tax.code" id="vat_code_balance_net">
+            <field name="name">Tax balance to pay</field>
+        </record>
+
+        <record model="account.tax.code" id="vat_code_due_tva">
+            <field name="name">Tax Due (Tax to pay)</field>
+            <field name="parent_id" ref="vat_code_balance_net"/>
+        </record>
+
+        <record model="account.tax.code" id="vat_code_payable">
+            <field name="name">Tax payable</field>
+            <field name="parent_id" ref="vat_code_balance_net"/>
+        </record>
+
+        <record model="account.tax.code" id="vat_code_base_net">
+            <field name="name">Tax bases</field>
+        </record>
+
+        <record model="account.tax.code" id="vat_code_base_due">
+            <field name="name">Base of taxed sales</field>
+            <field name="parent_id" ref="vat_code_base_net"/>
+        </record>
+
+
+        <record model="account.tax.code" id="vat_code_receivable_net">
+            <field name="name">Base of taxed purchases</field>
+            <field name="parent_id" ref="vat_code_base_net"/>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/l10n_in/account_wizard.xml b/addons/l10n_in/account_wizard.xml
new file mode 100644
index 00000000000..1b6d22c6044
--- /dev/null
+++ b/addons/l10n_in/account_wizard.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+		<record id="config_call_account_template_in_minimal" model="ir.actions.todo">
+	        <field name="name">Generate Chart of Accounts from a Chart Template</field>
+	        <field name="note">Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated.
+	This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template.</field>
+	        <field name="action_id" ref="account.action_wizard_multi_chart"/>
+	        <field name="state">open</field>
+    	</record>
+
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/l10n_in/i18n/fr_BE.po b/addons/l10n_in/i18n/fr_BE.po
new file mode 100644
index 00000000000..1b49cfa2b52
--- /dev/null
+++ b/addons/l10n_in/i18n/fr_BE.po
@@ -0,0 +1,80 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* l10n_chart_in
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.6\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2009-11-25 15:28:53+0000\n"
+"PO-Revision-Date: 2009-11-25 15:28:53+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: l10n_chart_in
+#: model:ir.module.module,description:l10n_chart_in.module_meta_information
+msgid "\n"
+"    Indian Accounting : chart of Account\n"
+"    "
+msgstr ""
+
+#. module: l10n_chart_in
+#: constraint:account.account.template:0
+msgid "Error ! You can not create recursive account templates."
+msgstr ""
+
+#. module: l10n_chart_in
+#: model:account.journal,name:l10n_chart_in.opening_journal
+msgid "Opening Journal"
+msgstr ""
+
+#. module: l10n_chart_in
+#: model:ir.actions.todo,note:l10n_chart_in.config_call_account_template_in_minimal
+msgid "Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated.\n"
+"	This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template."
+msgstr ""
+
+#. module: l10n_chart_in
+#: model:account.account.type,name:l10n_chart_in.account_type_liability1
+msgid "Liability"
+msgstr ""
+
+#. module: l10n_chart_in
+#: model:account.account.type,name:l10n_chart_in.account_type_asset1
+msgid "Asset"
+msgstr ""
+
+#. module: l10n_chart_in
+#: model:account.account.type,name:l10n_chart_in.account_type_closed1
+msgid "Closed"
+msgstr ""
+
+#. module: l10n_chart_in
+#: model:account.account.type,name:l10n_chart_in.account_type_income1
+msgid "Income"
+msgstr ""
+
+#. module: l10n_chart_in
+#: constraint:account.tax.code.template:0
+msgid "Error ! You can not create recursive Tax Codes."
+msgstr ""
+
+#. module: l10n_chart_in
+#: model:account.account.type,name:l10n_chart_in.account_type_expense1
+msgid "Expense"
+msgstr ""
+
+#. module: l10n_chart_in
+#: model:ir.module.module,shortdesc:l10n_chart_in.module_meta_information
+msgid "Indian Chart of Account"
+msgstr ""
+
+#. module: l10n_chart_in
+#: model:account.account.type,name:l10n_chart_in.account_type_root_ind1
+msgid "View"
+msgstr ""
+
diff --git a/addons/l10n_in/i18n/l10n_chart_in.pot b/addons/l10n_in/i18n/l10n_chart_in.pot
new file mode 100644
index 00000000000..1b49cfa2b52
--- /dev/null
+++ b/addons/l10n_in/i18n/l10n_chart_in.pot
@@ -0,0 +1,80 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* l10n_chart_in
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.6\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2009-11-25 15:28:53+0000\n"
+"PO-Revision-Date: 2009-11-25 15:28:53+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: l10n_chart_in
+#: model:ir.module.module,description:l10n_chart_in.module_meta_information
+msgid "\n"
+"    Indian Accounting : chart of Account\n"
+"    "
+msgstr ""
+
+#. module: l10n_chart_in
+#: constraint:account.account.template:0
+msgid "Error ! You can not create recursive account templates."
+msgstr ""
+
+#. module: l10n_chart_in
+#: model:account.journal,name:l10n_chart_in.opening_journal
+msgid "Opening Journal"
+msgstr ""
+
+#. module: l10n_chart_in
+#: model:ir.actions.todo,note:l10n_chart_in.config_call_account_template_in_minimal
+msgid "Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated.\n"
+"	This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template."
+msgstr ""
+
+#. module: l10n_chart_in
+#: model:account.account.type,name:l10n_chart_in.account_type_liability1
+msgid "Liability"
+msgstr ""
+
+#. module: l10n_chart_in
+#: model:account.account.type,name:l10n_chart_in.account_type_asset1
+msgid "Asset"
+msgstr ""
+
+#. module: l10n_chart_in
+#: model:account.account.type,name:l10n_chart_in.account_type_closed1
+msgid "Closed"
+msgstr ""
+
+#. module: l10n_chart_in
+#: model:account.account.type,name:l10n_chart_in.account_type_income1
+msgid "Income"
+msgstr ""
+
+#. module: l10n_chart_in
+#: constraint:account.tax.code.template:0
+msgid "Error ! You can not create recursive Tax Codes."
+msgstr ""
+
+#. module: l10n_chart_in
+#: model:account.account.type,name:l10n_chart_in.account_type_expense1
+msgid "Expense"
+msgstr ""
+
+#. module: l10n_chart_in
+#: model:ir.module.module,shortdesc:l10n_chart_in.module_meta_information
+msgid "Indian Chart of Account"
+msgstr ""
+
+#. module: l10n_chart_in
+#: model:account.account.type,name:l10n_chart_in.account_type_root_ind1
+msgid "View"
+msgstr ""
+

From 449c86f5792e100e549115fa5693c371313c31ad Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Thu, 20 May 2010 20:14:35 +0530
Subject: [PATCH 75/82] [FIX]: fix a problem of wrong dependency

bzr revid: mga@tinyerp.com-20100520144435-qmrv6sbpjqjx6nk0
---
 addons/account_report_india/__openerp__.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/account_report_india/__openerp__.py b/addons/account_report_india/__openerp__.py
index 4e0f8339d64..0765af339a1 100644
--- a/addons/account_report_india/__openerp__.py
+++ b/addons/account_report_india/__openerp__.py
@@ -23,8 +23,7 @@
     "name" : "Accounting Reports",
     "version" : "1.0",
     "depends" : [
-        "account",
-        "account_voucher"
+        "account"
     ],
     "author" : "Tiny ERP",
     "description": """Accounting Reports 

From 4b83f4cce49a5fe69ccd033451bfdacaf6f56974 Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Thu, 20 May 2010 20:56:15 +0530
Subject: [PATCH 76/82] [IMP]: make indian accounting chart compitable with new
 types

bzr revid: mga@tinyerp.com-20100520152615-envtjv9xy5e4tq6z
---
 addons/account/account.py                     |   13 +
 .../account_report_india/report/report_bs.py  |   27 +-
 addons/l10n_in/__openerp__.py                 |    2 +-
 addons/l10n_in/account_chart.xml              | 1085 +++++++++--------
 4 files changed, 583 insertions(+), 544 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index a3f66530bc3..8896f8a7a69 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -171,6 +171,19 @@ class account_account(osv.osv):
     _description = "Account"
     _parent_store = True
 
+    def _get_children_and_consol(self, cr, uid, ids, context={}):
+        ids2=[]
+        temp=[]
+        read_data= self.read(cr, uid, ids,['id','child_id'], context)
+        for data in read_data:
+            ids2.append(data['id'])
+            if data['child_id']:
+                temp=[]
+                for x in data['child_id']:
+                    temp.append(x)
+                ids2 += self._get_children_and_consol(cr, uid, temp, context)
+        return ids2
+        
     def search(self, cr, uid, args, offset=0, limit=None, order=None,
             context=None, count=False):
         if context is None:
diff --git a/addons/account_report_india/report/report_bs.py b/addons/account_report_india/report/report_bs.py
index 3369ff0e222..0e5dcf26531 100644
--- a/addons/account_report_india/report/report_bs.py
+++ b/addons/account_report_india/report/report_bs.py
@@ -104,22 +104,22 @@ class report_balancesheet_horizontal(rml_parse.rml_parse):
         else:
             self.res_pl['type'] = 'Net Loss'
         pl_dict  = {
-                    'code' : False,
-                    'name' : self.res_pl['type'],
-                    'level': False,
-                    'balance':self.res_pl['balance'],
-                    }
+            'code' : False,
+            'name' : self.res_pl['type'],
+            'level': False,
+            'balance':self.res_pl['balance'],
+        }
         for typ in types:
             accounts_temp = []
             for account in accounts:
                 if (account.user_type.report_type) and (account.user_type.report_type == typ):
                     account_dict = {
-                                    'id'   : account.id,
-                                    'code' : account.code,
-                                    'name' : account.name,
-                                    'level': account.level,
-                                    'balance':account.balance,
-                                    }
+                        'id'   : account.id,
+                        'code' : account.code,
+                        'name' : account.name,
+                        'level': account.level,
+                        'balance':account.balance,
+                    }
                     if typ == 'liability' and account.type <> 'view' and (account.debit <> account.credit):
                         self.result_sum_dr += abs(account.debit - account.credit)
                     if typ == 'asset' and account.type <> 'view' and (account.debit <> account.credit):
@@ -138,6 +138,7 @@ class report_balancesheet_horizontal(rml_parse.rml_parse):
                         
             self.result[typ] = accounts_temp
             cal_list[typ]=self.result[typ]
+        print 'XXXXXXXX : ', cal_list, len(cal_list)
         if cal_list:
             temp={}
             for i in range(0,max(len(cal_list['liability']),len(cal_list['asset']))):
@@ -164,7 +165,7 @@ class report_balancesheet_horizontal(rml_parse.rml_parse):
                               'name1' : cal_list['asset'][i]['name'],
                               'level1': cal_list['asset'][i]['level'],
                               'balance1':cal_list['asset'][i]['balance'],
-                              }
+                          }
                         self.result_temp.append(temp)
                     if  i < len(cal_list['liability']): 
                         temp={
@@ -176,7 +177,7 @@ class report_balancesheet_horizontal(rml_parse.rml_parse):
                               'name1' : '',
                               'level1': False,
                               'balance1':False,
-                              }
+                          }
                         self.result_temp.append(temp)
         return None
     
diff --git a/addons/l10n_in/__openerp__.py b/addons/l10n_in/__openerp__.py
index 1f74c5f7f8e..334b94dad59 100644
--- a/addons/l10n_in/__openerp__.py
+++ b/addons/l10n_in/__openerp__.py
@@ -34,7 +34,7 @@
     "demo_xml" : [],
     "update_xml" : [
         "account_chart.xml",
-        "l10n_in_wizard.xml",
+        "account_wizard.xml",
     ],
     "active": False,
     "installable": True
diff --git a/addons/l10n_in/account_chart.xml b/addons/l10n_in/account_chart.xml
index 8303314d8fc..5bdc5df3c50 100644
--- a/addons/l10n_in/account_chart.xml
+++ b/addons/l10n_in/account_chart.xml
@@ -1,535 +1,560 @@
 <?xml version="1.0"?>
 <openerp>
-	<data noupdate="1">
-	<!--  
-	#
-	# Indian Accounts tree
-	#
-	-->
-	<!--
-	Account Type
-	-->
-	<record model="account.account.type" id="account_type_root_ind1">
-		<field name="name">View</field>
-		<field name="code">view</field>
-	</record>
-	<record model="account.account.type" id="account_type_asset1">
-		<field name="name">Asset</field>
-		<field name="code">asset</field>
-	</record>
-	<record model="account.account.type" id="account_type_liability1">
-		<field name="name">Liability</field>
-		<field name="code">liability</field>
-	</record>
-	<record model="account.account.type" id="account_type_expense1">
-		<field name="name">Expense</field>
-		<field name="code">expense</field>
-	</record>
-	<record model="account.account.type" id="account_type_income1" >
-		<field name="name">Income</field>
-		<field name="code">income</field>
-	</record>
-	<record model="account.account.type" id="account_type_closed1">
-		<field name="name">Closed</field>
-		<field name="code">closed</field>
-	</record>
-	
-	<!-- ## account chart -->
-	
+    <data>
+    <!--  
+    #
+    # Indian Accounts tree
+    #
+    -->
+    <!--
+    Account Type
+    -->
+     <record model="account.account.type" id="account_type_income_view">
+        <field name="name">Income View</field>
+        <field name="code">view</field>
+        <field name="report_type">income</field>
+    </record>
+    <record model="account.account.type" id="account_type_expense_view">
+        <field name="name">Expense View</field>
+        <field name="code">expense</field>
+        <field name="report_type">expense</field>
+    </record>
+    <record model="account.account.type" id="account_type_asset_view">
+        <field name="name">Asset View</field>
+        <field name="code">asset</field>
+        <field name="report_type">asset</field>
+    </record>
+    <record model="account.account.type" id="account_type_liability_view">
+        <field name="name">Liability View</field>
+        <field name="code">liability</field>
+        <field name="report_type">liability</field>
+    </record>
+    
+    <record model="account.account.type" id="account_type_root_ind1">
+        <field name="name">View</field>
+        <field name="code">view</field>
+    </record>
+    <record model="account.account.type" id="account_type_asset1">
+        <field name="name">Asset</field>
+        <field name="code">asset</field>
+        <field name="report_type">asset</field>
+    </record>
+    <record model="account.account.type" id="account_type_liability1">
+        <field name="name">Liability</field>
+        <field name="code">liability</field>
+        <field name="report_type">liability</field>
+    </record>
+    <record model="account.account.type" id="account_type_expense1">
+        <field name="name">Expense</field>
+        <field name="code">expense</field>
+        <field name="report_type">expense</field>
+    </record>
+    <record model="account.account.type" id="account_type_income1" >
+        <field name="name">Income</field>
+        <field name="code">income</field>
+        <field name="report_type">income</field>
+    </record>
+    <record model="account.account.type" id="account_type_closed1">
+        <field name="name">Closed</field>
+        <field name="code">closed</field>
+    </record>
+    
+    <!-- ## account chart -->
+    
         <record model="account.account.template" id="root">
-			<field name="name">Account Chart-India</field>
-			<field name="code">0</field>
-			<field name="type">view</field>
-			<field name="user_type" ref="account_type_root_ind1"/>
-			
-			<field name="reconcile" eval="False"/>
-			
-		</record>
+            <field name="name">Indian Chart of Account</field>
+            <field name="code">0</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account_type_root_ind1"/>
+            
+            <field name="reconcile" eval="False"/>
+            
+        </record>
 
-		<record model="account.account.template" id="IA_AC0">
-			<field name="name">Balance Sheet</field>
-			<field name="code">IA_AC0</field>
-			<field name="type">view</field>
-			<field name="user_type" ref="account_type_root_ind1"/>
-			
-			<field name="reconcile" eval="False"/>
-			
+        <record model="account.account.template" id="IA_AC0">
+            <field name="name">Balance Sheet</field>
+            <field name="code">IA_AC0</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account_type_root_ind1"/>
+            
+            <field name="reconcile" eval="False"/>
+            
             <field name="parent_id" ref="root"/>
-		</record>
-		
-			<record model="account.account.template" id="IA_AC01">
-				<field name="name">Assets</field>
-				<field name="code">IA_AC01</field>
-				<field name="type">view</field>
-				<field name="user_type" ref="account_type_root_ind1"/>
-				
-				<field name="reconcile" eval="False"/>
-				
-	            <field name="parent_id" ref="IA_AC0"/>
-			</record>
-			
-				<record model="account.account.template" id="IA_AC011">
-					<field name="name">Current Assets</field>
-					<field name="code">IA_AC011</field>
-					<field name="type">view</field>
-					<field name="user_type" ref="account_type_asset1"/>
-					
-					<field name="reconcile" eval="False"/>
-					
-		            <field name="parent_id" ref="IA_AC01"/>
-				</record>
-				
-					<record model="account.account.template" id="IA_AC0111">
-						<field name="name">Bank Account</field>
-						<field name="code">IA_AC0111</field>
-						<field name="type">receivable</field>
-						<field name="user_type" ref="account_type_asset1"/>
-						
-						<field name="reconcile" eval="False"/>
-						
-			            <field name="parent_id" ref="IA_AC011"/>
-					</record>
-					
-					<record model="account.account.template" id="IA_AC0112">
-						<field name="name">Cash In Hand Account</field>
-						<field name="code">IA_AC0112</field>
-						<field name="type">view</field>
-						<field name="user_type" ref="account_type_asset1"/>
-						
-						<field name="reconcile" eval="False"/>
-						
-			            <field name="parent_id" ref="IA_AC011"/>
-					</record>
-						
-						<record model="account.account.template" id="IA_AC01121">
-							<field name="name">Cash Account</field>
-							<field name="code">IA_AC01121</field>
-							<field name="type">receivable</field>
-							<field name="user_type" ref="account_type_asset1"/>
-							
-							<field name="reconcile" eval="False"/>
-							
-				            <field name="parent_id" ref="IA_AC0112"/>
-						</record>
-					
-					<record model="account.account.template" id="IA_AC0113">
-						<field name="name">Deposit Account</field>
-						<field name="code">IA_AC0113</field>
-						<field name="type">receivable</field>
-						<field name="user_type" ref="account_type_asset1"/>
-						
-						<field name="reconcile" eval="False"/>
-						
-			            <field name="parent_id" ref="IA_AC011"/>
-					</record>
-					
-					<record model="account.account.template" id="IA_AC0114">
-						<field name="name">Loan &amp; Advance(Assets) Account</field>
-						<field name="code">IA_AC0114</field>
-						<field name="type">receivable</field>
-						<field name="user_type" ref="account_type_asset1"/>
-						
-						<field name="reconcile" eval="False"/>
-						
-			            <field name="parent_id" ref="IA_AC011"/>
-					</record>
-					
-<!--					<record model="account.account.template" id="IA_AC0115">-->
-<!--						<field name="name">Stock In Hand Account</field>-->
-<!--						<field name="code">IA_AC0115</field>-->
-<!--						<field name="type">receivable</field>-->
-<!--						<field name="user_type" ref="account_type_asset1"/>
-							-->
-<!--						<field name="reconcile" eval="False"/>-->
-<!--						-->
-<!--			            <field name="parent_id" ref="IA_AC011"/>-->
-<!--					</record>-->
+        </record>
+        
+            <record model="account.account.template" id="IA_AC01">
+                <field name="name">Assets</field>
+                <field name="code">IA_AC01</field>
+                <field name="type">view</field>
+                <field name="user_type" ref="account_type_asset_view"/>
+                
+                <field name="reconcile" eval="False"/>
+                
+                <field name="parent_id" ref="IA_AC0"/>
+            </record>
+            
+                <record model="account.account.template" id="IA_AC011">
+                    <field name="name">Current Assets</field>
+                    <field name="code">IA_AC011</field>
+                    <field name="type">view</field>
+                    <field name="user_type" ref="account_type_asset1"/>
+                    
+                    <field name="reconcile" eval="False"/>
+                    
+                    <field name="parent_id" ref="IA_AC01"/>
+                </record>
+                
+                    <record model="account.account.template" id="IA_AC0111">
+                        <field name="name">Bank Account</field>
+                        <field name="code">IA_AC0111</field>
+                        <field name="type">receivable</field>
+                        <field name="user_type" ref="account_type_asset1"/>
+                        
+                        <field name="reconcile" eval="False"/>
+                        
+                        <field name="parent_id" ref="IA_AC011"/>
+                    </record>
+                    
+                    <record model="account.account.template" id="IA_AC0112">
+                        <field name="name">Cash In Hand Account</field>
+                        <field name="code">IA_AC0112</field>
+                        <field name="type">view</field>
+                        <field name="user_type" ref="account_type_asset1"/>
+                        
+                        <field name="reconcile" eval="False"/>
+                        
+                        <field name="parent_id" ref="IA_AC011"/>
+                    </record>
+                        
+                        <record model="account.account.template" id="IA_AC01121">
+                            <field name="name">Cash Account</field>
+                            <field name="code">IA_AC01121</field>
+                            <field name="type">receivable</field>
+                            <field name="user_type" ref="account_type_asset1"/>
+                            
+                            <field name="reconcile" eval="False"/>
+                            
+                            <field name="parent_id" ref="IA_AC0112"/>
+                        </record>
+                    
+                    <record model="account.account.template" id="IA_AC0113">
+                        <field name="name">Deposit Account</field>
+                        <field name="code">IA_AC0113</field>
+                        <field name="type">receivable</field>
+                        <field name="user_type" ref="account_type_asset1"/>
+                        
+                        <field name="reconcile" eval="False"/>
+                        
+                        <field name="parent_id" ref="IA_AC011"/>
+                    </record>
+                    
+                    <record model="account.account.template" id="IA_AC0114">
+                        <field name="name">Loan &amp; Advance(Assets) Account</field>
+                        <field name="code">IA_AC0114</field>
+                        <field name="type">receivable</field>
+                        <field name="user_type" ref="account_type_asset1"/>
+                        
+                        <field name="reconcile" eval="False"/>
+                        
+                        <field name="parent_id" ref="IA_AC011"/>
+                    </record>
+                    
+<!--                    <record model="account.account.template" id="IA_AC0115">-->
+<!--                        <field name="name">Stock In Hand Account</field>-->
+<!--                        <field name="code">IA_AC0115</field>-->
+<!--                        <field name="type">receivable</field>-->
+<!--                        <field name="user_type" ref="account_type_asset1"/>
+                            -->
+<!--                        <field name="reconcile" eval="False"/>-->
+<!--                        -->
+<!--                        <field name="parent_id" ref="IA_AC011"/>-->
+<!--                    </record>-->
 
-					<record model="account.account.template" id="IA_AC0116">
-						<field name="name">Total Sundry Debtors Account</field>
-						<field name="code">IA_AC0116</field>
-						<field name="type">view</field>
-						<field name="user_type" ref="account_type_asset1"/>
-						
-						<field name="reconcile" eval="False"/>
-						
-			            <field name="parent_id" ref="IA_AC011"/>
-					</record>
+                    <record model="account.account.template" id="IA_AC0116">
+                        <field name="name">Total Sundry Debtors Account</field>
+                        <field name="code">IA_AC0116</field>
+                        <field name="type">view</field>
+                        <field name="user_type" ref="account_type_asset1"/>
+                        
+                        <field name="reconcile" eval="False"/>
+                        
+                        <field name="parent_id" ref="IA_AC011"/>
+                    </record>
 
 
-						<record model="account.account.template" id="IA_AC01161">
-							<field name="name">Sundry Debtors Account</field>
-							<field name="code">IA_AC01161</field>
-							<field name="type">receivable</field>
-							<field name="user_type" ref="account_type_asset1"/>
-							
-							<field name="reconcile" eval="False"/>
-							
-				            <field name="parent_id" ref="IA_AC0116"/>
-						</record>
-	
-				<record model="account.account.template" id="IA_AC012">
-					<field name="name">Fixed Assets</field>
-					<field name="code">IA_AC012</field>
-					<field name="type">receivable</field>
-					<field name="user_type" ref="account_type_asset1"/>
-					
-					<field name="reconcile" eval="False"/>
-					
-		            <field name="parent_id" ref="IA_AC01"/>
-				</record>
+                        <record model="account.account.template" id="IA_AC01161">
+                            <field name="name">Sundry Debtors Account</field>
+                            <field name="code">IA_AC01161</field>
+                            <field name="type">receivable</field>
+                            <field name="user_type" ref="account_type_asset1"/>
+                            
+                            <field name="reconcile" eval="False"/>
+                            
+                            <field name="parent_id" ref="IA_AC0116"/>
+                        </record>
+    
+                <record model="account.account.template" id="IA_AC012">
+                    <field name="name">Fixed Assets</field>
+                    <field name="code">IA_AC012</field>
+                    <field name="type">receivable</field>
+                    <field name="user_type" ref="account_type_asset1"/>
+                    
+                    <field name="reconcile" eval="False"/>
+                    
+                    <field name="parent_id" ref="IA_AC01"/>
+                </record>
 
-				<record model="account.account.template" id="IA_AC013">
-					<field name="name">Investment</field>
-					<field name="code">IA_AC013</field>
-					<field name="type">receivable</field>
-					<field name="user_type" ref="account_type_asset1"/>
-					
-					<field name="reconcile" eval="False"/>
-					
-		            <field name="parent_id" ref="IA_AC01"/>
-				</record>
+                <record model="account.account.template" id="IA_AC013">
+                    <field name="name">Investment</field>
+                    <field name="code">IA_AC013</field>
+                    <field name="type">receivable</field>
+                    <field name="user_type" ref="account_type_asset1"/>
+                    
+                    <field name="reconcile" eval="False"/>
+                    
+                    <field name="parent_id" ref="IA_AC01"/>
+                </record>
 
-				<record model="account.account.template" id="IA_AC014">
-					<field name="name">Misc. Expenses(Asset)</field>
-					<field name="code">IA_AC014</field>
-					<field name="type">receivable</field>
-					<field name="user_type" ref="account_type_asset1"/>
-					
-					<field name="reconcile" eval="False"/>
-					
-		            <field name="parent_id" ref="IA_AC01"/>
-				</record>
-				
-			
-			<record model="account.account.template" id="IA_AC02">
-				<field name="name">Liabilities</field>
-				<field name="code">IA_AC02</field>
-				<field name="type">view</field>
-				<field name="user_type" ref="account_type_root_ind1"/>
-				
-				<field name="reconcile" eval="False"/>
-				
-	            <field name="parent_id" ref="IA_AC0"/>
-			</record>
-			
-				<record model="account.account.template" id="IA_AC021">
-					<field name="name">Current Liabilities</field>
-					<field name="code">IA_AC021</field>
-					<field name="type">view</field>
-					<field name="user_type" ref="account_type_liability1"/>
-					
-					<field name="reconcile" eval="False"/>
-					
-		            <field name="parent_id" ref="IA_AC02"/>
-				</record>
-					
-					<record model="account.account.template" id="IA_AC0211">
-						<field name="name">Duties &amp; Taxes</field>
-						<field name="code">IA_AC0211</field>
-						<field name="type">payable</field>
-						<field name="user_type" ref="account_type_liability1"/>
-						
-						<field name="reconcile" eval="False"/>
-						
-			            <field name="parent_id" ref="IA_AC021"/>
-					</record>
-					
-					<record model="account.account.template" id="IA_AC0212">
-						<field name="name">Provision</field>
-						<field name="code">IA_AC0212</field>
-						<field name="type">payable</field>
-						<field name="user_type" ref="account_type_liability1"/>
-						
-						<field name="reconcile" eval="False"/>
-						
-			            <field name="parent_id" ref="IA_AC021"/>
-					</record>
+                <record model="account.account.template" id="IA_AC014">
+                    <field name="name">Misc. Expenses(Asset)</field>
+                    <field name="code">IA_AC014</field>
+                    <field name="type">receivable</field>
+                    <field name="user_type" ref="account_type_asset1"/>
+                    
+                    <field name="reconcile" eval="False"/>
+                    
+                    <field name="parent_id" ref="IA_AC01"/>
+                </record>
+                
+            
+            <record model="account.account.template" id="IA_AC02">
+                <field name="name">Liabilities</field>
+                <field name="code">IA_AC02</field>
+                <field name="type">view</field>
+                <field name="user_type" ref="account_type_liability_view"/>
+                
+                <field name="reconcile" eval="False"/>
+                
+                <field name="parent_id" ref="IA_AC0"/>
+            </record>
+            
+                <record model="account.account.template" id="IA_AC021">
+                    <field name="name">Current Liabilities</field>
+                    <field name="code">IA_AC021</field>
+                    <field name="type">view</field>
+                    <field name="user_type" ref="account_type_liability1"/>
+                    
+                    <field name="reconcile" eval="False"/>
+                    
+                    <field name="parent_id" ref="IA_AC02"/>
+                </record>
+                    
+                    <record model="account.account.template" id="IA_AC0211">
+                        <field name="name">Duties &amp; Taxes</field>
+                        <field name="code">IA_AC0211</field>
+                        <field name="type">payable</field>
+                        <field name="user_type" ref="account_type_liability1"/>
+                        
+                        <field name="reconcile" eval="False"/>
+                        
+                        <field name="parent_id" ref="IA_AC021"/>
+                    </record>
+                    
+                    <record model="account.account.template" id="IA_AC0212">
+                        <field name="name">Provision</field>
+                        <field name="code">IA_AC0212</field>
+                        <field name="type">payable</field>
+                        <field name="user_type" ref="account_type_liability1"/>
+                        
+                        <field name="reconcile" eval="False"/>
+                        
+                        <field name="parent_id" ref="IA_AC021"/>
+                    </record>
 
-					<record model="account.account.template" id="IA_AC0213">
-						<field name="name">Total Sundry Creditors</field>
-						<field name="code">IA_AC0213</field>
-						<field name="type">view</field>
-						<field name="user_type" ref="account_type_liability1"/>
-						
-						<field name="reconcile" eval="False"/>
-						
-			            <field name="parent_id" ref="IA_AC021"/>
-					</record>
-					
-						<record model="account.account.template" id="IA_AC02131">
-							<field name="name">Sundry Creditors</field>
-							<field name="code">IA_AC02131</field>
-							<field name="type">payable</field>
-							<field name="user_type" ref="account_type_liability1"/>
-							
-							<field name="reconcile" eval="False"/>
-							
-				            <field name="parent_id" ref="IA_AC0213"/>
-						</record>
+                    <record model="account.account.template" id="IA_AC0213">
+                        <field name="name">Total Sundry Creditors</field>
+                        <field name="code">IA_AC0213</field>
+                        <field name="type">view</field>
+                        <field name="user_type" ref="account_type_liability1"/>
+                        
+                        <field name="reconcile" eval="False"/>
+                        
+                        <field name="parent_id" ref="IA_AC021"/>
+                    </record>
+                    
+                        <record model="account.account.template" id="IA_AC02131">
+                            <field name="name">Sundry Creditors</field>
+                            <field name="code">IA_AC02131</field>
+                            <field name="type">payable</field>
+                            <field name="user_type" ref="account_type_liability1"/>
+                            
+                            <field name="reconcile" eval="False"/>
+                            
+                            <field name="parent_id" ref="IA_AC0213"/>
+                        </record>
 
-				<record model="account.account.template" id="IA_AC022">
-					<field name="name">Branch/Division</field>
-					<field name="code">IA_AC022</field>
-					<field name="type">payable</field>
-					<field name="user_type" ref="account_type_liability1"/>
-					
-					<field name="reconcile" eval="False"/>
-					
-		            <field name="parent_id" ref="IA_AC02"/>
-				</record>
-				
-				<record model="account.account.template" id="IA_AC023">
-					<field name="name">Share Holder/Owner Fund</field>
-					<field name="code">IA_AC023</field>
-					<field name="type">view</field>
-					<field name="user_type" ref="account_type_liability1"/>
-					
-					<field name="reconcile" eval="False"/>
-					
-		            <field name="parent_id" ref="IA_AC02"/>
-				</record>
-				
-				
-					<record model="account.account.template" id="IA_AC0231">
-						<field name="name">Capital Account</field>
-						<field name="code">IA_AC0231</field>
-						<field name="type">payable</field>
-						<field name="user_type" ref="account_type_liability1"/>
-						
-						<field name="reconcile" eval="False"/>
-						
-			            <field name="parent_id" ref="IA_AC023"/>
-					</record>
-				
-					<record model="account.account.template" id="IA_AC0232">
-						<field name="name">Reserve &amp; Surplus Account</field>
-						<field name="code">IA_AC0232</field>
-						<field name="type">payable</field>
-						<field name="user_type" ref="account_type_liability1"/>
-						
-						<field name="reconcile" eval="False"/>
-						
-			            <field name="parent_id" ref="IA_AC023"/>
-					</record>
-			
-				<record model="account.account.template" id="IA_AC024">
-					<field name="name">Loan(Liability) Account</field>
-					<field name="code">IA_AC024</field>
-					<field name="type">view</field>
-					<field name="user_type" ref="account_type_liability1"/>
-					
-					<field name="reconcile" eval="False"/>
-					
-		            <field name="parent_id" ref="IA_AC02"/>
-				</record>
-					
-					<record model="account.account.template" id="IA_AC0241">
-						<field name="name">Bank OD Account</field>
-						<field name="code">IA_AC0241</field>
-						<field name="type">payable</field>
-						<field name="user_type" ref="account_type_liability1"/>
-						
-						<field name="reconcile" eval="False"/>
-						
-			            <field name="parent_id" ref="IA_AC024"/>
-					</record>
-						
-					<record model="account.account.template" id="IA_AC0242">
-						<field name="name">Secured Loan Account</field>
-						<field name="code">IA_AC0242</field>
-						<field name="type">payable</field>
-						<field name="user_type" ref="account_type_liability1"/>
-						
-						<field name="reconcile" eval="False"/>
-						
-			            <field name="parent_id" ref="IA_AC024"/>
-					</record>
-					
-					<record model="account.account.template" id="IA_AC0243">
-						<field name="name">Unsecured Loan Account</field>
-						<field name="code">IA_AC0243</field>
-						<field name="type">payable</field>
-						<field name="user_type" ref="account_type_liability1"/>
-						
-						<field name="reconcile" eval="False"/>
-						
-			            <field name="parent_id" ref="IA_AC024"/>
-					</record>
-						
-				<record model="account.account.template" id="IA_AC025">
-					<field name="name">Suspense Account</field>
-					<field name="code">IA_AC025</field>
-					<field name="type">payable</field>
-					<field name="user_type" ref="account_type_liability1"/>
-					
-					<field name="reconcile" eval="False"/>
-					
-		            <field name="parent_id" ref="IA_AC02"/>
-				</record>
+                <record model="account.account.template" id="IA_AC022">
+                    <field name="name">Branch/Division</field>
+                    <field name="code">IA_AC022</field>
+                    <field name="type">payable</field>
+                    <field name="user_type" ref="account_type_liability1"/>
+                    
+                    <field name="reconcile" eval="False"/>
+                    
+                    <field name="parent_id" ref="IA_AC02"/>
+                </record>
+                
+                <record model="account.account.template" id="IA_AC023">
+                    <field name="name">Share Holder/Owner Fund</field>
+                    <field name="code">IA_AC023</field>
+                    <field name="type">view</field>
+                    <field name="user_type" ref="account_type_liability1"/>
+                    
+                    <field name="reconcile" eval="False"/>
+                    
+                    <field name="parent_id" ref="IA_AC02"/>
+                </record>
+                
+                
+                    <record model="account.account.template" id="IA_AC0231">
+                        <field name="name">Capital Account</field>
+                        <field name="code">IA_AC0231</field>
+                        <field name="type">payable</field>
+                        <field name="user_type" ref="account_type_liability1"/>
+                        
+                        <field name="reconcile" eval="False"/>
+                        
+                        <field name="parent_id" ref="IA_AC023"/>
+                    </record>
+                
+                    <record model="account.account.template" id="IA_AC0232">
+                        <field name="name">Reserve and Surplus Account</field>
+                        <field name="code">IA_AC0232</field>
+                        <field name="type">payable</field>
+                        <field name="user_type" ref="account_type_liability1"/>
+                        
+                        <field name="reconcile" eval="False"/>
+                        
+                        <field name="parent_id" ref="IA_AC023"/>
+                    </record>
+            
+                <record model="account.account.template" id="IA_AC024">
+                    <field name="name">Loan(Liability) Account</field>
+                    <field name="code">IA_AC024</field>
+                    <field name="type">view</field>
+                    <field name="user_type" ref="account_type_liability1"/>
+                    
+                    <field name="reconcile" eval="False"/>
+                    
+                    <field name="parent_id" ref="IA_AC02"/>
+                </record>
+                    
+                    <record model="account.account.template" id="IA_AC0241">
+                        <field name="name">Bank OD Account</field>
+                        <field name="code">IA_AC0241</field>
+                        <field name="type">payable</field>
+                        <field name="user_type" ref="account_type_liability1"/>
+                        
+                        <field name="reconcile" eval="False"/>
+                        
+                        <field name="parent_id" ref="IA_AC024"/>
+                    </record>
+                        
+                    <record model="account.account.template" id="IA_AC0242">
+                        <field name="name">Secured Loan Account</field>
+                        <field name="code">IA_AC0242</field>
+                        <field name="type">payable</field>
+                        <field name="user_type" ref="account_type_liability1"/>
+                        
+                        <field name="reconcile" eval="False"/>
+                        
+                        <field name="parent_id" ref="IA_AC024"/>
+                    </record>
+                    
+                    <record model="account.account.template" id="IA_AC0243">
+                        <field name="name">Unsecured Loan Account</field>
+                        <field name="code">IA_AC0243</field>
+                        <field name="type">payable</field>
+                        <field name="user_type" ref="account_type_liability1"/>
+                        
+                        <field name="reconcile" eval="False"/>
+                        
+                        <field name="parent_id" ref="IA_AC024"/>
+                    </record>
+                        
+                <record model="account.account.template" id="IA_AC025">
+                    <field name="name">Suspense Account</field>
+                    <field name="code">IA_AC025</field>
+                    <field name="type">payable</field>
+                    <field name="user_type" ref="account_type_liability1"/>
+                    
+                    <field name="reconcile" eval="False"/>
+                    
+                    <field name="parent_id" ref="IA_AC02"/>
+                </record>
 
-		
-		<record model="account.account.template" id="IA_AC1">
-			<field name="name">Profit And Loss Account</field>
-			<field name="code">IA_AC1</field>
-			<field name="type">view</field>
-			<field name="user_type" ref="account_type_root_ind1"/>
-			
-			<field name="reconcile" eval="False"/>
-			
+        
+        <record model="account.account.template" id="IA_AC1">
+            <field name="name">Profit And Loss Account</field>
+            <field name="code">IA_AC1</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account_type_root_ind1"/>
+            
+            <field name="reconcile" eval="False"/>
+            
             <field name="parent_id" ref="root"/>
-		</record>
-		
-			<record model="account.account.template" id="IA_AC11">
-				<field name="name">Expense</field>
-				<field name="code">IA_AC11</field>
-				<field name="type">view</field>
-				<field name="user_type" ref="account_type_root_ind1"/>
-				
-				<field name="reconcile" eval="False"/>
-				
-	            <field name="parent_id" ref="IA_AC1"/>
-			</record>
-			
-				<record model="account.account.template" id="IA_AC111">
-					<field name="name">Direct Expenses</field>
-					<field name="code">IA_AC111</field>
-					<field name="type">other</field>
-					<field name="user_type" ref="account_type_expense1"/>
-					
-					<field name="reconcile" eval="False"/>
-					
-		            <field name="parent_id" ref="IA_AC11"/>
-				</record>
-			
-				<record model="account.account.template" id="IA_AC112">
-					<field name="name">Indirect Expenses</field>
-					<field name="code">IA_AC112</field>
-					<field name="type">other</field>
-					<field name="user_type" ref="account_type_expense1"/>
-					
-					<field name="reconcile" eval="False"/>
-					
-		            <field name="parent_id" ref="IA_AC11"/>
-				</record>
-				
-				<record model="account.account.template" id="IA_AC113">
-					<field name="name">Purchase</field>
-					<field name="code">IA_AC113</field>
-					<field name="type">other</field>
-					<field name="user_type" ref="account_type_expense1"/>
-					
-					<field name="reconcile" eval="False"/>
-					
-		            <field name="parent_id" ref="IA_AC11"/>
-				</record>
-				<record model="account.account.template" id="IA_AC114">
-					<field name="name">Opening Stock</field>
-					<field name="code">IA_AC114</field>
-					<field name="type">other</field>
-					<field name="user_type" ref="account_type_expense1"/>
-					
-					<field name="reconcile" eval="False"/>
-					
-		            <field name="parent_id" ref="IA_AC11"/>
-				</record>
+        </record>
+        
+            <record model="account.account.template" id="IA_AC11">
+                <field name="name">Expense</field>
+                <field name="code">IA_AC11</field>
+                <field name="type">view</field>
+                <field name="user_type" ref="account_type_expense_view"/>
+                
+                <field name="reconcile" eval="False"/>
+                
+                <field name="parent_id" ref="IA_AC1"/>
+            </record>
+            
+                <record model="account.account.template" id="IA_AC111">
+                    <field name="name">Direct Expenses</field>
+                    <field name="code">IA_AC111</field>
+                    <field name="type">other</field>
+                    <field name="user_type" ref="account_type_expense1"/>
+                    
+                    <field name="reconcile" eval="False"/>
+                    
+                    <field name="parent_id" ref="IA_AC11"/>
+                </record>
+            
+                <record model="account.account.template" id="IA_AC112">
+                    <field name="name">Indirect Expenses</field>
+                    <field name="code">IA_AC112</field>
+                    <field name="type">other</field>
+                    <field name="user_type" ref="account_type_expense1"/>
+                    
+                    <field name="reconcile" eval="False"/>
+                    
+                    <field name="parent_id" ref="IA_AC11"/>
+                </record>
+                
+                <record model="account.account.template" id="IA_AC113">
+                    <field name="name">Purchase</field>
+                    <field name="code">IA_AC113</field>
+                    <field name="type">other</field>
+                    <field name="user_type" ref="account_type_expense1"/>
+                    
+                    <field name="reconcile" eval="False"/>
+                    
+                    <field name="parent_id" ref="IA_AC11"/>
+                </record>
+                <record model="account.account.template" id="IA_AC114">
+                    <field name="name">Opening Stock</field>
+                    <field name="code">IA_AC114</field>
+                    <field name="type">other</field>
+                    <field name="user_type" ref="account_type_expense1"/>
+                    
+                    <field name="reconcile" eval="False"/>
+                    
+                    <field name="parent_id" ref="IA_AC11"/>
+                </record>
 
-				
-			<record model="account.account.template" id="IA_AC12">
-				<field name="name">Income</field>
-				<field name="code">IA_AC12</field>
-				<field name="type">view</field>
-				<field name="user_type" ref="account_type_root_ind1"/>
-				
-				<field name="reconcile" eval="False"/>
-				
-	            <field name="parent_id" ref="IA_AC1"/>
-			</record>
-			
-				<record model="account.account.template" id="IA_AC121">
-					<field name="name">Direct Incomes</field>
-					<field name="code">IA_AC121</field>
-					<field name="type">other</field>
-					<field name="user_type" ref="account_type_income1"/>
-					
-					<field name="reconcile" eval="False"/>
-					
-		            <field name="parent_id" ref="IA_AC12"/>
-				</record>
-				
-				<record model="account.account.template" id="IA_AC122">
-					<field name="name">Indirect Incomes</field>
-					<field name="code">IA_AC122</field>
-					<field name="type">other</field>
-					<field name="user_type" ref="account_type_income1"/>
-					
-					<field name="reconcile" eval="False"/>
-					
-		            <field name="parent_id" ref="IA_AC12"/>
-				</record>
-				
-				<record model="account.account.template" id="IA_AC123">
-					<field name="name">Sales Account</field>
-					<field name="code">IA_AC123</field>
-					<field name="type">other</field>
-					<field name="user_type" ref="account_type_income1"/>
-					
-					<field name="reconcile" eval="False"/>
-					
-		            <field name="parent_id" ref="IA_AC12"/>
-				</record>
-				<record model="account.account.template" id="IA_AC124">
-					<field name="name">Goods Given Account</field>
-					<field name="code">IA_AC124</field>
-					<field name="type">other</field>
-					<field name="user_type" ref="account_type_income1"/>
-					
-					<field name="reconcile" eval="False"/>
-					
-		            <field name="parent_id" ref="IA_AC12"/>
-				</record>
+                
+            <record model="account.account.template" id="IA_AC12">
+                <field name="name">Income</field>
+                <field name="code">IA_AC12</field>
+                <field name="type">view</field>
+                <field name="user_type" ref="account_type_income_view"/>
+                
+                <field name="reconcile" eval="False"/>
+                
+                <field name="parent_id" ref="IA_AC1"/>
+            </record>
+            
+                <record model="account.account.template" id="IA_AC121">
+                    <field name="name">Direct Incomes</field>
+                    <field name="code">IA_AC121</field>
+                    <field name="type">other</field>
+                    <field name="user_type" ref="account_type_income1"/>
+                    
+                    <field name="reconcile" eval="False"/>
+                    
+                    <field name="parent_id" ref="IA_AC12"/>
+                </record>
+                
+                <record model="account.account.template" id="IA_AC122">
+                    <field name="name">Indirect Incomes</field>
+                    <field name="code">IA_AC122</field>
+                    <field name="type">other</field>
+                    <field name="user_type" ref="account_type_income1"/>
+                    
+                    <field name="reconcile" eval="False"/>
+                    
+                    <field name="parent_id" ref="IA_AC12"/>
+                </record>
+                
+                <record model="account.account.template" id="IA_AC123">
+                    <field name="name">Sales Account</field>
+                    <field name="code">IA_AC123</field>
+                    <field name="type">other</field>
+                    <field name="user_type" ref="account_type_income1"/>
+                    
+                    <field name="reconcile" eval="False"/>
+                    
+                    <field name="parent_id" ref="IA_AC12"/>
+                </record>
+                <record model="account.account.template" id="IA_AC124">
+                    <field name="name">Goods Given Account</field>
+                    <field name="code">IA_AC124</field>
+                    <field name="type">other</field>
+                    <field name="user_type" ref="account_type_income1"/>
+                    
+                    <field name="reconcile" eval="False"/>
+                    
+                    <field name="parent_id" ref="IA_AC12"/>
+                </record>
 
-				<!-- Tax detail -->		
-				
-				<record model="account.tax.code.template" id="vat_code_tax1">
-					<field name="name">Tax</field>
-				</record>
-				
-				<record model="account.tax.code.template" id="vat_code_balance_net">
-					<field name="name">Tax Balance to Pay</field>
-					<field name="parent_id" ref="vat_code_tax1"/>
-				</record>
-			
-				<record model="account.tax.code.template" id="vat_code_due_tva">
-					<field name="name">Tax Due (Tax to pay)</field>
-					<field name="parent_id" ref="vat_code_balance_net"/>
-				</record>
-			
-				<record model="account.tax.code.template" id="vat_code_payable">
-					<field name="name">Tax Payable</field>
-					<field name="parent_id" ref="vat_code_balance_net"/>
-				</record>
-			
-				<record model="account.tax.code.template" id="vat_code_base_net">
-					<field name="name">Tax Bases</field>
-					<field name="parent_id" ref="vat_code_tax1"/>
-				</record>
-			
-			
-				<record model="account.tax.code.template" id="vat_code_base_due">
-					<field name="name">Base of Taxed Sales</field>
-					<field name="parent_id" ref="vat_code_base_net"/>
-				</record>
-			
-			
-				<record model="account.tax.code.template" id="vat_code_receivable_net">
-					<field name="name">Base of Taxed Purchases</field>
-					<field name="parent_id" ref="vat_code_base_net"/>
-				</record>
-		
-				
-				
-		<record id="opening_journal" model="account.journal">
+                <!-- Tax detail -->        
+                
+                <record model="account.tax.code.template" id="vat_code_tax1">
+                    <field name="name">Tax</field>
+                </record>
+                
+                <record model="account.tax.code.template" id="vat_code_balance_net">
+                    <field name="name">Tax Balance to Pay</field>
+                    <field name="parent_id" ref="vat_code_tax1"/>
+                </record>
+            
+                <record model="account.tax.code.template" id="vat_code_due_tva">
+                    <field name="name">Tax Due (Tax to pay)</field>
+                    <field name="parent_id" ref="vat_code_balance_net"/>
+                </record>
+            
+                <record model="account.tax.code.template" id="vat_code_payable">
+                    <field name="name">Tax Payable</field>
+                    <field name="parent_id" ref="vat_code_balance_net"/>
+                </record>
+            
+                <record model="account.tax.code.template" id="vat_code_base_net">
+                    <field name="name">Tax Bases</field>
+                    <field name="parent_id" ref="vat_code_tax1"/>
+                </record>
+            
+            
+                <record model="account.tax.code.template" id="vat_code_base_due">
+                    <field name="name">Base of Taxed Sales</field>
+                    <field name="parent_id" ref="vat_code_base_net"/>
+                </record>
+            
+            
+                <record model="account.tax.code.template" id="vat_code_receivable_net">
+                    <field name="name">Base of Taxed Purchases</field>
+                    <field name="parent_id" ref="vat_code_base_net"/>
+                </record>
+        
+                
+                
+        <record id="opening_journal" model="account.journal">
             <field name="name">Opening Journal</field>
             <field name="code">OPJ</field>
             <field name="type">situation</field>
@@ -544,19 +569,19 @@
             <field name="type">situation</field>
         </record>
         
-				
-				<!-- Chart template -->
-				<record id="indian_chart_template" model="account.chart.template">
-				    <field name="name">India - Chart of Accounts </field>
-				    <field name="account_root_id" ref="root"/>
-				    <field name="tax_code_root_id" ref="vat_code_tax1"/>
-				    <field name="bank_account_view_id" ref="IA_AC01121"/>
-				    <field name="property_account_receivable" ref="IA_AC01161"/>
-			        <field name="property_account_payable" ref="IA_AC02131"/>
-			        <field name="property_account_expense_categ" ref="IA_AC112"/>
-			        <field name="property_account_income_categ" ref="IA_AC122"/>
-				</record>
-				
+                
+                <!-- Chart template -->
+                <record id="indian_chart_template" model="account.chart.template">
+                    <field name="name">India - Chart of Accounts </field>
+                    <field name="account_root_id" ref="root"/>
+                    <field name="tax_code_root_id" ref="vat_code_tax1"/>
+                    <field name="bank_account_view_id" ref="IA_AC01121"/>
+                    <field name="property_account_receivable" ref="IA_AC01161"/>
+                    <field name="property_account_payable" ref="IA_AC02131"/>
+                    <field name="property_account_expense_categ" ref="IA_AC112"/>
+                    <field name="property_account_income_categ" ref="IA_AC122"/>
+                </record>
+                
 
-	</data>
+    </data>
 </openerp>

From e0b5f5c64245e3737a6753dac890ac1c7d3c7381 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 20 May 2010 19:34:29 +0200
Subject: [PATCH 77/82] [FIX] typo

bzr revid: fp@tinyerp.com-20100520173429-2hd3mhl7vvo2kale
---
 addons/crm/crm_lead.py                              | 4 ++--
 addons/mrp/mrp_workflow.xml                         | 3 ++-
 addons/mrp_procurement/mrp_procurement_workflow.xml | 2 --
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index fe0eb82c52a..5c4c20b384f 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -103,7 +103,7 @@ class crm_lead(osv.osv, crm_case):
         '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"),
-        'description': fields.text('Description'), 
+        'description': fields.text('Note'),
         'write_date': fields.datetime('Update Date' , readonly=True), 
 
         # Lead fields 
@@ -137,7 +137,7 @@ and users by email"),
                                   \nIf the case is in progress the state is set to \'Open\'.\
                                   \nWhen the case is over, the state is set to \'Done\'.\
                                   \nIf the case needs to be reviewed then the state is set to \'Pending\'.'), 
-        }
+    }
 
     _defaults = {
         'active': lambda *a: 1, 
diff --git a/addons/mrp/mrp_workflow.xml b/addons/mrp/mrp_workflow.xml
index 791c376ef92..83def2c006b 100644
--- a/addons/mrp/mrp_workflow.xml
+++ b/addons/mrp/mrp_workflow.xml
@@ -113,8 +113,9 @@
             <field name="act_to" ref="prod_act_cancel"/>
             <field name="signal">button_cancel</field>
         </record>
-        
+
         <!-- Procurement -->
+
         <record id="act_produce" model="workflow.activity">
             <field name="wkf_id" ref="mrp_procurement.wkf_procurement"/>
             <field name="name">produce</field>
diff --git a/addons/mrp_procurement/mrp_procurement_workflow.xml b/addons/mrp_procurement/mrp_procurement_workflow.xml
index 46c4a10fffc..051067f6fec 100644
--- a/addons/mrp_procurement/mrp_procurement_workflow.xml
+++ b/addons/mrp_procurement/mrp_procurement_workflow.xml
@@ -2,8 +2,6 @@
 <openerp>
     <data>
 
-		<!-- Procurement -->
-
         <record id="wkf_procurement" model="workflow">
             <field name="name">mrp.procurement.basic</field>
             <field name="osv">mrp.procurement</field>

From 7909755eaa2beeaa9e8b6c4fdece32ba11b6ef67 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 20 May 2010 19:34:35 +0200
Subject: [PATCH 78/82] [FIX] typo

bzr revid: fp@tinyerp.com-20100520173435-jg6tracp042y2pla
---
 addons/crm/crm_lead.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 5c4c20b384f..fe43982ad66 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -103,7 +103,7 @@ class crm_lead(osv.osv, crm_case):
         '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"),
-        'description': fields.text('Note'),
+        'description': fields.text('Notes'),
         'write_date': fields.datetime('Update Date' , readonly=True), 
 
         # Lead fields 

From 48bbaeb25332ca893d2debd594293a33ba9866d5 Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Thu, 20 May 2010 23:29:46 +0530
Subject: [PATCH 79/82] [FIX]: remove print statements

bzr revid: mga@tinyerp.com-20100520175946-ofej71gxtae3wnn7
---
 addons/account_report_india/report/report_bs.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account_report_india/report/report_bs.py b/addons/account_report_india/report/report_bs.py
index 0e5dcf26531..51b2f349224 100644
--- a/addons/account_report_india/report/report_bs.py
+++ b/addons/account_report_india/report/report_bs.py
@@ -138,7 +138,7 @@ class report_balancesheet_horizontal(rml_parse.rml_parse):
                         
             self.result[typ] = accounts_temp
             cal_list[typ]=self.result[typ]
-        print 'XXXXXXXX : ', cal_list, len(cal_list)
+
         if cal_list:
             temp={}
             for i in range(0,max(len(cal_list['liability']),len(cal_list['asset']))):

From f8bf43dba643a4cfa37cb9d0f7d4509c2d5ff543 Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Fri, 21 May 2010 00:04:22 +0530
Subject: [PATCH 80/82] [CLEAN]: clean idea module according to the fabien
 review

bzr revid: mga@tinyerp.com-20100520183422-bu03cbpav8qe317z
---
 addons/idea/idea.py       | 32 +++++++++++++++++++++++++++-----
 addons/idea/idea_view.xml | 16 +++++++++++-----
 2 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/addons/idea/idea.py b/addons/idea/idea.py
index ba91389246b..12564de8540 100644
--- a/addons/idea/idea.py
+++ b/addons/idea/idea.py
@@ -29,7 +29,7 @@ DefaultVoteValue = '50'
 
 class idea_category(osv.osv):
     """ Category of Idea """
-
+    
     _name = "idea.category"
     _description = "Idea Category"
 
@@ -38,7 +38,7 @@ class idea_category(osv.osv):
         'summary': fields.text('Summary'),
         'parent_id': fields.many2one('idea.category', 'Parent Categories', ondelete='set null'),
         'child_ids': fields.one2many('idea.category', 'parent_id', 'Child Categories'),
-        'visibility':fields.boolean('Open Idea?', required=False),
+        'visibility':fields.boolean('Open Idea?', required=False, help="If True creator of the idea will be visible to others"),
     }
     _sql_constraints = [
         ('name', 'unique(parent_id,name)', 'The name of the category must be unique' )
@@ -152,8 +152,8 @@ class idea_idea(osv.osv):
 
     _columns = {
         'user_id': fields.many2one('res.users', 'Creator', required=True, readonly=True),
-        'title': fields.char('Idea Summary', size=64, required=True),
-        'description': fields.text('Description', help='Content of the idea'),
+        'title': fields.char('Idea Summary', size=64, required=True, readonly=True, states={'draft':[('readonly',False)]}),
+        'description': fields.text('Description', help='Content of the idea', readonly=True, states={'draft':[('readonly',False)]}),
         'comment_ids': fields.one2many('idea.comment', 'idea_id', 'Comments'),
         'create_date': fields.datetime('Creation date', readonly=True),
         'vote_ids': fields.one2many('idea.vote', 'idea_id', 'Vote'),
@@ -161,7 +161,7 @@ class idea_idea(osv.osv):
         'vote_avg': fields.function(_vote_avg_compute, method=True, string="Average Score", type="float"),
         'count_votes': fields.function(_vote_count, method=True, string="Count of votes", type="integer"),
         'count_comments': fields.function(_comment_count, method=True, string="Count of comments", type="integer"),
-        'category_id': fields.many2one('idea.category', 'Category', required=True),
+        'category_id': fields.many2one('idea.category', 'Category', required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'state': fields.selection([('draft', 'Draft'), 
             ('open', 'Opened'),
             ('close', 'Accepted'), 
@@ -203,8 +203,30 @@ class idea_idea(osv.osv):
         vals.update({
             'visibility':visibility
         })
+
         res_id = super(idea_idea, self).create(cr, user, vals, context)
         return res_id
+
+    def copy(self, cr, uid, id, default={}, context={}):
+        """
+        Create the new record in idea_idea model from existing one
+        @param cr: A database cursor
+        @param user: ID of the user currently logged in
+        @param id: list of record ids on which copy method executes
+        @param default: dict type contains the values to be overridden during copy of object
+        @param context: context arguments, like lang, time zone
+        
+        @return: Returns the id of the new record
+        """
+        
+        default.update({
+            'comment_ids':False,
+            'vote_ids':False,
+            'stat_vote_ids':False
+            
+        })
+        res_id = super(idea_idea, self).copy(cr, uid, id, default, context)
+        return res_id
     
     def write(self, cr, user, ids, vals, context=None):
         """
diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index 053aca6f203..88c48656b5e 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -133,22 +133,29 @@
         <field name="arch" type="xml">
         <form string="New Idea">
             <group col="6" colspan="4">
-                <field name="title" colspan="4" select="1" />
+                <field name="title" select="1" />
                 <field name="category_id" select="1"/>
-                <field name="my_vote"/>
                 <field name="user_id" attrs="{'invisible':[('visibility','=',False)]}"/>
                 <field name="vote_avg" widget="progressbar"/>
+                <group col="4" colspan="2">
+                    <field name="my_vote" readonly="1"/>
+                    <button name="%(idea.action_idea_post_vote)d" icon="gtk-execute" states="open"  type="action" string="Submit Vote"/>
+                </group>
             </group>
             <notebook colspan="4">
                 <page string="Idea Detail">
                     <field name="description" nolabel="1" colspan="4" widget="text_wiki"/>
                 </page>
-                <page string="Comments" groups="base.group_extended">
+                <page string="Comments">
                     <field name="comment_ids" nolabel="1" colspan="4">
                         <form string="Comment">
                             <separator string="Your comment" colspan="4"/>
                             <field name="content" nolabel="1" />
                         </form>
+                        <tree string="Comments">
+                            <field name="create_date"/>
+                            <field name="content"/>
+                        </tree>
                     </field>
                 </page>
                 <page string="Vote" groups="base.group_extended">
@@ -159,7 +166,7 @@
                         </tree>
                     </field>
                 </page>
-                <page string="Statistics">
+                <page string="Statistics" groups="base.group_extended">
                     <group col="6" colspan="4">
                         <field name="count_comments" />
                         <field name="count_votes" />
@@ -179,7 +186,6 @@
             <group colspan="4" col="6">
                 <field name="state"/>
                 <button name="idea_open" string="Open" states="draft" icon="gtk-go-forward"/>
-                <button name="%(idea.action_idea_post_vote)d" icon="gtk-execute" states="open"  type="action" string="Submit Vote"/>
                 <button name="idea_close" string="Accept" states="open" icon="gtk-jump-to"/>
                 <button name="idea_cancel" string="Refuse" states="open"  icon="gtk-cancel"/> 
                 

From 1fa4512bcb5454cd0433e8311faf9008cfc54a5a Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Fri, 21 May 2010 01:05:09 +0530
Subject: [PATCH 81/82] [IMP]: improvement in account voucher and account move,
 chance view, improve search view

bzr revid: mga@tinyerp.com-20100520193509-4doya6kcq1jle9nf
---
 addons/account/account_invoice_view.xml | 98 ++++++++++++-------------
 addons/account/account_view.xml         | 32 +++++---
 addons/account_voucher/voucher_view.xml | 41 ++++++++++-
 3 files changed, 106 insertions(+), 65 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 18d817f41bd..701d3c9fcc9 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -141,23 +141,23 @@
             <field name="priority">2</field>
             <field name="arch" type="xml">
                 <form string="Supplier invoice">
-					<group col="8" colspan="4">
-						<field domain="[('type', '=', 'purchase')]" name="journal_id"/>
-						<field name="number" readonly="1"/>
-						<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"/>
-						<newline/>
-						<field name="partner_id" domain="[('supplier','=', 1)]" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank,company_id)" context="{'default_customer': 0}"/>
-						<field domain="[('partner_id','=',partner_id)]" name="address_invoice_id"/>
-						<field name="fiscal_position" groups="base.group_extended" widget="selection"/>
-						<newline/>
-						<field name="date_invoice"/>
-						<field name="period_id" groups="base.group_user"/>
-						<group colspan="2" col="1" groups="base.group_user">
-						    <label align="0.0" string="(keep empty to use the current period)"/>
-						</group>
-					</group>
+                    <group col="8" colspan="4">
+                        <field domain="[('type', '=', 'purchase')]" name="journal_id"/>
+                        <field name="number" readonly="1"/>
+                        <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"/>
+                        <newline/>
+                        <field name="partner_id" domain="[('supplier','=', 1)]" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank,company_id)" context="{'default_customer': 0}"/>
+                        <field domain="[('partner_id','=',partner_id)]" name="address_invoice_id"/>
+                        <field name="fiscal_position" groups="base.group_extended" widget="selection"/>
+                        <newline/>
+                        <field name="date_invoice"/>
+                        <field name="period_id" groups="base.group_user"/>
+                        <group colspan="2" col="1" groups="base.group_user">
+                            <label align="0.0" string="(keep empty to use the current period)"/>
+                        </group>
+                    </group>
                     <notebook colspan="4">
                         <page string="Invoice">
                            <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', company_id),('journal_id','=',journal_id)]" name="account_id" groups="base.group_user"/>
@@ -201,12 +201,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="%(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_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="invoice_open" states="draft,proforma2" string="Validate" icon="gtk-apply"/>
+                                    <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_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>
                             </group>
                         </page>
@@ -250,23 +250,23 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Invoice">
-					<group colspan="4" col="8">
-					<field name="journal_id" groups="base.group_user"/>
-					<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"/>
-					<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"/>
-					<field name="fiscal_position" groups="base.group_extended" widget="selection"/>
-					<newline/>
-					<field name="date_invoice"/>
-					<field name="period_id" groups="base.group_user"/>
-					<group colspan="2" col="1" groups="base.group_user">
-					    <label align="0.0" string="(keep empty to use the current period)"/>
-					</group>
-					</group>
+                    <group colspan="4" col="8">
+                    <field name="journal_id" groups="base.group_user"/>
+                    <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"/>
+                    <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"/>
+                    <field name="fiscal_position" groups="base.group_extended" widget="selection"/>
+                    <newline/>
+                    <field name="date_invoice"/>
+                    <field name="period_id" groups="base.group_user"/>
+                    <group colspan="2" col="1" groups="base.group_user">
+                        <label align="0.0" string="(keep empty to use the current period)"/>
+                    </group>
+                    </group>
                     <notebook colspan="4">
                         <page string="Invoice">
                             <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', company_id),('journal_id','=',journal_id)]" name="account_id" groups="base.group_user"/>
@@ -294,13 +294,13 @@
                                 <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="%(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_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="invoice_proforma2" states="draft" string="PRO-FORMA" icon="gtk-print"/>
+                                    <button name="invoice_open" states="draft,proforma2" string="Create" icon="gtk-execute"/>
+                                    <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_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>
                             </group>
                         </page>
@@ -484,9 +484,9 @@
 
         <act_window domain="[('account_analytic_id', '=', active_id)]" id="act_account_analytic_account_2_account_invoice_line" name="Invoice lines" res_model="account.invoice.line" src_model="account.analytic.account"/>
 
-		<act_window domain="[('partner_id', '=', partner_id), ('account_id.type', 'in', ['receivable', 'payable']), ('reconcile_id','=',False)]" id="act_account_invoice_account_move_unreconciled" name="Unreconciled Receivables &amp; Payables" res_model="account.move.line" src_model="account.invoice"/>
+        <act_window domain="[('partner_id', '=', partner_id), ('account_id.type', 'in', ['receivable', 'payable']), ('reconcile_id','=',False)]" id="act_account_invoice_account_move_unreconciled" name="Unreconciled Receivables &amp; Payables" res_model="account.move.line" src_model="account.invoice"/>
 
-		<!--  Partners inherited form -->
+        <!--  Partners inherited form -->
 
         <record id="view_invoice_partner_info_form" model="ir.ui.view">
             <field name="name">res.partner.invoice.info.inherit</field>
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 88e5249735f..59253809e46 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -804,7 +804,7 @@
             </field>
         </record>
 
-		<record id="view_account_move_line_filter" model="ir.ui.view">
+        <record id="view_account_move_line_filter" model="ir.ui.view">
             <field name="name">Entry Lines</field>
             <field name="model">account.move.line</field>
             <field name="type">search</field>
@@ -858,6 +858,7 @@
                     <field name="ref"/>
                     <field name="journal_id"/>
                     <field name="period_id"/>
+                    <field name="type" invisible=" not context.get('set_visible',True)"/>
                     <field name="partner_id"/>
                     <field name="line_id"/>
                     <field name="to_check" groups="base.group_extended"/>
@@ -872,21 +873,21 @@
             <field name="model">account.move</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Account Entry">
+                <form string="Journal Entries">
                     <group colspan="4" col="6">
-                    <field name="name" select="1" readonly="True"/>
-                    <field name="period_id"/>
-                    <field name="journal_id" select="1"/>
-                    <field name="company_id" required="1" groups="base.group_multi_company"/>
-                    <field name="date" select="1"/>
-                    <field name="ref" select="1"/>
-                    <field name="to_check"/>
-                    <field name="type" groups="base.group_extended"/>
+                        <field name="name" select="1" colspan="4" readonly="True"/>
+                        <field name="journal_id" select="1"/>
+                        <field name="period_id"/>
+                        <field name="type"/>
+                        <field name="ref" select="1"/>
+                        <field name="company_id" required="1" groups="base.group_multi_company"/>
+                        <field name="date" select="1" groups="base.group_extended"/>
+                        <field name="to_check" groups="base.group_extended"/>
                     </group>
                     <field name="partner_id" invisible="1" select="1"/>
                     <field name="amount" invisible="1" select="1"/>
 
-                    <field colspan="4" height="250" name="line_id" nolabel="1" widget="one2many_list" default_get="{'lines':line_id ,'journal':journal_id }">
+                    <field colspan="4" height="260" name="line_id" nolabel="1" widget="one2many_list" default_get="{'lines':line_id ,'journal':journal_id }">
                         <form string="Account Entry Line">
                             <separator colspan="4" string="General Information"/>
                             <field name="name" select="1"/>
@@ -957,6 +958,13 @@
                         <field name="journal_id" select='1'/>
                         <field name="partner_id" select='1'/>
                     </group>
+                    <newline/>
+                    <group expand="1" string="Group By..." colspan="12" col="10">
+                        <filter string="Journal" icon="terp-account" domain="[]" context="{'group_by':'journal_id'}"/>
+                        <filter string="Period" icon="terp-account" domain="[]" context="{'group_by':'period_id'}"/>
+                        <filter string="Type" icon="terp-account" domain="[]" context="{'group_by':'type', 'set_visible':True}"/>
+                        <filter string="States" icon="terp-account" domain="[]" context="{'group_by':'state'}"/>
+                    </group>
                 </search>
             </field>
         </record>
@@ -973,7 +981,7 @@
         <menuitem action="action_move_line_form" id="menu_action_move_line_form" parent="next_id_29"/>
 
         <record id="action_move_line_form_encode_by_move" model="ir.actions.act_window">
-            <field name="name">Entries by Move</field>
+            <field name="name">Journal Entries</field>
             <field name="res_model">account.move</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
diff --git a/addons/account_voucher/voucher_view.xml b/addons/account_voucher/voucher_view.xml
index a4a789a6e5e..956d9e533a0 100644
--- a/addons/account_voucher/voucher_view.xml
+++ b/addons/account_voucher/voucher_view.xml
@@ -7,12 +7,15 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Vouchers">
+                    <field name="date"/>
+                    <field name="number"/>
                     <field name="name"/>
                     <field name="journal_id"/>
+                    <field name="type" invisible=" not context.get('set_visible',True)"/>
                     <field name="account_id" />
-                    <field name="amount"/>
-                    <field name="date"/>
+                    <field name="amount" sum="Total Amount"/>
                     <field name="period_id"/>
+                    <field name="state"/>
                 </tree>
             </field>
         </record>
@@ -24,7 +27,7 @@
             <field name="arch" type="xml">
                 <form string="Voucher">
                     <group col="6" colspan="4">
-                        <field name="name" select="1" colspan="4"/>
+                        <field name="name" colspan="4"/>
                         <field name="journal_id" select="1" on_change="onchange_journal(journal_id,type)"/>
                         <field name="account_id" on_change="onchange_account(account_id)"/>
                         <field name="type" on_change="onchange_journal(journal_id,type)"/>
@@ -69,7 +72,37 @@
                 </form>
             </field>
         </record>
-
+        
+        <record id="view_account_move_filter" model="ir.ui.view">
+            <field name="name">account.voucher.select</field>
+            <field name="model">account.voucher</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Vouchers">
+                    <group col='8' colspan='4'>
+                        <filter icon="terp-account" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
+                        <filter icon="terp-account" string="Proforma" domain="[('state','=','proforma')]" help="Proforma Vouchers"/>
+                        <filter icon="terp-account" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
+                        <filter icon="terp-account" string="Cancel" domain="[('state','=','cancel')]" help="Cancel Vouchers"/>
+                        <separator orientation="vertical"/>
+                        <field name="date" select='1'/>
+                        <field name="name" select='1'/>
+                        <field name="number" select='1'/>
+                        <field name="journal_id" select='1'/>
+                        <field name="partner_id" select='1'/>
+                        <field name="period_id" select='1'/>
+                    </group>
+                    <newline/>
+                    <group expand="1" string="Group By..." colspan="12" col="10">
+                        <filter string="Journal" icon="terp-account" domain="[]" context="{'group_by':'journal_id'}"/>
+                        <filter string="Period" icon="terp-account" domain="[]" context="{'group_by':'period_id'}"/>
+                        <filter string="Type" icon="terp-account" domain="[]" context="{'group_by':'type', 'set_visible':True}"/>
+                        <filter string="States" icon="terp-account" domain="[]" context="{'group_by':'state'}"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+        
         <record model="ir.actions.act_window" id="action_voucher_list">
             <field name="name">Vouchers</field>
             <field name="res_model">account.voucher</field>

From 731db7a48097ca0f265e530559e4fd97727e82fb Mon Sep 17 00:00:00 2001
From: Launchpad Code Hosting <codehost@crowberry>
Date: Fri, 21 May 2010 04:38:08 +0100
Subject: [PATCH 82/82] Launchpad automatic translations update.

bzr revid: codehost@crowberry-20100521033808-s086x71ntdjjymmr
---
 addons/account/i18n/th.po       | 11 ++++++-----
 addons/account_chart/i18n/th.po |  2 +-
 addons/base_setup/i18n/th.po    |  2 +-
 addons/multi_company/i18n/fr.po | 22 +++++++++++++---------
 addons/stock/i18n/fr.po         | 10 +++++-----
 5 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/addons/account/i18n/th.po b/addons/account/i18n/th.po
index 320fdc82290..7389cdda788 100644
--- a/addons/account/i18n/th.po
+++ b/addons/account/i18n/th.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-03-15 03:12+0000\n"
+"PO-Revision-Date: 2010-05-20 07:09+0000\n"
 "Last-Translator: Songpon Phusing <p.songpon@gmail.com>\n"
 "Language-Team: Thai <th@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:08+0000\n"
+"X-Launchpad-Export-Date: 2010-05-21 03:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -51,7 +51,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.account_type_asset
 msgid "Asset"
-msgstr ""
+msgstr "สินทรัพย์"
 
 #. module: account
 #: constraint:ir.actions.act_window:0
@@ -106,7 +106,7 @@ msgstr ""
 #: model:ir.actions.wizard,name:account.wizard_vat_declaration
 #: model:ir.ui.menu,name:account.menu_wizard_vat_declaration
 msgid "Print Taxes Report"
-msgstr ""
+msgstr "พิมพ์รายงานภาษี"
 
 #. module: account
 #: field:account.account,parent_id:0
@@ -2133,7 +2133,8 @@ msgid "Analytic Entry"
 msgstr ""
 
 #. module: account
-#: view:res.company:0 field:res.company,overdue_msg:0
+#: view:res.company:0
+#: field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
 msgstr ""
 
diff --git a/addons/account_chart/i18n/th.po b/addons/account_chart/i18n/th.po
index 9b4d7b21560..e53bfc9b6c2 100644
--- a/addons/account_chart/i18n/th.po
+++ b/addons/account_chart/i18n/th.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-05-20 05:23+0000\n"
+"X-Launchpad-Export-Date: 2010-05-21 03:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/base_setup/i18n/th.po b/addons/base_setup/i18n/th.po
index e4c04634f12..0d613b0573b 100644
--- a/addons/base_setup/i18n/th.po
+++ b/addons/base_setup/i18n/th.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-05-20 05:23+0000\n"
+"X-Launchpad-Export-Date: 2010-05-21 03:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/multi_company/i18n/fr.po b/addons/multi_company/i18n/fr.po
index 2e6f71b23d4..0f63c32dd30 100644
--- a/addons/multi_company/i18n/fr.po
+++ b/addons/multi_company/i18n/fr.po
@@ -8,41 +8,45 @@ 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-05-20 14:21+0000\n"
+"Last-Translator: Christophe Chauvet - http://www.syleam.fr/ <Unknown>\n"
 "Language-Team: French <fr@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-05-21 03:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: multi_company
 #: help:multi_company.default,object_id:0
 msgid "Object affect by this rules"
-msgstr ""
+msgstr "Objet affecté par cette règle"
 
 #. module: multi_company
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
+"Le nom de l'objet doit commencer par x_ et ne doit pas contenir de "
+"caractères spéciaux !"
 
 #. module: multi_company
 #: constraint:product.template:0
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
 msgstr ""
+"Erreur: l'unité de mesure par défaut et l'unité de mesure d'achat doivent "
+"faire partie de la même catégorie"
 
 #. module: multi_company
 #: constraint:res.partner:0
 msgid "The VAT doesn't seem to be correct."
-msgstr ""
+msgstr "La TVA ne semble pas correcte"
 
 #. module: multi_company
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nom de l'objet invalide dans l'action défini"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
@@ -59,18 +63,18 @@ msgstr ""
 #. module: multi_company
 #: field:multi_company.default,company_dest_id:0
 msgid "Default Company"
-msgstr ""
+msgstr "Société par défaut"
 
 #. module: multi_company
 #: field:multi_company.default,object_id:0
 msgid "Object"
-msgstr ""
+msgstr "Objet"
 
 #. module: multi_company
 #: model:ir.module.module,shortdesc:multi_company.module_meta_information
 #: view:multi_company.default:0
 msgid "Multi Company"
-msgstr ""
+msgstr "Multi société"
 
 #. module: multi_company
 #: model:ir.module.module,description:multi_company.module_meta_information
diff --git a/addons/stock/i18n/fr.po b/addons/stock/i18n/fr.po
index 9d0c7b40248..6b82ef00f96 100644
--- a/addons/stock/i18n/fr.po
+++ b/addons/stock/i18n/fr.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-03-25 14:13+0000\n"
-"Last-Translator: Numérigraphe <Unknown>\n"
+"PO-Revision-Date: 2010-05-20 06:22+0000\n"
+"Last-Translator: Olivier (Open ERP) <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 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-05-21 03:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
@@ -677,7 +677,7 @@ msgstr "Date d'envoi prévue"
 #. module: stock
 #: rml:stock.picking.list:0
 msgid "Shipping Address :"
-msgstr ""
+msgstr "Adresse de livraison"
 
 #. module: stock
 #: view:stock.tracking:0
@@ -1703,7 +1703,7 @@ msgstr "Magasin"
 #: selection:stock.move,state:0
 #: selection:stock.picking,state:0
 msgid "Done"
-msgstr "Terminer"
+msgstr "Terminé"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_locations_virtual