[MERGE]

bzr revid: jas@tinyerp.com-20101021045420-jvsilf3ljober3kp
2010-10-21 10:24:20 +05:30
parent 75aaa54a15 42f09c3188
commit bdfdfbc8f6
11 changed files with 28 additions and 8 deletions
@@ -54,7 +54,6 @@
      </record>

        <menuitem name="Association" id="base.menu_association" icon="terp-calendar" sequence="9" groups="base.group_extended"/>
-        <menuitem name="Events Organisation" id="base.menu_event_main" parent="base.menu_association" />
        <menuitem name="Configuration" id="base.menu_event_config" parent="base.menu_association" sequence="30" groups="base.group_extended"/>
        <menuitem name="Reporting" id="base.menu_report_association" parent="base.menu_association" sequence="20"/>
    </data>
@@ -1,11 +1,13 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_auction_artists","auction.artists","model_auction_artists","group_auction_manager",1,1,1,1
+"access_auction_dates_user","auction.dates user","model_auction_dates","group_auction_user",1,0,0,0
 "access_auction_dates_manager","auction.dates manager","model_auction_dates","group_auction_manager",1,1,1,1
 "access_auction_deposit_manager","auction.deposit manager","model_auction_deposit","group_auction_manager",1,1,1,1
+"access_auction_deposit_user","auction.deposit user","model_auction_deposit","group_auction_user",1,0,0,0
 "access_auction_deposit_cost","auction.deposit.cost","model_auction_deposit_cost","group_auction_manager",1,1,1,1
 "access_auction_lot_category","auction.lot.category","model_auction_lot_category","group_auction_user",1,0,0,0
 "access_auction_lot_category_manager","auction.lot.category manager","model_auction_lot_category","group_auction_manager",1,1,1,1
-"access_auction_lots","auction.lots","model_auction_lots","group_auction_user",1,1,1,1
+"access_auction_lots","auction.lots","model_auction_lots","group_auction_user",1,1,1,0
 "access_auction_lots_manager","auction.lots manager","model_auction_lots","group_auction_manager",1,0,0,0
 "access_auction_bid","auction.bid","model_auction_bid","group_auction_user",1,1,1,1
 "access_auction_bid_manager","auction.bid manager","model_auction_bid","group_auction_manager",1,0,0,0
@@ -18,6 +20,7 @@
 "access_report_auction_adjudication","report.auction.adjudication","model_report_auction_adjudication","group_auction_manager",1,1,1,1
 "access_report_object_encoded","report.object.encoded","model_report_object_encoded","group_auction_manager",1,1,1,1
 "access_aie_category","aie.category","model_aie_category","group_auction_manager",1,1,1,1
+"access_auction_account_tax_user","account.tax user","account.model_account_tax","group_auction_user",1,0,0,0
 "access_auction_account_tax","account.tax manager","account.model_account_tax","group_auction_manager",1,1,1,0
 "access_auction_account_fiscalyear","account.fiscalyear manager","account.model_account_fiscalyear","group_auction_manager",1,1,1,0
 "access_auction_account_journal","account.journal manager","account.model_account_journal","group_auction_manager",1,1,1,0
@@ -3,3 +3,5 @@
 "access_crm_profiling_answer_manager","crm_profiling.answer manager","model_crm_profiling_answer","base.group_sale_manager",1,0,0,0
 "access_crm_profiling_question_manager","crm_profiling.question manager","model_crm_profiling_question","base.group_sale_salesman",1,1,1,0
 "access_crm_profiling_question_user","crm_profiling.question user","model_crm_profiling_question","base.group_sale_manager",1,0,0,0
+"access_crm_profiling_questionnarie_user","crm_profiling.questionnarie user","model_crm_profiling_questionnaire","base.group_sale_salesman",1,0,0,0
+"access_crm_profiling_questionnarie_manager","crm_profiling.questionnarie manager","model_crm_profiling_questionnaire","base.group_sale_manager",1,1,1,1
@@ -13,3 +13,4 @@
 "access_event_event_sale_salesman","event.event.sale","model_event_event","base.group_sale_salesman",1,0,0,0
 "access_account_account_invoice_manager","account.account.invoice","account.model_account_invoice","base.group_marketing_manager",1,0,0,0
 "access_event_registration_badge","event.registration.badge","model_event_registration_badge","marketing.group_marketing_user",1,0,0,0
+"access_event_registration_sale_user","event.registration.sale.user","model_event_registration","base.group_sale_salesman",1,0,0,0
@@ -38,6 +38,7 @@
    'init_xml': [
    ],
    'update_xml': [
+        "security/ir.model.access.csv", 
        "hr_payroll_account_view.xml",
    ],
    'demo_xml': [
@@ -47,4 +48,4 @@
    'active': False,
 }

-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
@@ -0,0 +1,2 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_hr_payslip_account_move_user","access.hr.payslip.account.move.user","model_hr_payslip_account_move","base.group_user",1,0,0,0
@@ -940,9 +940,10 @@ class sale_order_line(osv.osv):
                                        'for this product: "%s" (id:%d)') % \
                                        (line.product_id.name, line.product_id.id,))
                else:
-                    a = self.pool.get('ir.property').get(cr, uid,
+                    prop = self.pool.get('ir.property').get(cr, uid,
                            'property_account_income_categ', 'product.category',
-                            context=context).id
+                            context=context)
+                    a = prop and prop.id or False
                uosqty = _get_line_qty(line)
                uos_id = _get_line_uom(line)
                pu = 0.0
@@ -292,6 +292,7 @@
            <field name="view_type">form</field>
            <field name="view_mode">tree,form,calendar,graph</field>
            <field name="search_view_id" ref="view_sales_order_filter"/>
+            <field name="context">{"search_default_user_id":uid}</field>
            <field name="help">Sales Orders helps you manage quotations and orders done with your customers. OpenERP suggests that you to start by creating a quotation. Once the order is confirmed, the quotation is converted into a Sale Order. OpenERP can handle several types of products so that a sales order can trigger tasks, delivery orders, manufacturing orders, purchases and so on. Based on the configuration of the sale order, a draft invoice will be generated so that you just have to confirm it when you want to bill your customer.</field>
        </record>
        <menuitem action="action_order_form" id="menu_sale_order" parent="base.menu_sales" sequence="3" groups="base.group_sale_salesman,base.group_sale_manager"/>
@@ -31,6 +31,19 @@
        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
    </record>

+    <record id="sale_order_personal_rule" model="ir.rule">
+        <field name="name">Personal Orders</field>
+        <field ref="model_sale_order" name="model_id"/>
+        <field name="domain_force">['|',('user_id','=',user.id),('user_id','=',False)]</field>
+        <field name="groups" eval="[(4, ref('base.group_sale_salesman'))]"/>
+    </record>
+
+    <record id="sale_order_line_personal_rule" model="ir.rule">
+        <field name="name">Personal Order Lines</field>
+        <field ref="model_sale_order_line" name="model_id"/>
+        <field name="domain_force">['|',('order_id.user_id','=',user.id),('order_id.user_id','=',False)]</field>
+        <field name="groups" eval="[(4, ref('base.group_sale_salesman'))]"/>
+    </record>

 </data>
 </openerp>
@@ -43,7 +43,6 @@
    'website': 'http://www.openerp.com',
    'data': [
        'security/share_security.xml',
-        'security/ir.model.access.csv',
        'share_view.xml',
        'res_users_view.xml',
        'wizard/share_wizard_view.xml'
@@ -1,2 +0,0 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_share_wizard_user","access_share_wizard_user","model_share_wizard","share.group_share_user",1,1,1,1