Odoo Addons (MOVED TO GITHUB)

Merge lp:~openerp-community/openobject-addons/fix-819242 into lp:openobject-addons/6.0

  1. fix-819242
  2. Merge into 6.0
Proposed by Niels Huylebroeck
Status: Needs review
Proposed branch: lp:~openerp-community/openobject-addons/fix-819242
Merge into: lp:openobject-addons/6.0
Diff against target: 30 lines (+3/-3)
1 file modified
account/account_view.xml (+3/-3)
To merge this branch: bzr merge lp:~openerp-community/openobject-addons/fix-819242
Reviewer Review Type Date Requested Status
Mustufa Rangwala (Open ERP) (community) Approve
qdp (OpenERP) Pending
Review via email: mp+70010@code.launchpad.net
To post a comment you must log in.
Revision history for this message
VO (ovailly) wrote :

Bonjour,

je suis en congés jusqu'au mardi 16 août 2011.

Pour une urgence veuillez adresser votre demande sur les deux
boites Email suivantes :

<email address hidden>
<email address hidden>

Merci

Olivier vailly

Reply
lp:~openerp-community/openobject-addons/fix-819242 updated
4741. By Niels Huylebroeck

Fix more of the same issues (base.group_analytic_accounting)

Revision history for this message
Mustufa Rangwala (Open ERP) (mra-tinyerp) :
review: Approve
Reply

Unmerged revisions

4741. By Niels Huylebroeck

Fix more of the same issues (base.group_analytic_accounting)

4740. By Niels Huylebroeck

Fix wrong group usage on notebook page in account.move.line form view

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'account/account_view.xml'
--- account/account_view.xml 2011-07-01 08:55:01 +0000
+++ account/account_view.xml 2011-08-01 13:51:36 +0000
@@ -1114,7 +1114,7 @@
1114 <separator string="Narration" colspan="4"/>1114 <separator string="Narration" colspan="4"/>
1115 <field name="narration" colspan="4" nolabel="1"/>1115 <field name="narration" colspan="4" nolabel="1"/>
1116 </page>1116 </page>
1117 <page string="Analytic Lines" groups="base.group_analytic_accounting">1117 <page string="Analytic Lines" groups="analytic.group_analytic_accounting">
1118 <field colspan="4" name="analytic_lines" nolabel="1" context="{'default_general_account_id':account_id, 'default_name': name, 'default_date':date, 'amount': (debit or 0.0)-(credit or 0.0)}"/>1118 <field colspan="4" name="analytic_lines" nolabel="1" context="{'default_general_account_id':account_id, 'default_name': name, 'default_date':date, 'amount': (debit or 0.0)-(credit or 0.0)}"/>
1119 </page>1119 </page>
1120 </notebook>1120 </notebook>
@@ -1161,7 +1161,7 @@
1161 <field name="reconcile_partial_id"/>1161 <field name="reconcile_partial_id"/>
1162 <field name="state"/>1162 <field name="state"/>
1163 </page>1163 </page>
1164 <page string="Analytic Lines" groups="base.group_analytic_accounting">1164 <page string="Analytic Lines" groups="analytic.group_analytic_accounting">
1165 <field colspan="4" name="analytic_lines" nolabel="1" />1165 <field colspan="4" name="analytic_lines" nolabel="1" />
1166 </page>1166 </page>
1167 </notebook>1167 </notebook>
@@ -1409,7 +1409,7 @@
1409 <separator string="Narration" colspan="4"/>1409 <separator string="Narration" colspan="4"/>
1410 <field name="narration" colspan="4" nolabel="1"/>1410 <field name="narration" colspan="4" nolabel="1"/>
1411 </page>1411 </page>
1412 <page string="Analytic Lines" groups="base.group_analytic_accounting">1412 <page string="Analytic Lines" groups="analytic.group_analytic_accounting">
1413 <field colspan="4" name="analytic_lines" nolabel="1" context="{'default_general_account_id':account_id, 'default_name': name, 'default_date':date, 'amount': (debit or 0.0)-(credit or 0.0)}"/>1413 <field colspan="4" name="analytic_lines" nolabel="1" context="{'default_general_account_id':account_id, 'default_name': name, 'default_date':date, 'amount': (debit or 0.0)-(credit or 0.0)}"/>
1414 </page>1414 </page>
1415 </notebook>1415 </notebook>