clearcorp team mailing list archive

[Diana Rodríguez Martínez <diana.rodriguez@xxxxxxxxxxxxxxx>]

Diana Rodríguez Martínez has proposed merging lp:~dr.clearcorp/openerp-ccorp-addons/6.1-rent_rent into lp:openerp-ccorp-addons.

Requested reviews:
  CLEARCORP drivers (clearcorp-drivers)

For more details, see:
https://code.launchpad.net/~dr.clearcorp/openerp-ccorp-addons/6.1-rent_rent/+merge/133375

[ADD] Add journal_id to rent module.
-- 
https://code.launchpad.net/~dr.clearcorp/openerp-ccorp-addons/6.1-rent_rent/+merge/133375
Your team CLEARCORP development team is subscribed to branch lp:openerp-ccorp-addons.

=== modified file 'rent/rent.py'
--- rent/rent.py	2012-11-01 18:54:32 +0000
+++ rent/rent.py	2012-11-07 22:58:20 +0000
@@ -919,7 +919,7 @@
             'currency_id': (type == 'rent' and obj_rent.currency_id.id or obj_rent.main_currency_id.id),
             'address_invoice_id': obj_client.address[0].id,
             'address_contact_id': obj_client.address[0].id,
-            'journal_id': len(journal_ids) and journal_ids[0] or False,
+            #'journal_id': len(journal_ids) and journal_ids[0] or False,
             'origin': obj_rent.name or desc,
             'invoice_line': il,
             'fiscal_position': obj_client.property_account_position.id,
@@ -928,6 +928,7 @@
             'date_invoice' : inv_date or today,
             'date_due' : date_due,
             'period_id' : period_id or False,
+            'journal_id': obj_rent.journal_id.id or False,
         }
         inv_id = self.pool.get('account.invoice').create(cr, uid, inv, {'type':'out_invoice'})
         self.pool.get('account.invoice').button_compute(cr, uid, [inv_id], {'type':'out_invoice'}, set_total=True)
@@ -1433,8 +1434,9 @@
         return {'value' : res}
     
     _columns = {
+        'journal_id'            :fields.many2one('account.journal', 'Journal',required=True,states={'finished':[('readonly',True)]}),
         'name'                  : fields.char('Name',size=64,required=True,states={'finished':[('readonly',True)]}),
-        'ref'                  : fields.char('Reference',size=64,states={'finished':[('readonly',True)]}),
+        'ref'                   : fields.char('Reference',size=64,states={'finished':[('readonly',True)]}),
         'rent_rent_client_id'   : fields.many2one('res.partner','Client', required=True, states={'finished':[('readonly',True)]}),
         'rent_end_date'         : fields.date('Ending Date', required=True, states={'finished':[('readonly',True)]}),
         'rent_ending_motif'     : fields.selection([('early','Early Return'),('expiration','Contract Expiration'),('eviction','No payment eviction'), ('others','Various problems with tenant')],'Ending Motif'),

=== modified file 'rent/rent_view.xml'
--- rent/rent_view.xml	2012-10-18 18:38:14 +0000
+++ rent/rent_view.xml	2012-11-07 22:58:20 +0000
@@ -751,6 +751,7 @@
                         <group colspan = "2" col = "6">
                             <field name = "rent_main_inc"/>
                             <field name = "company_id"/>
+                            <field name = "journal_id"/>
                         </group>
                     </group>
                     <notebook>