[MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons3

bzr revid: mtr@mtr-20110209052414-1fbdmtrp674bxegf
2011-02-09 10:54:14 +05:30
parent 9e95ff425c 4087891ac8
commit b40afe2c0d
4 changed files with 55 additions and 19 deletions
@@ -395,7 +395,7 @@ class account_account(osv.osv):
        'reconcile': False,
        'active': True,
        'currency_mode': 'current',
-        'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'account.account', context=c),
+        'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'account.account', context=c),
    }

    def _check_recursion(self, cr, uid, ids, context=None):
@@ -1121,9 +1121,8 @@ class account_move(osv.osv):
            res_ids = set(id[0] for id in cr.fetchall())
            ids = ids and (ids & res_ids) or res_ids
        if ids:
-            return [('id','in',tuple(ids))]
-        else:
-            return [('id', '=', '0')]
+            return [('id', 'in', tuple(ids))]
+        return [('id', '=', '0')]

    _columns = {
        'name': fields.char('Number', size=64, required=True),
@@ -1207,7 +1206,6 @@ class account_move(osv.osv):
                   'SET state=%s '\
                   'WHERE id IN %s',
                   ('posted', tuple(valid_moves),))
-
        return True

    def button_validate(self, cursor, user, ids, context=None):
@@ -1522,7 +1520,6 @@ class account_move_reconcile(osv.osv):
                result.append((r.id,r.name))
        return result

-
 account_move_reconcile()

 #----------------------------------------------------------
@@ -1834,7 +1831,6 @@ class account_tax(osv.osv):
        obj_partener_address = self.pool.get('res.partner.address')
        for tax in taxes:
            # we compute the amount for the current tax object and append it to the result
-
            data = {'id':tax.id,
                    'name':tax.description and tax.description + " - " + tax.name or tax.name,
                    'account_collected_id':tax.account_collected_id.id,
@@ -2049,6 +2045,7 @@ class account_tax(osv.osv):
                r['amount'] = round(r['amount'] * quantity, prec)
                total += r['amount']
        return res
+
 account_tax()

 # ---------------------------------------------------------
@@ -2177,13 +2174,11 @@ class account_subscription(osv.osv):
        'name': fields.char('Name', size=64, required=True),
        'ref': fields.char('Reference', size=16),
        'model_id': fields.many2one('account.model', 'Model', required=True),
-
        'date_start': fields.date('Start Date', required=True),
        'period_total': fields.integer('Number of Periods', required=True),
        'period_nbr': fields.integer('Period', required=True),
        'period_type': fields.selection([('day','days'),('month','month'),('year','year')], 'Period Type', required=True),
        'state': fields.selection([('draft','Draft'),('running','Running'),('done','Done')], 'State', required=True, readonly=True),
-
        'lines_id': fields.one2many('account.subscription.line', 'subscription_id', 'Subscription Lines')
    }
    _defaults = {
@@ -2354,9 +2349,9 @@ class account_add_tmpl_wizard(osv.osv_memory):
    _name = 'account.addtmpl.wizard'

    def _get_def_cparent(self, cr, uid, context=None):
-        acc_obj=self.pool.get('account.account')
-        tmpl_obj=self.pool.get('account.account.template')
-        tids=tmpl_obj.read(cr, uid, [context['tmpl_ids']], ['parent_id'])
+        acc_obj = self.pool.get('account.account')
+        tmpl_obj = self.pool.get('account.account.template')
+        tids = tmpl_obj.read(cr, uid, [context['tmpl_ids']], ['parent_id'])
        if not tids or not tids[0]['parent_id']:
            return False
        ptids = tmpl_obj.read(cr, uid, [tids[0]['parent_id'][0]], ['code'])
@@ -2364,7 +2359,6 @@ class account_add_tmpl_wizard(osv.osv_memory):
        if not ptids or not ptids[0]['code']:
            raise osv.except_osv(_('Error !'), _('Cannot locate parent code for template account!'))
            res = acc_obj.search(cr, uid, [('code','=',ptids[0]['code'])])
-
        return res and res[0] or False

    _columns = {
@@ -657,7 +657,9 @@ class account_invoice(osv.osv):
    def _convert_ref(self, cr, uid, ref):
        return (ref or '').replace('/','')

-    def _get_analytic_lines(self, cr, uid, id):
+    def _get_analytic_lines(self, cr, uid, id, context=None):
+        if context is None:
+            context = {}
        inv = self.browse(cr, uid, id)
        cur_obj = self.pool.get('res.currency')

@@ -667,7 +669,7 @@ class account_invoice(osv.osv):
        else:
            sign = -1

-        iml = self.pool.get('account.invoice.line').move_line_get(cr, uid, inv.id)
+        iml = self.pool.get('account.invoice.line').move_line_get(cr, uid, inv.id, context=context)
        for il in iml:
            if il['account_analytic_id']:
                if inv.type in ('in_invoice', 'in_refund'):
@@ -8,89 +8,106 @@
        <record id="analytic_absences" model="account.analytic.account">
            <field name="name">Leaves</field>
            <field name="code">1</field>
+            <field name="type">view</field>
            <field name="parent_id" ref="analytic_root"/>
        </record>
        <record id="analytic_internal" model="account.analytic.account">
            <field name="name">Internal</field>
            <field name="code">2</field>
+            <field name="type">view</field>
            <field name="parent_id" ref="analytic_root"/>
        </record>
        <record id="analytic_our_super_product" model="account.analytic.account">
            <field name="name">Our Super Product</field>
            <field name="code">100</field>
            <field name="state">open</field>
+            <field name="type">view</field>
            <field name="parent_id" ref="analytic_root"/>
        </record>
        <record id="analytic_project_1" model="account.analytic.account">
            <field name="name">Project 1</field>
            <field name="code">101</field>
+            <field name="type">view</field>
            <field name="parent_id" ref="analytic_root"/>
        </record>
        <record id="analytic_project_2" model="account.analytic.account">
            <field name="name">Project 2</field>
            <field name="code">102</field>
+            <field name="type">view</field>
            <field name="parent_id" ref="analytic_root"/>
        </record>
        <record id="analytic_journal_trainings" model="account.analytic.account">
            <field name="name">Training</field>
            <field name="code">4</field>
+            <field name="type">view</field>
            <field name="parent_id" ref="analytic_internal"/>
        </record>
        <record id="analytic_in_house" model="account.analytic.account">
            <field name="name">In House</field>
            <field name="code">1</field>
+            <field name="type">normal</field>
            <field name="parent_id" ref="analytic_journal_trainings"/>
        </record>
        <record id="analytic_online" model="account.analytic.account">
            <field name="name">Online</field>
            <field name="code">2</field>
+            <field name="type">normal</field>
            <field name="parent_id" ref="analytic_journal_trainings"/>
        </record>
        <record id="analytic_support" model="account.analytic.account">
            <field name="name">Support</field>
            <field name="code">support</field>
+            <field name="type">view</field>
            <field name="parent_id" ref="analytic_our_super_product"/>
        </record>
        <record id="analytic_partners" model="account.analytic.account">
            <field name="name">Partners</field>
            <field name="code">partners</field>
+            <field name="type">view</field>
            <field name="parent_id" ref="analytic_support"/>
        </record>
        <record id="analytic_customers" model="account.analytic.account">
            <field name="name">Customers</field>
            <field name="code">customers</field>
+            <field name="type">view</field>
            <field name="parent_id" ref="analytic_support"/>
        </record>
        <record id="analytic_support_internal" model="account.analytic.account">
            <field name="name">Internal</field>
            <field name="code">3</field>
+            <field name="type">normal</field>
            <field name="parent_id" ref="analytic_support"/>
        </record>
        <record id="analytic_integration" model="account.analytic.account">
            <field name="name">Integration</field>
            <field name="code">integration</field>
+            <field name="type">view</field>
            <field name="parent_id" ref="analytic_our_super_product"/>
        </record>
        <record id="analytic_consultancy" model="account.analytic.account">
            <field name="name">Consultancy</field>
            <field name="code">4</field>
+            <field name="type">normal</field>
            <field name="parent_id" ref="analytic_our_super_product"/>
        </record>
        <record id="analytic_super_product_trainings" model="account.analytic.account">
            <field name="name">Training</field>
            <field name="code">5</field>
+            <field name="type">normal</field>
            <field name="parent_id" ref="analytic_our_super_product"/>
        </record>
        <record id="analytic_seagate_p1" model="account.analytic.account">
            <field name="name">Seagate P1</field>
            <field name="code">1</field>
            <field name="parent_id" ref="analytic_integration"/>
+            <field name="type">normal</field>
            <field name="state">open</field>
            <field name="partner_id" ref="base.res_partner_seagate"/>
        </record>
        <record id="analytic_seagate_p2" model="account.analytic.account">
            <field name="name">Seagate P2</field>
            <field name="code">2</field>
+            <field name="type">normal</field>
            <field name="parent_id" ref="analytic_integration"/>
            <field name="state">open</field>
            <field name="partner_id" ref="base.res_partner_seagate"/>
@@ -99,11 +116,13 @@
            <field name="name">Magasin BML 1</field>
            <field name="code">3</field>
            <field name="parent_id" ref="analytic_integration"/>
+            <field name="type">normal</field>
            <field name="partner_id" ref="base.res_partner_15"/>
        </record>
        <record id="analytic_integration_c2c" model="account.analytic.account">
            <field name="name">CampToCamp</field>
            <field name="code">7</field>
+            <field name="type">normal</field>
            <field eval="str(time.localtime()[0] - 1) + '-08-07'" name="date_start"/>
            <field eval="time.strftime('%Y-12-31')" name="date"/>
            <field name="parent_id" ref="analytic_integration"/>
@@ -114,18 +133,21 @@
            <field name="name">Agrolait</field>
            <field name="code">3</field>
            <field name="parent_id" ref="analytic_customers"/>
+            <field name="type">normal</field>
            <field name="partner_id" ref="base.res_partner_agrolait"/>
        </record>
        <record id="analytic_asustek" model="account.analytic.account">
            <field name="name">Asustek</field>
            <field name="code">4</field>
-            <field name="parent_id" ref="analytic_customers"/>
+            <field name="type">normal</field>
+            <field name="parent_id" ref="analytic_customers"/>            
            <field name="partner_id" ref="base.res_partner_asus"/>
        </record>
        <record id="analytic_distripc" model="account.analytic.account">
            <field name="name">DistriPC</field>
            <field name="code">7</field>
            <field name="parent_id" ref="analytic_customers"/>
+            <field name="type">normal</field>
            <field name="partner_id" ref="base.res_partner_4"/>
        </record>
        <record id="analytic_sednacom" model="account.analytic.account">
@@ -134,6 +156,7 @@
            <field eval="str(time.localtime()[0] - 1) + '-05-09'" name="date_start"/>
            <field eval="time.strftime('%Y-05-08')" name="date"/>
            <field name="parent_id" ref="analytic_partners"/>
+            <field name="type">normal</field>
            <field name="partner_id" ref="base.res_partner_sednacom"/>
            <field name="state">open</field>
        </record>
@@ -142,6 +165,7 @@
            <field name="code">3</field>
            <field eval="time.strftime('%Y-02-01')" name="date_start"/>
            <field eval="time.strftime('%Y-07-01')" name="date"/>
+            <field name="type">normal</field>
            <field name="parent_id" ref="analytic_partners"/>
            <field name="partner_id" ref="base.res_partner_thymbra"/>
            <field name="state">open</field>
@@ -151,6 +175,7 @@
            <field name="code">10</field>
            <field eval="time.strftime('%Y-04-24')" name="date_start"/>
            <field eval="str(time.localtime()[0] + 1) + '-04-24'" name="date"/>
+            <field name="type">normal</field>
            <field name="parent_id" ref="analytic_partners"/>
            <field name="partner_id" ref="base.res_partner_11"/>
        </record>
@@ -159,12 +184,14 @@
            <field name="code">12</field>
            <field eval="time.strftime('%Y-02-01')" name="date_start"/>
            <field eval="str(time.localtime()[0] + 1) + '-02-01'" name="date"/>
+            <field name="type">normal</field>
            <field name="parent_id" ref="analytic_partners"/>
            <field name="partner_id" ref="base.res_partner_desertic_hispafuentes"/>
        </record>
        <record id="analytic_tiny_at_work" model="account.analytic.account">
            <field name="name">OpenERP SA AT Work</field>
            <field name="code">15</field>
+            <field name="type">normal</field>
            <field name="parent_id" ref="analytic_partners"/>
            <field name="partner_id" ref="base.res_partner_tinyatwork"/>
        </record>
@@ -173,6 +200,7 @@
            <field name="code">21</field>
            <field eval="time.strftime('%Y-%m-%d', time.localtime(time.time() - 365 * 86400))" name="date_start"/>
            <field eval="time.strftime('%Y-%m-%d')" name="date"/>
+            <field name="type">normal</field>
            <field name="parent_id" ref="analytic_partners"/>
            <field name="partner_id" ref="base.res_partner_c2c"/>
            <field name="state">open</field>
@@ -180,56 +208,67 @@
        <record id="analytic_project_2_support" model="account.analytic.account">
            <field name="name">Support</field>
            <field name="code">1</field>
+            <field name="type">normal</field>
            <field name="parent_id" ref="analytic_project_2"/>
        </record>
        <record id="analytic_project_2_development" model="account.analytic.account">
            <field name="name">Development</field>
            <field name="code">2</field>
+            <field name="type">normal</field>
            <field name="parent_id" ref="analytic_project_2"/>
        </record>
        <record id="analytic_project_1_trainings" model="account.analytic.account">
            <field name="name">Training</field>
            <field name="code">1</field>
+            <field name="type">normal</field>
            <field name="parent_id" ref="analytic_project_1"/>
        </record>
        <record id="analytic_project_1_development" model="account.analytic.account">
            <field name="name">Development</field>
            <field name="code">2</field>
+            <field name="type">normal</field>
            <field name="parent_id" ref="analytic_project_1"/>
        </record>
        <record id="analytic_administratif" model="account.analytic.account">
            <field name="name">Administrative</field>
            <field name="code">1</field>
+            <field name="type">normal</field>
            <field name="parent_id" ref="analytic_internal"/>
        </record>
        <record id="analytic_commercial_marketing" model="account.analytic.account">
            <field name="name">Commercial &amp; Marketing</field>
            <field name="code">2</field>
+            <field name="type">normal</field>
            <field name="parent_id" ref="analytic_internal"/>
        </record>
        <record id="analytic_our_super_product_development" model="account.analytic.account">
            <field name="name">Our Super Product Development</field>
            <field name="code">3</field>
+            <field name="type">view</field>
            <field name="parent_id" ref="analytic_internal"/>
        </record>
        <record id="analytic_stable" model="account.analytic.account">
            <field name="name">Stable</field>
            <field name="code">1</field>
+            <field name="type">normal</field>
            <field name="parent_id" ref="analytic_our_super_product_development"/>
        </record>
        <record id="analytic_trunk" model="account.analytic.account">
            <field name="name">Trunk</field>
            <field name="code">2</field>
+            <field name="type">normal</field>
            <field name="parent_id" ref="analytic_our_super_product_development"/>
        </record>
        <record id="analytic_paid" model="account.analytic.account">
            <field name="name">Paid</field>
            <field name="code">1</field>
+            <field name="type">normal</field>
            <field name="parent_id" ref="analytic_absences"/>
        </record>
        <record id="analytic_unpaid" model="account.analytic.account">
            <field name="name">Unpaid</field>
            <field name="code">2</field>
+            <field name="type">normal</field>
            <field name="parent_id" ref="analytic_absences"/>
        </record>
    </data>
@@ -55,19 +55,20 @@
            <field name="type">tree</field>
            <field name="field_parent">child_complete_ids</field>
            <field name="arch" type="xml">
-                <tree colors="red:(date&lt;current_date);black:(date&gt;=current_date);black:(date==False)" string="Analytic account" toolbar="1">
-                    <field name="name"/>
+                <tree colors="blue:type in ('view');red:(date&lt;current_date);black:(date&gt;=current_date);black:(date==False)" string="Analytic account" toolbar="1">
+                    <field name="name"/>                    
                    <field name="code"/>
                    <field name="quantity"/>
                    <field name="quantity_max"/>
                    <field name="debit"/>
                    <field name="credit"/>
                    <field name="balance"/>
-                    <field name="currency_id" groups="base.group_extended"/>
+                    <field name="currency_id" groups="base.group_extended"/>                    
                    <field name="date" invisible="1"/>
                    <field name="user_id" invisible="1"/>
                    <field name="partner_id" invisible="1"/>
                    <field name="parent_id" invisible="1"/>
+                    <field name="type"/>
                </tree>
            </field>
        </record>