[MERGE] Merged with lp:addons

bzr revid: ron@tinyerp.com-20111128070830-gjqqiuhhrpwcqc38

14 files changed, 47 insertions, 32 deletions

diff --git a/addons/document/board_document_view.xml b/addons/document/board_document_view.xml
index 8d80b4a1497..471b2966be5 100644
--- a/addons/document/board_document_view.xml
+++ b/addons/document/board_document_view.xml
@@ -7,30 +7,25 @@
              <field name="type">form</field>
              <field name="arch" type="xml">
                 <form string="Document board">
-                     <hpaned position="100">
-                        <child1>
-                            <action
-                                string="New Files"
+                     <board style="1-1" >
+                        <column>
+                            <action string="New Files"
                                 name="%(document.action_view_all_document_tree1)d"
                                 view_mode="tree,form"/>
-                            <action
-                                string="File Size by Month"
+                            <action string="File Size by Month"
                                 name="%(document.action_view_size_month)d"
                                 view_mode="graph,tree"/>
-                        </child1>
-                        <child2>
-                            <action
-                                string="Files by Resource Type"
+                        </column>
+                        <column>
+                            <action string="Files by Resource Type"
                                 name="%(document.action_view_document_by_resourcetype_graph)d"
-                                view_mode="graph,tree"
-                                />
+                                view_mode="graph,tree"/>
 
-                            <action
-                                string="Files by Partner"
+                            <action string="Files by Partner"
                                 name="%(document.action_view_files_by_partner)d"
                                 view_mode="graph,tree"/>
-                        </child2>
-                     </hpaned>
+                        </column>
+                     </board>
                  </form>
              </field>
          </record>
@@ -70,26 +65,23 @@
              <field name="type">form</field>
              <field name="arch" type="xml">
                 <form string="Document board">
-                     <hpaned position="100">
-                        <child1>
-                            <action
-                                string="Wall of Shame"
+                     <board style="1-1">
+                        <column>
+                            <action string="Wall of Shame"
                                 name="%(document.action_view_wall)d"
                                 view_mode="tree"/>
 
-                        </child1>
-                        <child2>
-                            <action
-                                string="Files by Users"
+                        </column>
+                        <column>
+                            <action string="Files by Users"
                                 name="%(document.action_view_user_graph)d"
                                 view_mode="graph,tree"/>
 
-                            <action
-                                string="Files by Month"
+                            <action string="Files by Month"
                                 name="%(document.action_view_files_by_month_graph)d"
                                 view_mode="graph,tree"/>
-                        </child2>
-                     </hpaned>
+                        </column>
+                     </board>
                  </form>
             </field>
         </record>
diff --git a/addons/document/dict_tools.py b/addons/document/dict_tools.py
index 10d2fdc69f3..e117b429f83 100644
--- a/addons/document/dict_tools.py
+++ b/addons/document/dict_tools.py
@@ -55,3 +55,5 @@ def dict_filter(srcdic, keys, res=None):
     return res
 
 #eof
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document/directory_content.py b/addons/document/directory_content.py
index e690e50d4b4..5b8ec3ddd93 100644
--- a/addons/document/directory_content.py
+++ b/addons/document/directory_content.py
@@ -120,4 +120,5 @@ class document_directory_content(osv.osv):
         return pdf
 document_directory_content()
 
-#eof
\ No newline at end of file
+#eof
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document/directory_report.py b/addons/document/directory_report.py
index 2726fcd5462..202725a1d3f 100644
--- a/addons/document/directory_report.py
+++ b/addons/document/directory_report.py
@@ -60,3 +60,5 @@ class ir_action_report_xml(osv.osv):
     }
 
 ir_action_report_xml()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document/document.py b/addons/document/document.py
index 774c4e53a80..1bf177f50e6 100644
--- a/addons/document/document.py
+++ b/addons/document/document.py
@@ -349,3 +349,5 @@ class document_file(osv.osv):
 
 document_file()
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document/document_directory.py b/addons/document/document_directory.py
index 2a3f54f53ba..d09d2cc86d5 100644
--- a/addons/document/document_directory.py
+++ b/addons/document/document_directory.py
@@ -307,3 +307,5 @@ class document_directory_node(osv.osv):
         'directory_id':  fields.many2one('document.directory', 'Document directory', ondelete="set null"),
     }
 document_directory_node()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document/document_storage.py b/addons/document/document_storage.py
index b61b7fd65fc..fe757e7876d 100644
--- a/addons/document/document_storage.py
+++ b/addons/document/document_storage.py
@@ -786,3 +786,5 @@ document_storage()
 
 
 #eof
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index 7564dfc938e..05e49ae89ad 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -372,7 +372,6 @@
         <field name="model" eval="'document.directory'"/>
         <field name="name">Browse Files</field>
         <field name="value" eval="'ir.actions.act_window,%d'%action_document_file_directory_form"/>
-        <field name="object" eval="True"/>
     </record>
 
     <record model="ir.ui.view" id="view_attachment_form_inherit">
@@ -414,6 +413,7 @@
     </record>
 
     <act_window domain="[('partner_id', '=', active_id)]"
+        context="{'default_partner_id': active_id}"
         id="act_res_partner_document" name="Related Documents"
         res_model="ir.attachment"
         src_model="res.partner"
@@ -421,6 +421,7 @@
 
     <act_window
         domain="[('parent_id', '=', active_id)]"
+        context="{'default_parent_id': active_id}"
     	id="zoom_directory" name="Related Documents"
         res_model="ir.attachment"
         src_model="document.directory"/>
diff --git a/addons/document/nodes.py b/addons/document/nodes.py
index 0c4194847c1..ee89f3d4c6c 100644
--- a/addons/document/nodes.py
+++ b/addons/document/nodes.py
@@ -1557,4 +1557,5 @@ class nodefd_static(StringIO, node_descriptor):
             cr.close()
         StringIO.close(self)
 
-#eof
\ No newline at end of file
+#eof
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document/report/__init__.py b/addons/document/report/__init__.py
index bfdeacdaae8..f5b827f04b0 100644
--- a/addons/document/report/__init__.py
+++ b/addons/document/report/__init__.py
@@ -18,4 +18,6 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-import document_report
\ No newline at end of file
+import document_report
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document/std_index.py b/addons/document/std_index.py
index 4f939aab4df..fe42cfb1795 100644
--- a/addons/document/std_index.py
+++ b/addons/document/std_index.py
@@ -209,3 +209,5 @@ cntIndex.register(OpenDoc())
 
 
 #eof
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document/test_cindex.py b/addons/document/test_cindex.py
index 05101a7a491..a257c2c43a5 100755
--- a/addons/document/test_cindex.py
+++ b/addons/document/test_cindex.py
@@ -51,3 +51,5 @@ for fname in args:
         print "Keyboard interrupt"
 
 #eof
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document/wizard/__init__.py b/addons/document/wizard/__init__.py
index b143b583426..c4decc58fba 100644
--- a/addons/document/wizard/__init__.py
+++ b/addons/document/wizard/__init__.py
@@ -19,3 +19,5 @@
 #
 ##############################################################################
 import document_configuration
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document/wizard/document_configuration.py b/addons/document/wizard/document_configuration.py
index 97eda4e2d62..6a69e638b4e 100644
--- a/addons/document/wizard/document_configuration.py
+++ b/addons/document/wizard/document_configuration.py
@@ -110,3 +110,5 @@ class document_configuration(osv.osv_memory):
                 'ressource_tree': 1
         })
 document_configuration()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: