clearcorp team mailing list archive

[Ronald Rubi <ronald.rubi@xxxxxxxxxxxxxxx>]

Ronald Rubi has proposed merging lp:~rr.clearcorp/openerp-ccorp-addons/6.1-rent-view into lp:openerp-ccorp-addons/6.1.

Requested reviews:
  CLEARCORP drivers (clearcorp-drivers)

For more details, see:
https://code.launchpad.net/~rr.clearcorp/openerp-ccorp-addons/6.1-rent-view/+merge/152719

Add description in account_invoice
-- 
https://code.launchpad.net/~rr.clearcorp/openerp-ccorp-addons/6.1-rent-view/+merge/152719
Your team CLEARCORP development team is subscribed to branch lp:openerp-ccorp-addons/6.1.

=== modified file 'rent/rent.py'
--- rent/rent.py	2012-11-07 23:02:15 +0000
+++ rent/rent.py	2013-03-11 16:34:22 +0000
@@ -911,7 +911,7 @@
         company_id = (type == 'rent' and obj_rent.company_id.id or (obj_rent.rent_main_company_id and obj_rent.rent_main_company_id.id or False))
         
         inv = {
-            'name': desc or obj_rent.name,
+            'description': desc or obj_rent.name,
             'reference': obj_rent.name or desc,
             'account_id': a,
             'type': 'out_invoice',
@@ -1102,7 +1102,7 @@
         a = obj_rent.rent_inv_water_account_id.id or obj_rent.rent_inv_account_id.id
         
         inv.update({
-            'name': desc or obj_rent.name,
+            'description': desc or obj_rent.name,
         #    'account_id': a,
             'currency_id': currency,
             'invoice_line': il,
@@ -1781,6 +1781,12 @@
         #'log_rent' : fields.many2one('rent.rent','Rent Ref'),
     }
 
+class account_invoice(osv.osv):
+    _inherit = 'account.invoice'
+    _columns = {
+        'description': fields.char('Description', size=64, select=True, readonly=True, states={'draft':[('readonly',False)]}),
+    }
+    
 class rent_contract(osv.osv):
     _name = 'rent.contract'
     

=== modified file 'rent/rent_view.xml'
--- rent/rent_view.xml	2012-11-07 22:56:22 +0000
+++ rent/rent_view.xml	2013-03-11 16:34:22 +0000
@@ -1216,6 +1216,21 @@
                 </tree>
             </field>
         </record>
+        
+        <record model = "ir.ui.view" id = "rent_invoice_form_view">
+            <field name = "name">rent.invoice.supplier.form</field>
+            <field name = "model">account.invoice</field>
+            <field name = "type">form</field>
+            <field name = "inherit_id" ref = "account.invoice_supplier_form"/>
+            <field name = "arch" type="xml">
+                <data>
+                    <field name="date_invoice" position="before">
+                        <field name = "description" />
+                    </field>
+                </data>
+            </field>
+        </record>
+        
         <!--
         ======================================
                     CONTRACTS