pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] merge from trunk addons

Browse Source 
bzr revid: mra@mra-laptop-20100927135011-y5k3wukl8m27phyn
This commit is contained in:
Mustufa Rangwala
2010-09-27 19:20:11 +05:30
parent 25afae68ee b333a3cb7d
commit 5526eaa882
9 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/hr_contract/__openerp__.py
+1 -1
View File
@@ -26,7 +26,7 @@
'category': 'Generic Modules/Human Resources',
'description': """
Add all information on the employee form to manage contracts:
* Martial status,
* Marital status,
* Security number,
* Place of birth, birth date, ...
You can assign several contracts per employee.
addons/hr_evaluation/test/test_hr_evaluation.yml
+1 -1
View File
@@ -125,7 +125,7 @@
self.button_plan_in_progress(cr, uid, [ref('hr_evaluation_evaluation_0')])
-
I close this servey request by giving answer of survey question.
I close this survey request by giving answer of survey question.
-
!python {model: hr.evaluation.interview}: |
self.survey_req_done(cr, uid, [ref('hr_evaluation_interview_0')])
addons/hr_expense/test/test_hr_expense.yml
+1 -1
View File
@@ -79,7 +79,7 @@
!workflow {model: hr.expense.expense, action: validate, ref: hr_expense_expense_september0}
-
I invoiced this expenses by click on "Invoice" button.
I invoiced this expense by click on "Invoice" button.
-
!workflow {model: hr.expense.expense, action: invoice, ref: hr_expense_expense_september0}
addons/hr_holidays/__openerp__.py
+2 -2
View File
@@ -26,9 +26,9 @@
"author": "OpenERP SA & Axelor",
"category": "Generic Modules/Human Resources",
"website": "http://www.openerp.com",
"description": """Human Ressources: Holidays tracking and workflow
"description": """Human Resources: Holidays tracking and workflow
This module allows you to manage leaves and leaves requests.
This module allows you to manage leaves and leaves' requests.
Implements a dashboard for human resource management that includes.
* My Leaves
* My Expenses
addons/hr_payroll_account/__openerp__.py
+1 -1
View File
@@ -26,7 +26,7 @@
'description': """Generic Payroll system Integrated with Accountings
* Expanse Encoding
* Payment Encoding
* Comany Contribution Managemet
* Company Contribution Management
""",
'author':'OpenERP SA/Axelor',
'website':'http://www.openerp.com',
addons/project/test/test_project_delegation.yml
+9 -9
View File
@@ -1,11 +1,11 @@
-
This scenario tests the delegation process. Closing all the delegated tasks(task delegation at multiple levels) transits the parent task from pending to open state.
-
Creating a project OpenERP Documentaion
Creating a project OpenERP Documentation
-
!record {model: project.project, id: project_project_openerpdocumentaion0}:
!record {model: project.project, id: project_project_openerpdocumentation0}:
company_id: base.main_company
name: OpenERP Documentaion
name: OpenERP Documentation
-
Creating a task 'Develop book for Technical and Functional reference'
@@ -13,7 +13,7 @@
!record {model: project.task, id: project_task_documentation_book}:
name: Develop book for Technical and Functional reference
planned_hours: 20.0
project_id: project_project_openerpdocumentaion0
project_id: project_project_openerpdocumentation0
remaining_hours: 20.0
state: draft
@@ -31,7 +31,7 @@
!record {model: project.task, id: project_task_publish_book}:
name: Publish the References
planned_hours: 10.0
project_id: project_project_openerpdocumentaion0
project_id: project_project_openerpdocumentation0
remaining_hours: 10.0
state: draft
@@ -77,7 +77,7 @@
!record {model: project.task, id: project_task_delegate_openerp_tutorial}:
name: Prepare a book that gives functional overview of OpenERP
planned_hours: 30.0
project_id: project.project_project_openerpdocumentaion0
project_id: project.project_project_openerpdocumentation0
remaining_hours: 30.0
state: draft
@@ -95,7 +95,7 @@
!record {model: project.task, id: project_task_delegate_developer_book}:
name: Prepare a technical reference for creating your modules
planned_hours: 30.0
project_id: project_project_openerpdocumentaion0
project_id: project_project_openerpdocumentation0
remaining_hours: 30.0
state: draft
@@ -123,7 +123,7 @@
!record {model: project.task, id: project_task_delegate_module_develop}:
name: Prepare documentation for Module Development
planned_hours: 30.0
project_id: project.project_project_openerpdocumentaion0
project_id: project.project_project_openerpdocumentation0
remaining_hours: 30.0
state: draft
@@ -134,7 +134,7 @@
!record {model: project.task, id: project_task_delegate_business_process_develop}:
name: Prepare documentation for Business Process Development
planned_hours: 30.0
project_id: project_project_openerpdocumentaion0
project_id: project_project_openerpdocumentation0
remaining_hours: 30.0
state: draft
addons/project_mrp/__openerp__.py
+1 -1
View File
@@ -32,7 +32,7 @@ When installed, this module will automatically create a new task
for each procurement order line, when the corresponding product
meets the following characteristics:
* Type = Service
* Procurement method (Order fulfilment) = MTO (make to order)
* Procurement method (Order fulfillment) = MTO (make to order)
* Supply/Procurement method = Produce
The new task is created outside of any existing project, but
addons/purchase_requisition/test/purchase_requisition.yml
+1 -1
View File
@@ -58,7 +58,7 @@
-
!workflow {model: sale.order, action: order_confirm, ref: sale_order_testtender0}
-
I launch he scheduler to compute all procurements, and specify all requisitions orders.
I launch the scheduler to compute all procurements, and specify all requisitions orders.
-
!python {model: procurement.order.compute.all}: |
proc_obj = self.pool.get('procurement.order')
addons/stock/stock.py
-2
View File
@@ -1088,8 +1088,6 @@ class stock_picking(osv.osv):
@return: True or False
"""
for pick in self.browse(cr, uid, ids, context=context):
if not pick.move_lines:
return False
for move in pick.move_lines:
if move.state not in ('cancel',):
return False