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

[MERGE] merge with dev-addons3

Browse Source 
bzr revid: psi@tinyerp.co.in-20110104044217-1fql0589rdw61430
This commit is contained in:
psi (Open ERP)
2011-01-04 10:12:17 +05:30
parent 8769150fa1 b7b351294c
commit 6de6e75208
3 changed files with 2 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/security/ir.model.access.csv
+1
View File
@@ -98,6 +98,7 @@
"access_account_bank_statement_manager","account.bank.statement manager","model_account_bank_statement","account.group_account_manager",1,1,1,1
"access_account_entries_report_manager","account.entries.report","model_account_entries_report","account.group_account_manager",1,1,1,1
"access_account_entries_report_user","account.entries.report","model_account_entries_report","account.group_account_user",1,0,0,0
"access_account_entries_report_invoice","account.entries.report","model_account_entries_report","account.group_account_invoice",1,0,0,0
"access_account_entries_report_employee","account.entries.report employee","model_account_entries_report","base.group_user",1,0,0,0
"access_analytic_entries_report_manager","analytic.entries.report","model_analytic_entries_report","account.group_account_manager",1,0,0,0
"access_account_cashbox_line","account.cashbox.line","model_account_cashbox_line","account.group_account_manager",1,1,1,1
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
98 access_account_bank_statement_manager account.bank.statement manager model_account_bank_statement account.group_account_manager 1 1 1 1
99 access_account_entries_report_manager account.entries.report model_account_entries_report account.group_account_manager 1 1 1 1
100 access_account_entries_report_user account.entries.report model_account_entries_report account.group_account_user 1 0 0 0
101 access_account_entries_report_invoice account.entries.report model_account_entries_report account.group_account_invoice 1 0 0 0
102 access_account_entries_report_employee account.entries.report employee model_account_entries_report base.group_user 1 0 0 0
103 access_analytic_entries_report_manager analytic.entries.report model_analytic_entries_report account.group_account_manager 1 0 0 0
104 access_account_cashbox_line account.cashbox.line model_account_cashbox_line account.group_account_manager 1 1 1 1
addons/hr_payroll/hr_payroll_view.xml
-2
View File
@@ -277,8 +277,6 @@
<group colspan="2">
<separator string="Validation" colspan="2"/>
<newline/>
<field name="active" />
<newline/>
<field name="double_validation"/>
<newline/>
<field name="limit"/>
addons/l10n_fr/test/l10n_fr_report.yml
+1 -15
View File
@@ -1,23 +1,9 @@
-
In order to test Generate Fiscalyear Opening Entries wizard of OpenERP I first create a fiscalyear "Fiscal Year 2011" to which the entries will move
-
!record {model: account.fiscalyear, id: account_fiscalyear_01}:
code: FY2011
company_id: base.main_company
date_start: '2012-01-01'
date_stop: '2012-12-31'
name: Fiscal Year 2012
-
I create the fiscal periods
-
!python {model: account.fiscalyear}:
self.create_period(cr, uid, [ref('account_fiscalyear_01'),])
-
In order to test the PDF reports defined on a l10n_fr, we will print an Account Move Line Report for l10n_fr
-
!python {model: account.move.line}: |
import netsvc, tools, os, time
(data, format) = netsvc.LocalService('report.l10n.fr.bilan').create(cr, uid, [], {'model':'account.move.line', 'form':{'fiscalyear_id': ref('account_fiscalyear_01')}}, {})
(data, format) = netsvc.LocalService('report.l10n.fr.bilan').create(cr, uid, [], {'model':'account.move.line', 'form':{'fiscalyear_id': ref('account.data_fiscalyear')}}, {})
if tools.config['test_report_directory']:
file(os.path.join(tools.config['test_report_directory'], 'l10n_fr-bilan_report.'+format), 'wb+').write(data)