openerp-dev-web team mailing list archive

Thread
Date

[Merge] lp:~openerp-commiter/openobject-addons/trunk-dev-addons3-ara into lp:~openerp-dev/openobject-addons/trunk-dev-addons3

To: mp+48884@xxxxxxxxxxxxxxxxxx
From: "Ashvin Rathod \(OpenERP\)" <ara@xxxxxxxxxxx>
Date: Tue, 08 Feb 2011 09:06:05 -0000
Reply-to: mp+48884@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

Ashvin Rathod (OpenERP) has proposed merging lp:~openerp-commiter/openobject-addons/trunk-dev-addons3-ara into lp:~openerp-dev/openobject-addons/trunk-dev-addons3.

Requested reviews:
  OpenERP R&D Team (openerp-dev)
Related bugs:
  #615522 Report Of Invoice  : Payment Term + Due date not printed
  https://bugs.launchpad.net/bugs/615522
  #649029 [sale] incoterm field poorly implemented [direct sql / not translatable]
  https://bugs.launchpad.net/bugs/649029
  #656378 [trunk] general ledger -
  https://bugs.launchpad.net/bugs/656378
  #672553 opening entries from chart of account doesn't use context
  https://bugs.launchpad.net/bugs/672553
  #674480 [6.0 RC2] incorrect creation of Accounting Journals is some localizations prevents multiple charts from being installed
  https://bugs.launchpad.net/bugs/674480
  #675494 [Trunk] - If you delete an invoice entry, invoice still exists
  https://bugs.launchpad.net/bugs/675494
  #681398 sale access right
  https://bugs.launchpad.net/bugs/681398
  #689536 [6.0] partner layout salesman/salesteam issue
  https://bugs.launchpad.net/bugs/689536
  #690326 [6.0RC1] View mode "tree,form,search" in several window actions
  https://bugs.launchpad.net/bugs/690326
  #690753 [6.0] and [5.x] account_analytic_line must not be deleted if the journal etc is deleted
  https://bugs.launchpad.net/bugs/690753
  #691072 [6.0RC1][TRUNK][account_voucher] Wrong definition of field 'company_id' in 'account_voucher_line' object
  https://bugs.launchpad.net/bugs/691072
  #692986 [6.0] hr_payroll_account hr_payroll_account_view.xml - required fields block opening form
  https://bugs.launchpad.net/bugs/692986
  #694833 Salary Structure deduction percentage limitation
  https://bugs.launchpad.net/bugs/694833
  #695960 [6.0RC1][hr_timesheet]Problems printing timesheet reports
  https://bugs.launchpad.net/bugs/695960
  #696914 [6.0 RC2] account bank statement - usability
  https://bugs.launchpad.net/bugs/696914
  #697673 Wrong column title in timesheet view
  https://bugs.launchpad.net/bugs/697673
  #697989 Failed to install module multi_company
  https://bugs.launchpad.net/bugs/697989
  #701410 shouldn't see employee's categories in simplify view
  https://bugs.launchpad.net/bugs/701410
  #701683 [6.0 rc2] Setup/upgrade/run fails for init:module account_analytic_plans
  https://bugs.launchpad.net/bugs/701683
  #702318 Default period and account in invoices line for multi-company doesn't work
  https://bugs.launchpad.net/bugs/702318
  #705675 Error creating a DTA
  https://bugs.launchpad.net/bugs/705675
  #707398 [6.0] Account_payment: "Select Invoices to Pay" button on payment order not working
  https://bugs.launchpad.net/bugs/707398
  #707404 [trunk][account] useless variable in button_confirm_bank
  https://bugs.launchpad.net/bugs/707404
  #711886 [6.0 trunk] account : period selection not working for BS and PL legal reports 
  https://bugs.launchpad.net/bugs/711886
  #713562 [6.0] account - demo data - all periods have "special = true"
  https://bugs.launchpad.net/bugs/713562
  #714860 analytic account - Wrong demo data and account type must be come in tree view
  https://bugs.launchpad.net/bugs/714860

For more details, see:
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-dev-addons3-ara/+merge/48884

Hello,

[Fix]: analytic account - Wrong demo data and account type must be come in tree view
       https://bugs.launchpad.net/openobject-addons/+bug/714860

Thanks,
ara
-- 
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-dev-addons3-ara/+merge/48884
Your team OpenERP R&D Team is requested to review the proposed merge of lp:~openerp-commiter/openobject-addons/trunk-dev-addons3-ara into lp:~openerp-dev/openobject-addons/trunk-dev-addons3.

=== modified file 'account/project/analytic_account_demo.xml'
--- account/project/analytic_account_demo.xml	2011-01-14 00:11:01 +0000
+++ account/project/analytic_account_demo.xml	2011-02-08 09:04:19 +0000
@@ -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>

=== modified file 'account/project/project_view.xml'
--- account/project/project_view.xml	2011-02-01 12:53:45 +0000
+++ account/project/project_view.xml	2011-02-08 09:04:19 +0000
@@ -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>

Follow ups

[Merge] lp:~openerp-commiter/openobject-addons/trunk-dev-addons3-ara into lp:~openerp-dev/openobject-addons/trunk-dev-addons3
From: noreply, 2011-02-08