[MERGE] merge with trunk addons

bzr revid: mra@mra-laptop-20100707071629-l6mro8u6bvh2rwtl
2010-07-07 12:46:29 +05:30
parent a2a631f4ce 11b7a2d1e5
commit 8f25bde3bb
5 changed files with 139 additions and 33 deletions
@@ -138,7 +138,7 @@

         <!--  Receipt Vouchers -->
        <record model="ir.actions.act_window" id="action_receipt_vou_voucher_list">
-            <field name="name">Customer Vouchers</field>
+            <field name="name">Receivable Vouchers</field>
            <field name="res_model">account.voucher</field>
            <field name="view_type">form</field>
            <field name="view_mode">tree,form</field>
@@ -151,7 +151,7 @@

        <!--  Purchase Vouchers -->
        <record model="ir.actions.act_window" id="action_pay_vou_voucher_list">
-            <field name="name">Vendor Vouchers</field>
+            <field name="name">Payable Vouchers</field>
            <field name="res_model">account.voucher</field>
            <field name="view_type">form</field>
            <field name="view_mode">tree,form</field>
@@ -12,7 +12,7 @@
            <field name="type">lead</field>
            <field name="user_id" ref="base.user_root"/>
            <field eval="'Luc Latour'" name="partner_name"/>
-            <field eval="'open'" name="state"/>
+            <field eval="'draft'" name="state"/>
            <field name="section_id" ref="crm.section_sales_department"/>
            <field eval="'(726) 782-0636'" name="mobile"/>
            <field eval="1" name="active"/>
@@ -21,13 +21,14 @@
            <field eval="'The Oil Company'" name="name"/>
            <field eval="'(769) 703-274'" name="phone"/>
        </record>
+
        <record id="crm_case_electonicgoodsdealer0" model="crm.lead">
            <field name="type_id" ref="crm.type_lead7"/>
            <field eval="'4'" name="priority"/>
            <field name="type">lead</field>
            <field name="user_id" ref="base.user_root"/>
            <field eval="'Marc Dufour'" name="partner_name"/>
-            <field eval="'open'" name="state"/>
+            <field eval="'draft'" name="state"/>
            <field name="section_id" ref="crm.section_sales_department"/>
            <field eval="'(392) 895-7917'" name="mobile"/>
            <field eval="1" name="active"/>
@@ -36,13 +37,14 @@
            <field eval="'Le Club SARL'" name="name"/>
            <field eval="'(956) 293-2595'" name="phone"/>
        </record>
+        
        <record id="crm_case_developingwebapplications0" model="crm.lead">
            <field name="type_id" ref="crm.type_lead5"/>
            <field eval="'2'" name="priority"/>
            <field name="type">lead</field>
            <field name="user_id" ref="base.user_demo"/>
            <field eval="'Fabien Pinckaers'" name="partner_name"/>
-            <field eval="'done'" name="state"/>
+            <field eval="'draft'" name="state"/>
            <field name="section_id" ref="crm.section_sales_department"/>
            <field eval="'(820) 167-3208'" name="mobile"/>
            <field eval="1" name="active"/>
@@ -67,13 +69,14 @@
            <field eval="'The Gas Company'" name="name"/>
            <field eval="'(514) 698-4118'" name="phone"/>
        </record>
+
        <record id="crm_case_itdeveloper0" model="crm.lead">
            <field name="type_id" ref="crm.type_lead4"/>
            <field eval="'3'" name="priority"/>
            <field name="type">lead</field>
            <field name="user_id" ref="base.user_root"/>
            <field eval="'Carrie Helle'" name="partner_name"/>
-            <field eval="'pending'" name="state"/>
+            <field eval="'draft'" name="state"/>
            <field name="section_id" ref="crm.section_sales_department"/>
            <field eval="'(333) 715-1450'" name="mobile"/>
            <field eval="1" name="active"/>
@@ -82,6 +85,7 @@
            <field eval="'Stonage IT'" name="name"/>
            <field eval="'(855) 924-4364'" name="phone"/>
        </record>
+        
        <record id="crm_case_mgroperations0" model="crm.lead">
            <field name="partner_address_id" ref="base.res_partner_address_1"/>
            <field eval="1" name="active"/>
@@ -91,7 +95,7 @@
            <field name="type">lead</field>
            <field name="user_id" ref="base.user_root"/>
            <field eval="'Tina Pinero'" name="partner_name"/>
-            <field eval="'cancel'" name="state"/>
+            <field eval="'draft'" name="state"/>
            <field name="section_id" ref="crm.section_sales_department"/>
            <field eval="'(468) 017-2684'" name="mobile"/>
            <field name="categ_id" ref="crm.categ_oppor8"/>
@@ -107,7 +111,7 @@
            <field name="type">lead</field>
            <field name="user_id" ref="base.user_root"/>
            <field eval="'Wendi Baltz'" name="partner_name"/>
-            <field eval="'done'" name="state"/>
+            <field eval="'draft'" name="state"/>
            <field name="section_id" ref="crm.section_sales_department"/>
            <field eval="'(463) 014-1208'" name="mobile"/>
            <field name="categ_id" ref="crm.categ_oppor4"/>
@@ -115,5 +119,107 @@
            <field eval="'Gardner Group'" name="name"/>
            <field eval="'(282) 603-7489'" name="phone"/>
        </record>
+        <record id="crm_case_webvisitor0" model="crm.lead">
+            <field eval="1" name="active"/>
+            <field name="type_id" ref="crm.type_lead5"/>
+            <field eval="&quot;1&quot;" name="priority"/>
+            <field name="type">lead</field>
+            <field name="user_id" ref="base.user_demo"/>
+            <field eval="&quot;Questionnaire&quot;" name="name"/>
+            <field eval="&quot;open&quot;" name="state"/>
+            <field name="section_id" ref="crm.section_sales_department"/>
+            <field eval="&quot;Smith John&quot;" name="partner_name2"/>
+            <field eval="&quot;(487) 013-1504&quot;" name="partner_mobile"/>
+            <field name="categ_id" ref="crm.categ_oppor6"/>
+            <field eval="&quot;Website Visitor&quot;" name="partner_name"/>
+            <field eval="&quot;smith_john@gmail.com&quot;" name="email_from"/>
+            <field eval="time.strftime('%Y-%m-16 10:05:15')" name="date"/>
+        </record>
+        <record id="crm_case_business_card0" model="crm.lead">
+            <field eval="1" name="active"/>
+            <field name="type_id" ref="crm.type_lead3"/>
+            <field eval="&quot;2&quot;" name="priority"/>
+            <field name="type">lead</field>
+            <field name="user_id" ref="base.user_root"/>
+            <field eval="&quot;Marketing Products&quot;" name="name"/>
+            <field eval="&quot;open&quot;" name="state"/>
+            <field name="section_id" ref="crm.section_sales_department"/>
+            <field eval="&quot;Elvis Borne&quot;" name="partner_name2"/>
+            <field eval="&quot;(147) 014-6574&quot;" name="partner_mobile"/>
+            <field name="categ_id" ref="crm.categ_oppor5"/>
+            <field name="stage_id" ref="crm.stage_lead1"/>
+            <field eval="&quot;Business Card&quot;" name="partner_name"/>
+            <field eval="&quot;(124) 587-8974&quot;" name="partner_phone"/>
+            <field eval="time.strftime('%Y-%m-16 11:05:15')" name="date"/>
+        </record>
+        <record id="crm_case_imported_contact0" model="crm.lead">
+            <field eval="1" name="active"/>
+            <field name="type_id" ref="crm.type_lead8"/>
+            <field eval="&quot;2&quot;" name="priority"/>
+            <field name="type">lead</field>
+            <field name="user_id" ref="base.user_demo"/>
+            <field eval="&quot;Business Group&quot;" name="name"/>
+            <field eval="&quot;cancel&quot;" name="state"/>
+            <field name="section_id" ref="crm.section_sales_department"/>
+            <field eval="&quot;Drew Clark&quot;" name="partner_name2"/>
+            <field eval="&quot;(125) 021-4781&quot;" name="partner_mobile"/>
+            <field name="categ_id" ref="crm.categ_oppor1"/>
+            <field name="stage_id" ref="crm.stage_lead2"/>
+            <field eval="&quot;Imported Contact&quot;" name="partner_name"/>
+        </record>
+        <record id="crm_case_employee0" model="crm.lead">
+            <field eval="1" name="active"/>
+            <field name="type_id" ref="crm.type_lead3"/>
+            <field eval="&quot;3&quot;" name="priority"/>
+            <field name="type">lead</field>
+            <field name="user_id" ref="base.user_root"/>
+            <field eval="&quot;OpenERP Campaining&quot;" name="name"/>
+            <field eval="&quot;draft&quot;" name="state"/>
+            <field name="section_id" ref="crm.section_sales_department"/>
+            <field eval="&quot;Carl Nelson&quot;" name="partner_name2"/>
+            <field eval="&quot;(874) 022-6574&quot;" name="partner_mobile"/>
+            <field name="categ_id" ref="crm.categ_oppor3"/>
+            <field name="stage_id" ref="crm.stage_lead3"/>
+            <field eval="&quot;Campaining&quot;" name="partner_name"/>
+            <field eval="&quot;(232) 147-6329&quot;" name="partner_phone"/>
+        </record>
+        <record id="crm_case_company_partnership0" model="crm.lead">
+            <field eval="1" name="active"/>
+            <field name="type_id" ref="crm.type_lead3"/>
+            <field eval="&quot;3&quot;" name="priority"/>
+            <field name="type">lead</field>
+            <field name="user_id" ref="base.user_demo"/>
+            <field eval="&quot;Offer&quot;" name="name"/>
+            <field eval="&quot;done&quot;" name="state"/>
+            <field name="section_id" ref="crm.section_sales_department"/>
+            <field eval="&quot;Joe Lucas&quot;" name="partner_name2"/>
+            <field eval="&quot;(234) 031-1254&quot;" name="partner_mobile"/>
+            <field name="categ_id" ref="crm.categ_oppor7"/>
+            <field name="stage_id" ref="crm.stage_lead1"/>
+            <field eval="&quot;Partnership Offer&quot;" name="partner_name"/>
+            <field eval="&quot;(254) 954-2147&quot;" name="partner_phone"/>
+       </record>
+
+       
+       <!--        Call Function to Open the leads-->
+        <function model="crm.lead" name="case_open">
+            <value eval="[ref('crm_case_itisatelesalescampaign0'), ref('crm_case_electonicgoodsdealer0'), ref('crm_case_company_partnership0'), ref('crm_case_webvisitor0'), ref('crm_case_business_card0')]"/>
+        </function>
+        
+        <!--        Call Function to mark the lead as Pending-->
+        <function model="crm.lead" name="case_pending">
+            <value eval="[ref('crm_case_itdeveloper0')]"/>
+        </function>
+
+        <!--        Call Function to Close the leads-->
+        <function model="crm.lead" name="case_close">
+            <value eval="[ref('crm_case_vpoperations0'), ref('crm_case_developingwebapplications0'), ref('crm_case_webvisitor0')]"/>
+        </function>
+    
+        <!--        Call Function to Cancel the leads-->
+        <function model="crm.lead" name="case_cancel">
+            <value eval="[ref('crm_case_mgroperations0'), ref('crm_case_imported_contact0')]"/>
+        </function>
+
    </data>
 </openerp>
@@ -194,10 +194,10 @@ class payroll_register(osv.osv):
 #        'advice_ids':fields.one2many('hr.payroll.advice', 'register_id', 'Bank Advice'),
        'company_id':fields.many2one('res.company', 'Company', required=False),
        'period_id': fields.many2one('account.period', 'Force Period', domain=[('state','<>','done')], help="Keep empty to use the period of the validation(Payslip) date."),
-        'grows': fields.function(_calculate, method=True, store=True, multi='dc', string='Gross Salary', type='float', digits=(16, int(config['price_accuracy']))),
-        'net': fields.function(_calculate, method=True, store=True, multi='dc', string='Net Salary', digits=(16, int(config['price_accuracy']))),
-        'allounce': fields.function(_calculate, method=True, store=True, multi='dc', string='Allowance', digits=(16, int(config['price_accuracy']))),
-        'deduction': fields.function(_calculate, method=True, store=True, multi='dc', string='Deduction', digits=(16, int(config['price_accuracy']))),
+        'grows': fields.function(_calculate, method=True, store=True, multi='dc', string='Gross Salary', type='float', digits=(16, 4)),
+        'net': fields.function(_calculate, method=True, store=True, multi='dc', string='Net Salary', digits=(16, 4)),
+        'allounce': fields.function(_calculate, method=True, store=True, multi='dc', string='Allowance', digits=(16, 4)),
+        'deduction': fields.function(_calculate, method=True, store=True, multi='dc', string='Deduction', digits=(16, 4)),
        'note': fields.text('Description'),
    }

@@ -366,8 +366,8 @@ class payroll_advice_line(osv.osv):
        'advice_id':fields.many2one('hr.payroll.advice', 'Bank Advice', required=False),
        'name':fields.char('Bank Account A/C', size=64, required=True, readonly=False),
        'employee_id':fields.many2one('hr.employee', 'Employee', required=True),
-        'amount': fields.float('Amount', digits=(16, int(config['price_accuracy']))),
-        'bysal': fields.float('By Salary', digits=(16, int(config['price_accuracy']))),
+        'amount': fields.float('Amount', digits=(16, 4)),
+        'bysal': fields.float('By Salary', digits=(16, 4)),
        'flag':fields.char('D/C', size=8, required=True, readonly=False),
    }
    _defaults = {
@@ -434,10 +434,10 @@ class contrib_register(osv.osv):
        'analytic_account_id':fields.many2one('account.analytic.account', 'Analytic Account', required=False),
        'name':fields.char('Name', size=256, required=True, readonly=False),
        'register_line_ids':fields.one2many('hr.contibution.register.line', 'register_id', 'Register Line', readonly=True),
-        'yearly_total_by_emp': fields.function(_total_contrib, method=True, multi='dc', store=True, string='Total By Employee', digits=(16, int(config['price_accuracy']))),
-        'yearly_total_by_comp': fields.function(_total_contrib, method=True, multi='dc', store=True,  string='Total By Company', digits=(16, int(config['price_accuracy']))),
-        'monthly_total_by_emp': fields.function(_total_contrib, method=True, multi='dc', store=True, string='Total By Employee', digits=(16, int(config['price_accuracy']))),
-        'monthly_total_by_comp': fields.function(_total_contrib, method=True, multi='dc', store=True,  string='Total By Company', digits=(16, int(config['price_accuracy']))),
+        'yearly_total_by_emp': fields.function(_total_contrib, method=True, multi='dc', store=True, string='Total By Employee', digits=(16, 4)),
+        'yearly_total_by_comp': fields.function(_total_contrib, method=True, multi='dc', store=True,  string='Total By Company', digits=(16, 4)),
+        'monthly_total_by_emp': fields.function(_total_contrib, method=True, multi='dc', store=True, string='Total By Employee', digits=(16, 4)),
+        'monthly_total_by_comp': fields.function(_total_contrib, method=True, multi='dc', store=True,  string='Total By Company', digits=(16, 4)),
        'note': fields.text('Description'),
    }
    _defaults = {
@@ -466,9 +466,9 @@ class contrib_register_line(osv.osv):
        'code':fields.char('Code', size=64, required=False, readonly=False),
        'employee_id':fields.many2one('hr.employee', 'Employee', required=True),
        'period_id': fields.many2one('account.period', 'Period'),
-        'emp_deduction': fields.float('Employee Deduction', digits=(16, int(config['price_accuracy']))),
-        'comp_deduction': fields.float('Company Deduction', digits=(16, int(config['price_accuracy']))),
-        'total': fields.function(_total, method=True, store=True,  string='Total', digits=(16, int(config['price_accuracy']))),
+        'emp_deduction': fields.float('Employee Deduction', digits=(16, 4)),
+        'comp_deduction': fields.float('Company Deduction', digits=(16, 4)),
+        'total': fields.function(_total, method=True, store=True,  string='Total', digits=(16, 4)),
    }
 contrib_register_line()

@@ -539,7 +539,7 @@ class company_contribution(osv.osv):
            ('fix','Fixed Amount'),
            ('func','Function Calculation'),
        ],'Amount Type', select=True),
-        'contribute_per':fields.float('Contribution', digits=(16, int(config['price_accuracy'])), help='Define Company contribution ratio 1.00=100% contribution, If Employee Contribute 5% then company will and here 0.50 defined then company will contribute 50% on employee 5% contribution'),
+        'contribute_per':fields.float('Contribution', digits=(16, 4), help='Define Company contribution ratio 1.00=100% contribution, If Employee Contribute 5% then company will and here 0.50 defined then company will contribute 50% on employee 5% contribution'),
        'account_id':fields.property(
            'account.account',
            type='many2one',
@@ -596,13 +596,13 @@ class company_contribution_line(osv.osv):
        'contribution_id':fields.many2one('company.contribution', 'Contribution', required=False),
        'name':fields.char('Name', size=64, required=False, readonly=False),
        'umo_id':fields.many2one('product.uom', 'Unite', required=False),
-        'from_val': fields.float('From', digits=(16, int(config['price_accuracy']))),
-        'to_val': fields.float('To', digits=(16, int(config['price_accuracy']))),
+        'from_val': fields.float('From', digits=(16, 4)),
+        'to_val': fields.float('To', digits=(16, 4)),
        'amount_type':fields.selection([
            ('fix','Fixed Amount'),
        ],'Amount Type', select=True),
        'sequence':fields.integer('Sequence'),
-        'value': fields.float('Value', digits=(16, int(config['price_accuracy']))),
+        'value': fields.float('Value', digits=(16, 4)),
    }
 company_contribution_line()

@@ -730,8 +730,8 @@ class hr_payslip(osv.osv):
            ('cancel','Reject'),
        ],'State', select=True, readonly=True),
        'basic_before_leaves': fields.float('Basic Salary', readonly=True,  digits=(16, 2)),
-        'leaves': fields.float('Leaved Deduction', readonly=True,  digits=(16, 2)),
-        'basic': fields.float('Basic Salary - Leaves', readonly=True,  digits=(16, 2)),
+        'leaves': fields.float('Leave Deductions', readonly=True,  digits=(16, 2)),
+        'basic': fields.float('Net Basic', readonly=True,  digits=(16, 2)),
        'grows': fields.function(_calculate, method=True, store=True, multi='dc', string='Gross Salary', type='float', digits=(16, 2)),
        'net': fields.function(_calculate, method=True, store=True, multi='dc', string='Net Salary', digits=(16, 2)),
        'allounce': fields.function(_calculate, method=True, store=True, multi='dc', string='Allowance', digits=(16, 2)),
@@ -1213,9 +1213,9 @@ class hr_payslip_line(osv.osv):
        'amount': fields.float('Amount / Percentage', digits=(16, 4)),
        'analytic_account_id':fields.many2one('account.analytic.account', 'Analytic Account', required=False),
        'account_id':fields.many2one('account.account', 'General Account', required=True),
-        'total': fields.float('Sub Total', readonly=True, digits=(16, int(config['price_accuracy']))),
+        'total': fields.float('Sub Total', readonly=True, digits=(16, 4)),
        #'total': fields.function(_calculate, method=True, type='float', string='Label', store=True),
-        'company_contrib': fields.float('Company Contribution', readonly=True, digits=(16, int(config['price_accuracy']))),
+        'company_contrib': fields.float('Company Contribution', readonly=True, digits=(16, 4)),
        'expanse_id': fields.many2one('hr.expense.expense', 'Expense'),
        'sequence': fields.integer('Sequence'),
        'note':fields.text('Description'),
@@ -1251,13 +1251,13 @@ class hr_payslip_line_line(osv.osv):
        'slipline_id':fields.many2one('hr.payslip.line', 'Slip Line', required=False),
        'name':fields.char('Name', size=64, required=False, readonly=False),
        'umo_id':fields.many2one('product.uom', 'Unite', required=False),
-        'from_val': fields.float('From', digits=(16, int(config['price_accuracy']))),
-        'to_val': fields.float('To', digits=(16, int(config['price_accuracy']))),
+        'from_val': fields.float('From', digits=(16, 4)),
+        'to_val': fields.float('To', digits=(16, 4)),
        'amount_type':fields.selection([
            ('fix','Fixed Amount'),
        ],'Amount Type', select=True),
        'sequence':fields.integer('Sequence'),
-        'value': fields.float('Value', digits=(16, int(config['price_accuracy']))),
+        'value': fields.float('Value', digits=(16, 4)),
    }
 hr_payslip_line_line()

@@ -505,7 +505,7 @@
                        <button string="Compute Sheet" icon="terp-stock_format-scientific" name="compute_sheet" states="new"/>
                        <button string="Recompute Sheet" icon="terp-stock_format-scientific" name="compute_sheet" type="object" states="draft"/>
                        <button string="Verify Sheet" icon="terp-camera_test" name="verify_sheet" states="draft"/>
-                        <button string="Complete HR Checking" icon="terp-camera_test" name="final_verify_sheet" states="hr_check"/>
+                        <button string="Validate Sheet" icon="terp-camera_test" name="final_verify_sheet" states="hr_check"/>
                        <button string="Pay Salary" icon="terp-dolar_ok!" name="process_sheet" states="confirm"/>
                        <button string="Cancel" icon="terp-dialog-close" name="cancel_sheet" states="draft,hr_check,confirm"/>
                        <button string="Set to Draft" icon="terp-stock_effects-object-colorize" name="set_to_draft" states="cancel"/>