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

[MERGE] merge from dev3

Browse Source 
bzr revid: ara@tinyerp.com-20110106055744-jf77y2g3d5fv1m98
This commit is contained in:
ARA (OpenERP)
2011-01-06 11:27:44 +05:30
parent 9944b0a261 cc162e066c
commit 576b79a482
14 changed files with 86 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/account_report.xml
+1
View File
@@ -2,6 +2,7 @@
<openerp>
<data>
<report auto="False" id="account_general_ledger" menu="False" model="account.account" name="account.general.ledger" rml="account/report/account_general_ledger.rml" string="General Ledger"/>
<report auto="False" id="account_general_ledger_landscape" menu="False" model="account.account" name="account.general.ledger_landscape" rml="account/report/account_general_ledger.rml" string="General Ledger"/>
<report auto="False" id="account_3rdparty_ledger" menu="False" model="res.partner" name="account.third_party_ledger" rml="account/report/account_partner_ledger.rml" string="Partner Ledger"/>
<report auto="False" id="account_3rdparty_ledger_other" menu="False" model="res.partner" name="account.third_party_ledger_other" rml="account/report/account_partner_ledger_other.rml" string="Partner Ledger"/>
<report auto="False" id="account_account_balance" menu="False" model="account.account" name="account.account.balance" rml="account/report/account_balance.rml" string="Trial Balance"/>
addons/account/account_view.xml
+1
View File
@@ -179,6 +179,7 @@
<separator string="Reconcile" colspan="2"/>
<field name="reconcile"/>
</group>
<field name="active" groups="base.group_extended" />
<separator string="Default Taxes" colspan="4"/>
<field colspan="4" name="tax_ids" nolabel="1" domain="[('parent_id','=',False)]"/>
<separator string="Consolidated Children" colspan="4"/>
addons/account/invoice.py
+11 -5
View File
@@ -991,15 +991,13 @@ class account_invoice(osv.osv):
return True
def action_cancel(self, cr, uid, ids, *args):
context = {} # TODO: Use context from arguments
account_move_obj = self.pool.get('account.move')
invoices = self.read(cr, uid, ids, ['move_id', 'payment_ids'])
move_ids = [] # ones that we will need to remove
for i in invoices:
if i['move_id']:
account_move_obj.button_cancel(cr, uid, [i['move_id'][0]])
# delete the move this invoice was pointing to
# Note that the corresponding move_lines and move_reconciles
# will be automatically deleted too
account_move_obj.unlink(cr, uid, [i['move_id'][0]])
move_ids.append(i['move_id'][0])
if i['payment_ids']:
account_move_line_obj = self.pool.get('account.move.line')
pay_ids = account_move_line_obj.browse(cr, uid, i['payment_ids'])
@@ -1007,7 +1005,15 @@ class account_invoice(osv.osv):
if move_line.reconcile_partial_id and move_line.reconcile_partial_id.line_partial_ids:
raise osv.except_osv(_('Error !'), _('You cannot cancel the Invoice which is Partially Paid! You need to unreconcile concerned payment entries!'))
# First, set the invoices as cancelled and detach the move ids
self.write(cr, uid, ids, {'state':'cancel', 'move_id':False})
if move_ids:
# second, invalidate the move(s)
account_move_obj.button_cancel(cr, uid, move_ids, context=context)
# delete the move this invoice was pointing to
# Note that the corresponding move_lines and move_reconciles
# will be automatically deleted too
account_move_obj.unlink(cr, uid, move_ids, context=context)
self._log_event(cr, uid, ids, -1.0, 'Cancel Invoice')
return True
addons/point_of_sale/point_of_sale_demo.xml
+15 -15
View File
@@ -26,7 +26,7 @@
<field eval="0" name="reconciled"/>
<field eval="450.0" name="residual"/>
<field name="move_name">/</field>
<field name="date_invoice">2010-10-07</field>
<field name="date_invoice">time.strftime('%Y-%m-%d')</field>
<field name="period_id" ref="account.period_10"/>
<field eval="450.0" name="amount_untaxed"/>
<field model="account.move" name="move_id" search="[('name', '=', u'SAJ/2010/010')]"/>
@@ -53,7 +53,7 @@
<field name="date_validity">2011-04-07</field>
<field name="shop_id" ref="sale.shop"/>
<field name="user_salesman_id" ref="base.user_root"/>
<field name="date_order">2010-10-07 16:53:11</field>
<field name="date_order">time.strftime('%Y-%m-%d %H:%M:%S')</field>
<field name="partner_id" ref="base.res_partner_agrolait"/>
<field eval="1" name="nb_print"/>
<field name="user_id" ref="base.user_root"/>
@@ -62,7 +62,7 @@
<field name="state">paid</field>
<field name="sale_manager" ref="base.user_root"/>
<field name="pricelist_id" ref="product.list0"/>
<field name="date_validation">2010-10-07</field>
<field name="date_validation">time.strftime('%Y-%m-%d')</field>
<field name="name">POS/019</field>
<field name="price_type">tax_excluded</field>
<field model="account.invoice" name="invoice_id" search="[('name', '=', u'Invoice from POS: POS/019')]"/>
@@ -76,7 +76,7 @@
<field name="journal_id" ref="account.sales_journal"/>
<field name="company_id" ref="base.main_company"/>
<field name="period_id" ref="account.period_10"/>
<field name="date">2010-10-07</field>
<field name="date">time.strftime('%Y-%m-%d')</field>
</record>
<record id="account_bank_statement_line_paymentpos0" model="account.bank.statement.line">
<field name="partner_id" ref="base.res_partner_agrolait"/>
@@ -87,7 +87,7 @@
<field name="account_id" ref="account.a_recv"/>
<field name="journal_id">Cash Journal - (test)</field>
<field eval="[(6,0,[])]" name="move_ids"/>
<field name="date">2010-10-07</field>
<field name="date">time.strftime('%Y-%m-%d')</field>
<field eval="450.0" name="amount"/>
<field eval="0" name="is_acc"/>
<field eval="0" name="am_out"/>
@@ -98,18 +98,18 @@
<record id="stock_picking_out0" model="stock.picking">
<field name="origin">POS/019</field>
<field model="pos.order" name="pos_order" search="[('name', '=', u'POS/019')]"/>
<field name="date_done">2010-10-07 16:53:46</field>
<field name="date_done">time.strftime('%Y-%m-%d %H:%M:%S')</field>
<field eval="1" name="auto_picking"/>
<field name="move_type">direct</field>
<field name="company_id" ref="base.main_company"/>
<field name="note">POS notes </field>
<field name="state">done</field>
<field name="type">out</field>
<field name="min_date">2010-10-07 16:53:46</field>
<field name="date">2010-10-07 16:33:30</field>
<field name="min_date">time.strftime('%Y-%m-%d %H:%M:%S')</field>
<field name="date">time.strftime('%Y-%m-%d %H:%M:%S')</field>
<field name="name">OUT/00019</field>
<field name="invoice_state">none</field>
<field name="max_date">2010-10-07 16:53:46</field>
<field name="max_date">time.strftime('%Y-%m-%d %H:%M:%S')</field>
</record>
<record id="stock_move_stockmovepos0" model="stock.move">
<field name="origin">POS/019</field>
@@ -123,12 +123,12 @@
<field name="company_id" ref="base.main_company"/>
<field name="state">done</field>
<field eval="[(6,0,[])]" name="move_history_ids"/>
<field name="date_expected">2010-10-07 16:33:30</field>
<field name="date">2010-10-07 16:33:30</field>
<field name="date_expected">time.strftime('%Y-%m-%d %H:%M:%S')</field>
<field name="date">time.strftime('%Y-%m-%d %H:%M:%S')</field>
<field name="name">Stock move (POS 12)</field>
<field eval="[(6,0,[])]" name="move_history_ids2"/>
<field name="product_id" ref="product.product_product_pc1"/>
<field name="date_planned">2010-10-07 16:53:46</field>
<field name="date_planned">time.strftime('%Y-%m-%d %H:%M:%S')</field>
<field name="location_dest_id" ref="stock.stock_location_customers"/>
<field model="stock.picking" name="picking_id" search="[('name', '=', u'OUT/00019')]"/>
</record>
@@ -166,7 +166,7 @@
<record id="line1_pos" model="pos.order.line">
<field name="order_id" ref="order_pos1"/>
<field name="date_planned">2010/09/15</field>
<field name="date_planned">time.strftime('%Y-%m-%d')</field>
<field name="name">[PC3] Medium PC</field>
<field name="product_id" ref="product.product_product_pc3"/>
<field model="res.company" name="company_id" search="[]"/>
@@ -178,7 +178,7 @@
<record id="line12_pos" model="pos.order.line">
<field name="order_id" ref="order_pos1"/>
<field name="date_planned">2010/09/15</field>
<field name="date_planned">time.strftime('%Y-%m-%d')</field>
<field name="name">[PC2] Basic+ PC (assembly on order)</field>
<field name="product_id" ref="product.product_product_pc2"/>
<field model="res.company" name="company_id" search="[]"/>
@@ -190,7 +190,7 @@
<record id="line2_pos" model="pos.order.line">
<field name="order_id" ref="order_pos2"/>
<field name="date_planned">2010/09/15</field>
<field name="date_planned">time.strftime('%Y-%m-%d')</field>
<field name="name">[PC1] Basic PC</field>
<field name="product_id" ref="product.product_product_pc1"/>
<field model="res.company" name="company_id" search="[]"/>
addons/point_of_sale/test/point_of_sale_report.yml
+2 -2
View File
@@ -89,11 +89,11 @@
!record {model: account.bank.statement, id: account_bank_statement_st0}:
name: St.05/19
balance_end_real: 0.0
date: '2010-05-19'
date: !eval time.strftime('%Y-%m-%d')
journal_id: account_journal_cash0
line_ids:
- name: statement
date: "2010-10-13"
date: !eval "'%s-%s-%s' %(datetime.now().year,datetime.now().month+5,datetime.now().day)"
type: customer
account_id: account_pos_account_sales
amount: 100
addons/point_of_sale/test/point_of_sale_test.yml
+4 -4
View File
@@ -289,8 +289,8 @@
-
!record {model: pos.order, id: pos_order_pos0}:
company_id: base.main_company
date_order: '2010-05-13 15:02:48'
date_validity: '2010-11-13'
date_order: !eval time.strftime('%Y-%m-%d %H:%M:%S')
date_validity: !eval "'%s-%s-%s' %(datetime.now().year,datetime.now().month+6,datetime.now().day)"
lines:
- company_id: base.main_company
name: Order Line/01
@@ -336,7 +336,7 @@
!record {model: pos.make.payment, id: pos_make_payment_0}:
amount: 1615.0
journal: 7
payment_date: "2010-05-13"
payment_date: !eval time.strftime("%Y-%m-%d")
payment_name: Payment
product_id: product_product_hppaviliondesktoppcs0
pricelist_id: product.list0
@@ -398,7 +398,7 @@
!record {model: pos.make.payment, id: pos_make_payment_1}:
amount: 680.0
journal: 7
payment_date: "2010-05-13"
payment_date: !eval time.strftime("%Y-%m-%d")
payment_name: Payment
product_id: product_product_hppaviliondesktoppcs0
pricelist_id: product.list0
addons/project/test/test_project.yml
+7 -7
View File
@@ -10,7 +10,7 @@
Create task 'Technical Training' for this project
-
!record {model: project.task, id: project_task_technicaltraining0}:
date_start: '2010-05-31 11:48:38'
date_start: !eval time.strftime('%Y-%m-%d %H:%M:%S')
name: Technical Training
planned_hours: 30.0
project_id: project_project_openerptrainingprogramme0
@@ -20,7 +20,7 @@
Create task 'Functional Training' for this project
-
!record {model: project.task, id: project_task_functionaltraining0}:
date_start: '2010-05-31 11:49:11'
date_start: !eval time.strftime('%Y-%m-%d %H:%M:%S')
name: Functional Training
planned_hours: 30.0
project_id: project_project_openerptrainingprogramme0
@@ -136,7 +136,7 @@
-
!record {model: project.task, id: project_task_technicaltraining0, context:{'no_analytic_entry':True}}:
work_ids:
- date: '2010-05-31 15:04:22'
- date: !eval time.strftime('%Y-%m-%d %H:%M:%S')
hours: 10.0
name: Training on OpenERP modules, models and classes
user_id: base.user_root
@@ -151,7 +151,7 @@
-
!record {model: project.task, id: project_task_technicaltraining0, context:{'no_analytic_entry':True}}:
work_ids:
- date: '2010-06-01 15:04:46'
- date: !eval time.strftime('%Y-%m-%d %H:%M:%S')
hours: 10.0
name: Training on OpenERP xml views
user_id: base.user_root
@@ -166,7 +166,7 @@
-
!record {model: project.task, id: project_task_technicaltraining0, context:{'no_analytic_entry':True}}:
work_ids:
- date: '2010-06-02 15:05:24'
- date: !eval time.strftime('%Y-%m-%d %H:%M:%S')
hours: 10.0
name: Training on workflows
user_id: base.user_root
@@ -202,7 +202,7 @@
-
!record {model: project.task, id: project_task_technicaltraining0, context:{'no_analytic_entry':True}}:
work_ids:
- date: '2010-05-31 15:08:40'
- date: !eval time.strftime('%Y-%m-%d %H:%M:%S')
hours: 10.0
name: Training on reports and wizards
user_id: base.user_root
@@ -253,7 +253,7 @@
-
!record {model: project.task, id: project_task_technicaltraining0, context:{'no_analytic_entry':True}}:
work_ids:
- date: '2010-05-31 16:55:27'
- date: !eval time.strftime('%Y-%m-%d %H:%M:%S')
hours: 5.0
name: Training on yml
user_id: base.user_root
addons/project_long_term/test/schedule_phase_tasks.yml
+1 -1
View File
@@ -15,7 +15,7 @@
Create phase 'Develop GUI' in Outlook
-
!record {model: project.phase, id: project_phase_phase0}:
date_start: '2010-06-02'
date_start: !eval time.strftime("%Y-%m-%d")
duration: 200.0
name: Develop GUI in Outlook
product_uom: product.uom_day
addons/project_long_term/test/schedule_project_phases.yml
+6 -6
View File
@@ -9,7 +9,7 @@
Create a project phase 'Defining Client's Basic Idea of Project'
-
!record {model: project.phase, id: project_phase_definingclientsbasicideaofproject0}:
date_start: '2010-06-02'
date_start: !eval time.strftime('%Y-%m-%d')
duration: 15.0
name: "Defining Client's Basic Idea of Project"
product_uom: product.uom_day
@@ -20,7 +20,7 @@
Create project phase 'Establishing Project Feasibility'
-
!record {model: project.phase, id: project_phase_establishingprojectfeasibility0}:
date_start: '2010-06-02'
date_start: !eval time.strftime('%Y-%m-%d')
duration: 30.0
name: Establishing Project Feasibility
product_uom: product.uom_day
@@ -30,7 +30,7 @@
Create project phase 'Preparation of Engineering Designs'
-
!record {model: project.phase, id: project_phase_preparationofengineeringdesigns0}:
date_start: '2010-06-02'
date_start: !eval time.strftime('%Y-%m-%d')
duration: 100.0
name: Preparation of Engineering Designs
product_uom: product.uom_hour
@@ -41,7 +41,7 @@
Create project phase 'Procurement of Works and Goods'
-
!record {model: project.phase, id: project_phase_procurementofworksandgoods0}:
date_start: '2010-06-02'
date_start: !eval time.strftime('%Y-%m-%d')
duration: 24.0
name: Procurement of Works and Goods
product_uom: product.uom_hour
@@ -52,7 +52,7 @@
Create project phase 'Project Construction'
-
!record {model: project.phase, id: project_phase_projectconstruction0}:
date_start: '2010-06-02'
date_start: !eval time.strftime('%Y-%m-%d')
duration: 4320.0
name: Project Construction
product_uom: product.uom_hour
@@ -63,7 +63,7 @@
Create project phase 'Project Completion'
-
!record {model: project.phase, id: project_phase_projectcompletion0}:
date_start: '2010-06-02'
date_start: !eval time.strftime('%Y-%m-%d')
duration: 240.0
name: Project Completion
product_uom: product.uom_hour
addons/project_long_term/test/schedule_project_tasks.yml
+1 -1
View File
@@ -16,7 +16,7 @@
Create phase 'Develop GUI' in thunderbird
-
!record {model: project.phase, id: project_phase_phase1}:
date_start: '2010-06-02'
date_start: !eval time.strftime('%Y-%m-%d')
duration: 200.0
name: Develop GUI in thunderbird
product_uom: product.uom_day
addons/project_mrp/test/project_task_procurement.yml
+1 -1
View File
@@ -19,7 +19,7 @@
I create a sale order for product Partners Training which has type 'Service'.
-
!record {model: sale.order, id: sale_order_so0}:
date_order: '2010-05-21'
date_order: !eval time.strftime('%Y-%m-%d')
invoice_quantity: order
name: SO006
order_policy: manual
addons/project_planning/test/planning_states.yml
+2 -2
View File
@@ -3,8 +3,8 @@
-
!record {model: report_account_analytic.planning, id: report_account_analytic_planning_projectplanning0}:
business_days: 20
date_from: '2010-06-01'
date_to: '2010-06-30'
date_from: !eval time.strftime('%Y-%m-%d')
date_to: !eval "'%s-%s-%s' %(datetime.now().year,datetime.now().month+1,datetime.now().day)"
name: Project Planning
state: draft
user_id: base.user_demo
addons/project_retro_planning/test/deadline_change.yml
+3 -3
View File
@@ -10,9 +10,9 @@
Create task 'Plan all projects'
-
!record {model: project.task, id: project_task_planallprojects0}:
date_deadline: '2010-06-07'
date_end: '2010-06-04 14:00:00'
date_start: '2010-06-01 17:25:32'
date_deadline: !eval "'%s-%s-%s' %(datetime.now().year,datetime.now().month,datetime.now().day+6)"
date_end: !eval "'%s-%s-%s %s:%s:%s' %(datetime.now().year,datetime.now().month,datetime.now().day+3,datetime.now().hour,datetime.now().minute,datetime.now().second)"
date_start: !eval time.strftime('%Y-%m-%d %H:%M:%S')
name: Plan all projects
planned_hours: 24.0
project_id: project_project_retroplanning0
addons/project_timesheet/test/worktask_entry_to_timesheetline_entry.yml
+31 -31
View File
@@ -1,6 +1,6 @@
-
-
Create a user 'HR Manager'
-
-
!record {model: res.users, id: res_users_hrmanager0}:
company_id: base.main_company
context_lang: en_US
@@ -8,11 +8,11 @@
name: HR Manager
password: hr
groups_id:
- base.group_hr_manager
-
- base.group_hr_manager
-
Create a product with type service used to specify employees designation
-
-
!record {model: product.product, id: product_product_hrmanger0}:
categ_id: product.product_category_services
cost_method: standard
@@ -29,15 +29,15 @@
weight: 0.0
weight_net: 0.0
-
-
Create an analytic journal for employees timesheet
-
-
!record {model: account.analytic.journal, id: account_analytic_journal_hrtimesheet0}:
company_id: base.main_company
name: HR Timesheet
type: general
-
-
Create an employee 'HR Manager' for user 'HR Manager'
-
!record {model: hr.employee, id: hr_employee_hrmanager0}:
@@ -45,60 +45,60 @@
user_id: res_users_hrmanager0
product_id: product_product_hrmanger0
journal_id: account_analytic_journal_hrtimesheet0
-
-
Create a timesheet sheet for HR manager
-
-
!record {model: hr_timesheet_sheet.sheet, id: hr_timesheet_sheet_sheet_sheetforhrmanager0}:
date_current: '2010-06-03'
date_from: '2010-06-01'
date_to: '2010-06-30'
date_current: !eval time.strftime('%Y-%m-%d')
date_from: !eval "'%s-%s-01' %(datetime.now().year, datetime.now().month)"
date_to: !eval "'%s-%s-30' %(datetime.now().year, datetime.now().month)"
name: Sheet for hr manager
state: new
user_id: res_users_hrmanager0
employee_id : 'hr_employee_hrmanager0'
-
-
Create a project 'Timesheet Management'
-
-
!record {model: project.project, id: project_project_timesheetmanagement0}:
company_id: base.main_company
name: Timesheet Management
-
-
Create a task 'Get all timesheet records'
-
-
!record {model: project.task, id: project_task_getalltimesheetrecords0}:
date_start: '2010-06-03 14:54:55'
date_start: !eval time.strftime('%Y-%m-%d %H:%M:%S')
name: Get all timesheet records
planned_hours: 20.0
project_id: project_project_timesheetmanagement0
remaining_hours: 20.0
state: draft
user_id: res_users_hrmanager0
-
-
Open the task
-
-
!python {model: project.task}: |
self.do_open(cr, uid, [ref("project_task_getalltimesheetrecords0")], {"lang":
"en_US", "active_ids": [ref("project_project_timesheetmanagement0")], "tz":
False, "active_model": "project.project", "department_id": False, "project_id":
False, "active_id": ref("project_project_timesheetmanagement0"), })
-
Make a work task entry 'Get work calendar of all employees' of 10 hours done by HR manager
-
-
Make a work task entry 'Get work calendar of all employees' of 10 hours done by HR manager
-
!record {model: project.task, id: project_task_getalltimesheetrecords0}:
work_ids:
- date: '2010-06-03 15:04:47'
- date: !eval time.strftime('%Y-%m-%d %H:%M:%S')
hours: 10.0
name: Get work calendar of all employees
name: Get work calendar of all employees
user_id: res_users_hrmanager0
-
Check for timesheet_ids in HR manager's timesheet
-
!assert {model: hr_timesheet_sheet.sheet, id: hr_timesheet_sheet_sheet_sheetforhrmanager0, string: After hr manager's work task, length of timesheet line of current timesheet must be greater then 1}:
- len(timesheet_ids) > 0
- len(timesheet_ids) > 0