[FIX] stock delivery form, invoice_state declared twice

bzr revid: al@openerp.com-20101005231023-mqnlce7x4ldbbqua

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index a7ef71c..84670ab 100644 (file)
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -913,7 +913,6 @@
                         </page>
                         <page string="Additional info" groups="base.group_extended,base.group_multi_company">
                             <field name="auto_picking" groups="base.group_extended"/>
-                            <field name="invoice_state" groups="base.group_extended"/>
                             <field name="date_done" groups="base.group_extended"/>
                             <field name="move_type" groups="base.group_extended"/>
                             <field name="type" groups="base.group_extended"/>

diff --git a/addons/test.txt b/addons/test.txt
deleted file mode 100644 (file)
index 55e60eb..0000000
--- a/addons/test.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-this is a test file: 
--------------------
-the purpose is to test the buidlbot engine
-
-how to do?
-we simply gonna make several commit in a local branch, and also several commits in the main branch, then merge and see what happens
-
-iii

diff --git a/addons/test2.text b/addons/test2.text
deleted file mode 100644 (file)
index 535d2b0..0000000
--- a/addons/test2.text
+++ /dev/null
@@ -1,8 +0,0 @@
-1
-2
-3
-4
-5
-6
-7
-8