From cfb8d6627b27f28639f85946f123cd226a54bf8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Sat, 13 Dec 2008 00:06:46 +0100
Subject: [PATCH 1/2] Add missing id on xml tags

---
 account.xml    | 14 +++++++-------
 fiscalyear.xml | 10 +++++-----
 journal.xml    |  5 +++--
 move.xml       | 13 ++++++++-----
 party.xml      |  6 +++---
 tax.xml        | 24 ++++++++++++------------
 6 files changed, 38 insertions(+), 34 deletions(-)

diff --git a/account.xml b/account.xml
index e18d6cc862..0342845e68 100644
--- a/account.xml
+++ b/account.xml
@@ -425,11 +425,11 @@ this repository contains the full copyright notices and license terms. -->
                 <![CDATA[
                 <form string="Create Chart of Account" col="2">
                     <image name="tryton-dialog-information"/>
-                    <group col="1">
+                    <group col="1" id="labels">
                         <label string="You can now create a chart of account for your company"
-                            align="0.0"/>
+                            align="0.0" id="create"/>
                         <label string="by selecting a chart of account template."
-                            align="0.0"/>
+                            align="0.0" id="selecting"/>
                     </group>
                 </form>
                 ]]>
@@ -491,7 +491,7 @@ this repository contains the full copyright notices and license terms. -->
                     <label name="active"/>
                     <field name="active" xexpand="0" width="100"/>
                     <notebook colspan="6">
-                        <page string="General Information">
+                        <page string="General Information" id="general">
                             <label name="company"/>
                             <field name="company"/>
                             <label name="parent"/>
@@ -511,10 +511,10 @@ this repository contains the full copyright notices and license terms. -->
                             <separator name="taxes" colspan="4"/>
                             <field name="taxes" colspan="4"/>
                         </page>
-                        <page string="Deferrals">
+                        <page string="Deferrals" id="deferrals">
                             <field name="deferrals"/>
                         </page>
-                        <page string="Notes">
+                        <page string="Notes" id="notes">
                             <field name="note"/>
                         </page>
                     </notebook>
@@ -859,7 +859,7 @@ this repository contains the full copyright notices and license terms. -->
                         <field name="balance_type"/>
                         <label name="posted"/>
                         <field name="posted"/>
-                    <group string="Terms" colspan="2">
+                    <group string="Terms" colspan="2" id="terms">
                         <label name="term1"/>
                         <field name="term1"/>
                         <newline/>
diff --git a/fiscalyear.xml b/fiscalyear.xml
index 4abbdaa210..cc9c5ba4f7 100644
--- a/fiscalyear.xml
+++ b/fiscalyear.xml
@@ -24,9 +24,9 @@ this repository contains the full copyright notices and license terms. -->
                     <label name="state"/>
                     <field name="state"/>
                     <notebook colspan="4">
-                        <page string="Periods">
+                        <page string="Periods" id="periods">
                             <field name="periods" colspan="4"/>
-                            <group col="2" colspan="4">
+                            <group col="2" colspan="4" id="buttons">
                                 <button name="create_period" string="Create Monthly Periods"
                                     type="object"
                                     states="{'invisible': '''state != 'open' or periods '''}"/>
@@ -35,13 +35,13 @@ this repository contains the full copyright notices and license terms. -->
                                     states="{'invisible': '''state != 'open' or periods '''}"/>
                             </group>
                         </page>
-                        <page string="Sequences">
+                        <page string="Sequences" id="sequences">
                             <label name="post_move_sequence"/>
                             <field name="post_move_sequence"/>
                         </page>
                     </notebook>
-                    <label string="" colspan="2"/>
-                    <group col="1" colspan="2">
+                    <label string="" colspan="2" id="empty"/>
+                    <group col="1" colspan="2" id="buttons">
                         <button name="close" string="Close Fiscal Year" type="object"
                             states="{'invisible': '''state != 'open' '''}"
                             icon="tryton-readonly"
diff --git a/journal.xml b/journal.xml
index 84e4ddeb5a..15b30edb11 100644
--- a/journal.xml
+++ b/journal.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0"?>
-<!-- This file is part of Tryton.  The COPYRIGHT file at the top level of this repository contains the full copyright notices and license terms. -->
+<!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
 <tryton>
     <data>
         <menuitem name="Journals" parent="menu_account_configuration"
@@ -174,7 +175,7 @@
                     <label name="active"/>
                     <field name="active" xexpand="0" width="100"/>
                     <notebook colspan="6">
-                        <page string="General Information">
+                        <page string="General Information" id="general">
                             <label name="type"/>
                             <field name="type"/>
                             <label name="sequence"/>
diff --git a/move.xml b/move.xml
index a43d979ab8..8d163ff65e 100644
--- a/move.xml
+++ b/move.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0"?>
-<!-- This file is part of Tryton.  The COPYRIGHT file at the top level of this repository contains the full copyright notices and license terms. -->
+<!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
 <tryton>
     <data>
         <record model="ir.ui.view" id="move_view_form">
@@ -23,7 +24,7 @@
                     <field name="lines" colspan="4"/>
                     <label name="state"/>
                     <field name="state"/>
-                    <group col="2" colspan="2">
+                    <group col="2" colspan="2" id="buttons">
                         <button string="Post" name="button_post" type="object"
                             states="{'invisible': '''state == 'posted' '''}"/>
                         <button string="Draft" name="button_draft" type="object"
@@ -162,7 +163,7 @@
                     <label name="active"/>
                     <field name="active" xexpand="0" width="100"/>
                     <notebook colspan="4">
-                        <page string="General Information">
+                        <page string="General Information" id="general">
                             <label name="account"/>
                             <field name="account"/>
                             <label name="date"/>
@@ -179,7 +180,8 @@
                             <field name="debit"/>
                             <label name="credit"/>
                             <field name="credit"/>
-                            <separator string="Optional Information" colspan="4"/>
+                            <separator string="Optional Information" colspan="4"
+                                id="optional_information"/>
                             <field name="tax_lines" colspan="4"/>
                             <label name="amount_second_currency"/>
                             <field name="amount_second_currency"/>
@@ -336,7 +338,8 @@
                 <![CDATA[
                 <form string="Unreconcile" col="2">
                     <image name="tryton-dialog-information"/>
-                    <label string="If you unreconcile lines, the workflows, on those lines, will not be canceled."/>
+                    <label string="If you unreconcile lines, the workflows, on those lines, will not be canceled."
+                        id="workflows"/>
                 </form>
                 ]]>
             </field>
diff --git a/party.xml b/party.xml
index 21884cde32..4ed08a9b01 100644
--- a/party.xml
+++ b/party.xml
@@ -27,9 +27,9 @@ this repository contains the full copyright notices and license terms. -->
                 <![CDATA[
                 <data>
                     <xpath
-                        expr="/form/notebook/page[@string=&quot;Accounting&quot;]/field[@name=&quot;vat_number&quot;]"
+                        expr="/form/notebook/page[@id=&quot;accounting&quot;]/field[@name=&quot;vat_number&quot;]"
                         position="after">
-                        <separator string="Account" colspan="4"/>
+                        <separator string="Account" colspan="4" id="account"/>
                         <label name="account_payable"/>
                         <field name="account_payable"/>
                         <label name="account_receivable"/>
@@ -43,7 +43,7 @@ this repository contains the full copyright notices and license terms. -->
                         <field name="receivable"/>
                         <label name="payable"/>
                         <field name="payable"/>
-                        <separator string="Taxes" colspan="4"/>
+                        <separator string="Taxes" colspan="4" id="taxes"/>
                         <label name="vat"/>
                         <field name="vat"/>
                         <label name="supplier_vat"/>
diff --git a/tax.xml b/tax.xml
index 217a638b96..2b97465046 100644
--- a/tax.xml
+++ b/tax.xml
@@ -204,18 +204,18 @@ this repository contains the full copyright notices and license terms. -->
                     <field name="description" colspan="3"/>
                     <field name="parent" invisible="1" colspan="4"/>
                     <notebook colspan="4">
-                        <page string="General Information">
+                        <page string="General Information" id="general">
                             <label name="group"/>
                             <field name="group" widget="selection"/>
                             <label name="sequence"/>
                             <field name="sequence"/>
                             <label name="type"/>
                             <field name="type"/>
-                            <group col="1">
+                            <group col="1" id="label_amount_percentage">
                                 <label name="amount" fill="1" xexpand="1" expand="1"/>
                                 <label name="percentage" fill="1" xexpand="1" expand="1"/>
                             </group>
-                            <group col="1">
+                            <group col="1" id="amount_percentage">
                                 <field name="amount"/>
                                 <field name="percentage"/>
                             </group>
@@ -234,8 +234,8 @@ this repository contains the full copyright notices and license terms. -->
                                 </tree>
                             </field>
                         </page>
-                        <page string="Code">
-                            <separator string="Invoice" colspan="4"/>
+                        <page string="Code" id="code">
+                            <separator string="Invoice" colspan="4" id="invoice"/>
                             <label name="invoice_base_code"/>
                             <field name="invoice_base_code"/>
                             <label name="invoice_base_sign"/>
@@ -244,7 +244,7 @@ this repository contains the full copyright notices and license terms. -->
                             <field name="invoice_tax_code"/>
                             <label name="invoice_tax_sign"/>
                             <field name="invoice_tax_sign"/>
-                            <separator string="Credit Note" colspan="4"/>
+                            <separator string="Credit Note" colspan="4" id="credit_note"/>
                             <label name="credit_note_base_code"/>
                             <field name="credit_note_base_code"/>
                             <label name="credit_note_base_sign"/>
@@ -311,18 +311,18 @@ this repository contains the full copyright notices and license terms. -->
                     <field name="description" colspan="3"/>
                     <field name="parent" invisible="1" colspan="4"/>
                     <notebook colspan="4">
-                        <page string="General Information">
+                        <page string="General Information" id="general">
                             <label name="group"/>
                             <field name="group" widget="selection"/>
                             <label name="sequence"/>
                             <field name="sequence"/>
                             <label name="type"/>
                             <field name="type"/>
-                            <group col="1">
+                            <group col="1" id="label_amount_percentage">
                                 <label name="amount" fill="1" xexpand="1" expand="1"/>
                                 <label name="percentage" fill="1" xexpand="1" expand="1"/>
                             </group>
-                            <group col="1">
+                            <group col="1" id="amount_percentage">
                                 <field name="amount"/>
                                 <field name="percentage"/>
                             </group>
@@ -344,8 +344,8 @@ this repository contains the full copyright notices and license terms. -->
                                 </tree>
                             </field>
                         </page>
-                        <page string="Code">
-                            <separator string="Invoice" colspan="4"/>
+                        <page string="Code" id="code">
+                            <separator string="Invoice" colspan="4" id="invoice"/>
                             <label name="invoice_base_code"/>
                             <field name="invoice_base_code"/>
                             <label name="invoice_base_sign"/>
@@ -354,7 +354,7 @@ this repository contains the full copyright notices and license terms. -->
                             <field name="invoice_tax_code"/>
                             <label name="invoice_tax_sign"/>
                             <field name="invoice_tax_sign"/>
-                            <separator string="Credit Note" colspan="4"/>
+                            <separator string="Credit Note" colspan="4" id="credit_note"/>
                             <label name="credit_note_base_code"/>
                             <field name="credit_note_base_code"/>
                             <label name="credit_note_base_sign"/>

From 35d13904c6567e3b5ad9e0cb826aa8863c38daa3 Mon Sep 17 00:00:00 2001
From: Korbinian Preisler <timitos@virtual-things.biz>
Date: Sat, 13 Dec 2008 11:05:22 +0100
Subject: [PATCH 2/2] fix create_tax for child taxes for issue 668

---
 tax.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tax.py b/tax.py
index e31569bcb8..5d2339eb1e 100644
--- a/tax.py
+++ b/tax.py
@@ -472,7 +472,7 @@ class TaxTemplate(OSV):
         new_childs = []
         for child in template.childs:
             new_childs.append(self.create_tax(cursor, user, child,
-                template2tax_code, template2account, company_id,
+                company_id, template2tax_code, template2account, 
                 context=context, template2tax=template2tax, parent_id=new_id))
         return new_id