Odoo Addons (MOVED TO GITHUB)

Merge lp:~bstanciu/openobject-addons/trunk-dev into lp:openobject-addons

  1. trunk-dev
  2. Merge into trunk
Proposed by Bogdan Stanciu
Status: Merged
Merged at revision: 4443
Proposed branch: lp:~bstanciu/openobject-addons/trunk-dev
Merge into: lp:openobject-addons
Diff against target: 171 lines (+25/-5)
1 file modified
l10n_ch/sterchi_chart/account.xml (+25/-5)
To merge this branch: bzr merge lp:~bstanciu/openobject-addons/trunk-dev
Reviewer Review Type Date Requested Status
Nicolas Bessi - Camptocamp (community) Approve
Review via email: mp+47524@code.launchpad.net

Description of the change

[FIX] bug #707314

I added missing data and deleted one account type (closed) as it breaks in my view the logic (internal type has already a type closed) ans it was not used anyway.

To post a comment you must log in.
Revision history for this message
Nicolas Bessi - Camptocamp (nbessi-c2c-deactivatedaccount) wrote :

Hello,

I have merged your branch, it will be included in a branch I will propose today that will fix various problems.

Regards

Nicolas

review: Approve
Revision history for this message
Bogdan Stanciu (bstanciu) wrote :

On 28. 01. 11 08:42, Nicolas Bessi - Camptocamp wrote:
> Review: Approve
> Hello,
>
> I have merged your branch, it will be included in a branch I will propose today that will fix various problems.
>
> Regards
>
> Nicolas
 thank you!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'l10n_ch/sterchi_chart/account.xml'
2--- l10n_ch/sterchi_chart/account.xml 2011-01-14 12:42:37 +0000
3+++ l10n_ch/sterchi_chart/account.xml 2011-01-26 13:10:17 +0000
4@@ -10,26 +10,31 @@
5 <field name="name">Bilan : Liquidites et titres</field>
6 <field name="code">cash</field>
7 <field name="close_method">balance</field>
8+ <field name="report_type">asset</field>
9 </record>
10 <record model="account.account.type" id="account_type_adjusting_asset">
11 <field name="name">Bilan : Actif de regularisation</field>
12 <field name="code">adjusting_asset</field>
13 <field name="close_method">balance</field>
14+ <field name="report_type">asset</field>
15 </record>
16 <record model="account.account.type" id="account_type_equity">
17 <field name="name">Bilan : Capitaux propres</field>
18 <field name="code">equity</field>
19 <field name="close_method">balance</field>
20+ <field name="report_type">liability</field>
21 </record>
22 <record model="account.account.type" id="account_type_income">
23 <field name="name">PP : Chiffre d'affaires</field>
24 <field name="code">income</field>
25 <field name="close_method">none</field>
26+ <field name="report_type">income</field>
27 </record>
28 <record model="account.account.type" id="account_type_adj_liability">
29 <field name="name">Bilan : Passifs de regularisation</field>
30 <field name="code">adj_liability</field>
31 <field name="close_method">balance</field>
32+ <field name="report_type">liability</field>
33 </record>
34 <record model="account.account.type" id="account_type_closing">
35 <field name="name">Autre : Cloture</field>
36@@ -40,103 +45,123 @@
37 <field name="name">PP : Amortissement</field>
38 <field name="code">depreciation</field>
39 <field name="close_method">none</field>
40+ <field name="report_type">expense</field>
41 </record>
42 <record model="account.account.type" id="account_type_financial_result">
43 <field name="name">PP : Resultat financier</field>
44 <field name="code">financial_result</field>
45 <field name="close_method">none</field>
46+ <field name="report_type">income</field>
47 </record>
48 <record model="account.account.type" id="account_type_financial_asset">
49 <field name="name">Bilan : Immobilisations financieres</field>
50 <field name="code">financial_asset</field>
51 <field name="close_method">balance</field>
52+ <field name="report_type">asset</field>
53 </record>
54 <record model="account.account.type" id="account_type_building_asset">
55 <field name="name">Bilan : Immo corporelles immobilieres</field>
56 <field name="code">building_asset</field>
57 <field name="close_method">balance</field>
58+ <field name="report_type">asset</field>
59 </record>
60 <record model="account.account.type" id="account_type_non_ope_asset">
61 <field name="name">Bilan : Actifs hors exploitation</field>
62 <field name="code">non_ope_asset</field>
63 <field name="close_method">balance</field>
64+ <field name="report_type">asset</field>
65 </record>
66 <record model="account.account.type" id="account_type_other_ope_exp">
67 <field name="name">PP : Autres charges d'exploitation</field>
68 <field name="code">other_ope_expense</field>
69 <field name="close_method">none</field>
70+ <field name="report_type">expense</field>
71 </record>
72 <record model="account.account.type" id="account_type_non_ope_debts">
73 <field name="name">Bilan : Dettes hors exploitation</field>
74 <field name="code">non_ope_debts</field>
75 <field name="close_method">balance</field>
76+ <field name="report_type">liability</field>
77 </record>
78 <record model="account.account.type" id="account_type_fixed_asset">
79 <field name="name">Bilan : Immo corporelles mobilieres</field>
80 <field name="code">fixed_asset</field>
81 <field name="close_method">balance</field>
82+ <field name="report_type">asset</field>
83 </record>
84 <record model="account.account.type" id="account_type_intangible_asset">
85 <field name="name">Bilan : Immo incorporelles</field>
86 <field name="code">intangible_asset</field>
87 <field name="close_method">balance</field>
88+ <field name="report_type">asset</field>
89 </record>
90 <record model="account.account.type" id="account_type_inventory">
91 <field name="name">Bilan : Stocks</field>
92 <field name="code">inventory</field>
93 <field name="close_method">balance</field>
94+ <field name="report_type">asset</field>
95 </record>
96 <record model="account.account.type" id="account_type_lt_liability">
97 <field name="name">Bilan : Dettes à LT</field>
98 <field name="code">lt_liability</field>
99 <field name="close_method">balance</field>
100+ <field name="report_type">liability</field>
101 </record>
102 <record model="account.account.type" id="account_type_non_ope_result">
103 <field name="name">PP : Resultat activites annexes</field>
104 <field name="code">non_oper_result</field>
105 <field name="close_method">none</field>
106+ <field name="report_type">income</field>
107 </record>
108 <record model="account.account.type" id="account_type_other_payable">
109 <field name="name">Bilan : Autres creanciers à CT</field>
110 <field name="code">other_payable</field>
111 <field name="close_method">balance</field>
112+ <field name="report_type">liability</field>
113 </record>
114 <record model="account.account.type" id="account_type_other_receivable">
115 <field name="name">Bilan : Autres créances</field>
116 <field name="code">other_receivable</field>
117 <field name="close_method">balance</field>
118+ <field name="report_type">asset</field>
119 </record>
120 <record model="account.account.type" id="account_type_personnal_exp">
121 <field name="name">PP : Charge de personnel</field>
122 <field name="code">personnal_exp</field>
123 <field name="close_method">none</field>
124+ <field name="report_type">expense</field>
125 </record>
126 <record model="account.account.type" id="account_type_prov_reserve">
127 <field name="name">Bilan : Provisions et reserves</field>
128 <field name="code">provision_reserve</field>
129 <field name="close_method">balance</field>
130+ <field name="report_type">liability</field>
131 </record>
132 <record model="account.account.type" id="account_type_purchase">
133 <field name="name">PP : Achat de marchandise</field>
134 <field name="code">purchase</field>
135 <field name="close_method">none</field>
136+ <field name="report_type">expense</field>
137 </record>
138 <record model="account.account.type" id="account_type_report_result">
139 <field name="name">Bilan : Resultat reporte</field>
140 <field name="code">report_result</field>
141 <field name="close_method">balance</field>
142+ <field name="report_type">liability</field>
143 </record>
144 <record model="account.account.type" id="account_type_receivable">
145 <field name="name">Bilan : Debiteurs</field>
146 <field name="code">receivable</field>
147 <field name="partner_account">True</field>
148 <field name="close_method">unreconciled</field>
149+ <field name="report_type">asset</field>
150 </record>
151 <record model="account.account.type" id="account_type_payable">
152 <field name="name">Bilan : Fournisseurs</field>
153 <field name="code">payable</field>
154 <field name="partner_account">True</field>
155 <field name="close_method">unreconciled</field>
156+ <field name="report_type">liability</field>
157 </record>
158 <record model="account.account.type" id="account_type_consolidation">
159 <field name="name">Autre : Consolidation</field>
160@@ -148,11 +173,6 @@
161 <field name="code">other</field>
162 <field name="close_method">none</field>
163 </record>
164- <record model="account.account.type" id="account_type_closed">
165- <field name="name">Autre : Closed</field>
166- <field name="code">closed</field>
167- <field name="close_method">none</field>
168- </record>
169 <record id="ch_minimal_0" model="account.account.template">
170 <field name="name">Plan comptable</field>
171 <field name="code">0</field>

Subscribers

People subscribed via source and target branches

to all changes: