clearcorp team mailing list archive

[Juan Felipe Muñoz Ramos <juan.munoz@xxxxxxxxxxxxxxx>]

Juan Felipe Muñoz Ramos has proposed merging lp:~juan-munoz-clearcorp/openerp-ccorp-addons/account_account_prefix_fixes into lp:openerp-ccorp-addons/6.1.

Requested reviews:
  CLEARCORP development team (clearcorp)

For more details, see:
https://code.launchpad.net/~juan-munoz-clearcorp/openerp-ccorp-addons/account_account_prefix_fixes/+merge/98920
-- 
https://code.launchpad.net/~juan-munoz-clearcorp/openerp-ccorp-addons/account_account_prefix_fixes/+merge/98920
Your team CLEARCORP development team is requested to review the proposed merge of lp:~juan-munoz-clearcorp/openerp-ccorp-addons/account_account_prefix_fixes into lp:openerp-ccorp-addons/6.1.

=== modified file 'account_account_rename/account_rename.py'
--- account_account_rename/account_rename.py	2012-03-22 17:39:54 +0000
+++ account_account_rename/account_rename.py	2012-03-22 20:35:22 +0000
@@ -44,6 +44,8 @@
 			return []
 		res = []
 		for obj_account in self.browse(cr,uid,ids):
+			obj_company = self.pool.get('res.company').browse(cr,uid,obj_account.company_id.id)
+			prefix= obj_company.prefix
 			data = []
 			account = obj_account.parent_id
 			if account.parent_id:
@@ -52,7 +54,7 @@
 					account = account.parent_id
 			data.append(obj_account.name)
 			data = '/'.join(data)
-			data = obj_account.code + ' ' + data
+			data = prefix + '-' + obj_account.code + ' ' + data
 			res.append((obj_account.id, data))  
 		return res
 	

=== renamed directory 'TODO-6.1/base_company_prefix' => 'base_company_prefix'
=== modified file 'base_company_prefix/base_company_prefix.xml'
--- TODO-6.1/base_company_prefix/base_company_prefix.xml	2011-08-18 21:13:13 +0000
+++ base_company_prefix/base_company_prefix.xml	2012-03-22 20:35:22 +0000
@@ -1,19 +1,36 @@
 <openerp>
 	<data>
 		
-		<record id="view_company_form" model="ir.ui.view">
+		<record id="base_company_prefix.view_company_form" model="ir.ui.view">
 			<field name="name">res.company.form</field>
 			<field name="model">res.company</field>
 			<field name="inherit_id" ref="base.view_company_form"/>
 			<field name="type">form</field>
 			<field name="arch" type="xml">
 				<form string="Company">
-					<group colspan="4" col="6">
-						<field name="prefix"/>
-					</group>
+                    
+                        <field name="prefix"/>
 				</form>
 			</field>
 		</record>
+        
+        
+        
+        <record id="base_company_prefix.view_company_tree" model="ir.ui.view">
+			<field name="name">res.company.tree</field>
+			<field name="model">res.company</field>
+			<field name="inherit_id" ref="base.view_company_tree"/>
+			<field name="type">tree</field>
+			<field name="arch" type="xml">
+				<tree>
+
+                        <field name="prefix"/>
+
+				</tree>
+			</field>
+		</record>
+        
+        
 		
 	</data>
 </openerp>