[MERGE]

bzr revid: hmo@tinyerp.com-20100611132707-pazwc1uglvo8m5au

addons/purchase/purchase.py

@@ -273,6 +273,8 @@ class purchase_order(osv.osv):
                     todo.append(line.id)
         current_name = self.name_get(cr, uid, ids)[0][1]
         self.pool.get('purchase.order.line').action_confirm(cr, uid, todo, context)
+        message = _('confirm Order') + " ' " + po.name
+        self.log(cr,uid,po,message)
         for id in ids:
             self.write(cr, uid, [id], {'state' : 'confirmed', 'validator' : uid})
         return True

addons/wiki/__openerp__.py

@@ -33,6 +33,7 @@
     'depends': ['base'],
     'init_xml': [],
     'update_xml': [
+        'security/wiki_security.xml',
         'wizard/wiki_wiki_page_open_view.xml',
         'wizard/wiki_create_menu_view.xml',
         'wizard/wiki_make_index_view.xml',

addons/wiki/security/wiki_security.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data noupdate="1">
+    <record id="wiki_basic_group" model="res.groups">
+        <field name="name">wiki / Basic wiki editing</field>
+    </record>
+</data>
+</openerp>

addons/wiki/wiki_view.xml

@@ -127,7 +127,7 @@
                     <group col="8" colspan="4">
                         <field name="name" select="1" colspan="6"/>
                         <button name="open_wiki_page" type="object"
-                        string="Basic Wiki Editing" icon="gtk-ok" />
+                        string="Basic Wiki Editing" icon="gtk-ok" groups="wiki.wiki_basic_group"/>
                     </group>
                     <group col="8" colspan="4">
                         <field name="group_id" string="Topic" select="1" on_change="onchange_group_id(group_id, text_area)"/>

addons/wiki_sale_faq/wiki_sale_faq_data.xml

@@ -21,6 +21,47 @@
             </field>
         </record>
 
-    
+         <record id="wiki_wiki_bugs" model="wiki.wiki">
+            <field name="name">Sales Management ?</field>
+            <field name="tags">Sales</field>
+            <field name="group_id" ref="wiki_groups_sale_faq"/>
+            <field name="minor_edit">0</field>
+            <field name="toc">0</field>
+            <field name="review">1</field>
+            <field name="section">2</field>
+            <field name="summary">Initial Page</field>
+            <field name="text_area">== Question ==
+
+What's Sales Management ?
+
+== Answer ==
+
+Sales modules allow you to manage and classify your sales orders on a structural and hierarchical system. It gives you
+the ability to create new orders and to review the existing orders in their various states. Confirmation of an order can
+triggers delivery of the goods, and invoicing timing is defined by a setting in each individual order.
+
+Key Points:
+
+* Get all information needed by the salesman to do his quote in one screen
+* Complete follow-up and control of sales orders, deliveries and invoicing
+* Traceability of all customers operations
+
+
+Integration Benefits:
+
+* Automatic accounting (financial and analytic) entries creation,
+* Integrated with contracts, projects, master production shedule,
+* Integrated with different eCommerce platforms for online selling.
+* Design templates of re-useable offers with the report designer
+
+
+== External Links ==
+
+* The Open ERP Website: [http://openerp.com]
+* The Sale Documentation: [http://openerp.com]
+
+   </field>
+  </record>
+
    </data>
 </openerp>