From a1e503f869fe2f0b537c41b0633c2ac4b02693ee Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 8 Jul 2010 16:43:47 +0200
Subject: [PATCH] merge

bzr revid: fp@tinyerp.com-20100708144347-b9x0lx1ulfbjtli4
---
 .../wizard/account_pay_invoice_view.xml       | 58 +++++++++----------
 addons/base_setup/base_setup_installer.xml    |  2 +-
 addons/purchase/purchase_workflow.xml         |  1 -
 addons/purchase/security/ir.model.access.csv  |  6 ++
 4 files changed, 36 insertions(+), 31 deletions(-)

diff --git a/addons/account/wizard/account_pay_invoice_view.xml b/addons/account/wizard/account_pay_invoice_view.xml
index 0bae948100e..3601daaef06 100644
--- a/addons/account/wizard/account_pay_invoice_view.xml
+++ b/addons/account/wizard/account_pay_invoice_view.xml
@@ -1,65 +1,65 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-    	<record id="view_account_invoice_pay" model="ir.ui.view">
+        <record id="view_account_invoice_pay" model="ir.ui.view">
             <field name="name">account.invoice.pay.form</field>
             <field name="model">account.invoice.pay</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Pay invoice">
-                	<group colspan="4" >
-						<field name="amount"/>
-					    <newline/>
-					    <field name="name"/>
-					    <field name="date"/>
-					    <field name="journal_id"/>
-					    <field name="period_id"/>
-                	</group>
+                    <group colspan="4" >
+                        <field name="amount"/>
+                        <newline/>
+                        <field name="name"/>
+                        <field name="date"/>
+                        <field name="journal_id" widget="selection"/>
+                        <field name="period_id" widget="selection"/>
+                    </group>
                     <group colspan="4" col="6">
-                       	<label string ="" colspan="2"/>
-                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button icon="gtk-execute" string="Partial Payment" name="pay_and_reconcile" type="object"/>
-                    	<button icon="gtk-execute" string="Full Payment" name="wo_check" type="object"/>
+                           <label string ="" colspan="2"/>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                        <button icon="gtk-execute" string="Partial Payment" name="pay_and_reconcile" type="object"/>
+                        <button icon="gtk-execute" string="Full Payment" name="wo_check" type="object"/>
                    </group>
                </form>
             </field>
         </record>
 
-		<record id="action_account_invoice_pay" model="ir.actions.act_window">
+        <record id="action_account_invoice_pay" model="ir.actions.act_window">
             <field name="name">Pay Invoice</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">account.invoice.pay</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="view_id" ref="view_account_invoice_pay"/>
-	        <field name="context">{'record_id' : active_id}</field>
+            <field name="context">{'record_id' : active_id}</field>
             <field name="target">new</field>
-    	</record>
+        </record>
 
 
-		<record id="view_account_invoice_pay_writeoff" model="ir.ui.view">
+        <record id="view_account_invoice_pay_writeoff" model="ir.ui.view">
             <field name="name">account.invoice.pay.writeoff.form</field>
             <field name="model">account.invoice.pay.writeoff</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Information addendum">
-                	<group colspan="4" >
-					    <separator string="Write-Off Move" colspan="4"/>
-					    <field name="writeoff_journal_id"/>
-    					<field name="writeoff_acc_id" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
-    					<field name="comment"/>
-    					<separator string="Analytic" colspan="4"/>
-    					<field name="analytic_id"/>
-                	</group>
+                    <group colspan="4" >
+                        <separator string="Write-Off Move" colspan="4"/>
+                        <field name="writeoff_journal_id"/>
+                        <field name="writeoff_acc_id" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+                        <field name="comment"/>
+                        <separator string="Analytic" colspan="4"/>
+                        <field name="analytic_id"/>
+                    </group>
                     <group colspan="4" col="6">
-                       	<label string ="" colspan="2"/>
-                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button icon="gtk-execute" string="Pay and reconcile" name="pay_and_reconcile_writeoff" type="object"/>
+                           <label string ="" colspan="2"/>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                        <button icon="gtk-execute" string="Pay and reconcile" name="pay_and_reconcile_writeoff" type="object"/>
                    </group>
                </form>
             </field>
         </record>
 
 
-	</data>
+    </data>
 </openerp>
diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index bb9f8d23bf7..009af3ffd55 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -28,7 +28,7 @@
             <field name="stock" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,profile_association,profile_auction,profile_bookstore)"/> <field name="mrp" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,profile_association,profile_auction,profile_bookstore)"/>
             <field name="account" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,profile_association,profile_auction,profile_bookstore)"/> <field name="purchase" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,profile_association,profile_auction,profile_bookstore)"/>
             <field name="hr" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,profile_association,profile_auction,profile_bookstore)"/> <field name="point_of_sale" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,profile_association,profile_auction,profile_bookstore)"/>
-            <field name="marketing" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,profile_association,profile_auction,profile_bookstore)" groups="base.group_extended"/> <field name="misc_tools" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,profile_association,profile_auction,profile_bookstore)"/>
+            <field name="marketing" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,profile_association,profile_auction,profile_bookstore)"/> <field name="misc_tools" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,profile_association,profile_auction,profile_bookstore)"/>
             <field name="report_designer" groups="base.group_extended" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,profile_association,profile_auction,profile_bookstore)"/>
             <separator string="Install Specific Business Modules" colspan="4"/>
             <field name="association" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,profile_association,profile_auction,profile_bookstore)"/>
diff --git a/addons/purchase/purchase_workflow.xml b/addons/purchase/purchase_workflow.xml
index d14530e5f48..a194cd16713 100644
--- a/addons/purchase/purchase_workflow.xml
+++ b/addons/purchase/purchase_workflow.xml
@@ -103,7 +103,6 @@
         <record id="trans_confirmed_router" model="workflow.transition">
             <field name="act_from" ref="act_confirmed"/>
             <field name="act_to" ref="act_router"/>
-            <field name="signal">purchase_approve</field>
         </record>
         <record id="trans_router_picking" model="workflow.transition">
             <field name="act_from" ref="act_router"/>
diff --git a/addons/purchase/security/ir.model.access.csv b/addons/purchase/security/ir.model.access.csv
index 674b01f66e7..7a3b35725d4 100644
--- a/addons/purchase/security/ir.model.access.csv
+++ b/addons/purchase/security/ir.model.access.csv
@@ -26,3 +26,9 @@
 "access_res_partner_address_purchase_user","res.partner.address purchase","base.model_res_partner_address","group_purchase_user",1,0,0,0
 "access_account_journal","account.journal","account.model_account_journal","purchase.group_purchase_user",1,1,1,0
 "access_account_journal_manager","account.journal","account.model_account_journal","purchase.group_purchase_manager",1,1,1,1
+"access_account_period","account.period","account.model_account_period","purchase.group_purchase_user",1,0,0,0
+"access_account_fiscalyear","account.fiscalyear","account.model_account_fiscalyear","purchase.group_purchase_user",1,0,0,0
+"access_account_move","account.move","account.model_account_move","purchase.group_purchase_user",1,1,1,1
+"access_account_move_line","account.move.line","account.model_account_move_line","purchase.group_purchase_user",1,1,1,1
+"access_account_analytic_line","account.analytic.line","account.model_account_analytic_line","purchase.group_purchase_user",1,1,1,1
+"access_account_move_reconcile","account.move.reconcile","account.model_account_move_reconcile","purchase.group_purchase_user",1,1,1,1