odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] Latest bugfixes from 6.1 

bzr revid: odo@openerp.com-20120229094502-sp0xrg4yf5uvq5k9
This commit is contained in:
Olivier Dony 2012-02-29 10:45:02 +01:00
parent 27ca901a92 1e2ad76483
commit 318d99d029
12 changed files with 76 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
addons/account_followup/account_followup.py
View File

@ -34,20 +34,6 @@ class followup(osv.osv):
'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'account_followup.followup', context=c),
}
def check_company_uniq(self, cr, uid, ids, context=None):
sr_id = self.search(cr,uid,[],context=context)
lines = self.browse(cr, uid, sr_id, context=context)
company = []
for l in lines:
if l.company_id.id in company:
return False
if l.company_id.id not in company:
company.append(l.company_id.id)
return True
_constraints = [
(check_company_uniq, 'Only One Followup by Company.',['company_id'] )
]
followup()
class followup_line(osv.osv):

2
addons/base_synchro/base_synchro_obj.py
View File

@ -31,7 +31,7 @@ class base_synchro_server(osv.osv):
'server_port': fields.integer('Server Port', size=64,required=True),
'server_db': fields.char('Server Database', size=64,required=True),
'login': fields.char('User Name',size=50,required=True),
'password': fields.char('Password',size=64,invisible=True,required=True),
'password': fields.char('Password',size=64,required=True),
'obj_ids' : fields.one2many('base.synchro.obj','server_id','Models',ondelete='cascade')
}
_defaults = {

4
addons/hr/hr_view.xml
View File

@ -104,8 +104,6 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Employees">
<filter icon="terp-personal+" domain="[('active','=',True)]" name="active" string="Active" groups="base.group_extended"/>
<separator orientation="vertical" />
<field name="name"/>
<field name="department_id" widget="selection">
<filter icon="terp-personal+" domain="[('department_id','=',context.get('department_id',False))]" string="My Departments Employee"/>
@ -185,7 +183,7 @@
<field name="view_type">form</field>
<field name="view_mode">kanban,tree,form</field>
<field name="domain">[]</field>
<field name="context">{"search_default_department_id": department_id,"search_default_active":eval('True')}</field>
<field name="context">{"search_default_department_id": department_id}</field>
<field name="view_id" eval="False"/>
<field name="search_view_id" ref="view_employee_filter"/>
<field name="help">Here you can manage your work force by creating employees and assigning them specific properties in the system. Maintain all employee related information and keep track of anything that needs to be recorded for them. The personal information tab will help you maintain their identity data. The Categories tab gives you the opportunity to assign them related employee categories depending on their position and activities within the company. A category can be a seniority level within the company or a department. The Timesheets tab allows to assign them a specific timesheet and analytic journal where they will be able to enter time through the system. In the note tab, you can enter text data that should be recorded for a specific employee.</field>

2
addons/hr_payroll/test/payslip.yml
View File

@ -27,7 +27,7 @@
I create a contract for "Richard"
-
!record {model: hr.contract, id: hr_contract_richard}:
date_end: !eval "'%s-%s-%s' %(datetime.now().year+1,datetime.now().month,datetime.now().day)"
date_end: !eval "(datetime.now() + timedelta(days=365)).strftime('%Y-%m-%d')"
date_start: !eval time.strftime('%Y-%m-%d')
name: Contract for Richard
wage: 5000.0

2
addons/hr_payroll_account/test/hr_payroll_account.yml
View File

@ -42,7 +42,7 @@
I create a contract for "John".
-
!record {model: hr.contract, id: hr_contract_john}:
date_end: !eval "'%s-%s-%s' %(datetime.now().year+1,datetime.now().month,datetime.now().day)"
date_end: !eval "(datetime.now() + timedelta(days=365)).strftime('%Y-%m-%d')"
date_start: !eval time.strftime('%Y-%m-%d')
name: Contract for John
wage: 5000.0

2
addons/l10n_it/data/account.account.template.csv
View File

@ -93,7 +93,7 @@ id,code,name,parent_id:id,user_type:id,type,reconcile
2530,2530,clienti c/acconti ,25,account_type_payable,payable,TRUE
26,26,DEBITI DIVERSI ,2,account_type_view,view,TRUE
2601,2601,IVA n/debito ,26,account_type_tax,other,TRUE
2602,2602,debiti per ritenute da versare ,26,account_type_tax,other,TRUE
2602,2602,debiti per ritenute da versare ,26,account_type_payable,payable,TRUE
2605,2605,erario c/IVA ,26,account_type_payable,payable,TRUE
2606,2606,debiti per imposte ,26,account_type_tax,other,TRUE
2619,2619,debiti per cauzioni ,26,account_type_asset,other,TRUE

1 id code name parent_id:id user_type:id type reconcile
93 2530 2530 clienti c/acconti 25 account_type_payable payable TRUE
94 26 26 DEBITI DIVERSI 2 account_type_view view TRUE
95 2601 2601 IVA n/debito 26 account_type_tax other TRUE
96 2602 2602 debiti per ritenute da versare 26 account_type_tax account_type_payable other payable TRUE
97 2605 2605 erario c/IVA 26 account_type_payable payable TRUE
98 2606 2606 debiti per imposte 26 account_type_tax other TRUE
99 2619 2619 debiti per cauzioni 26 account_type_asset other TRUE

127
addons/l10n_it/data/account.tax.code.template.csv
View File

@ -1,62 +1,65 @@
"code","id","name","parent_id:id"
,"vat_code_chart_root","Tassazione",
"IVC","template_ivacode_pagata","IVA a credito","vat_code_chart_root"
"IVC0","template_ivacode_pagata_0","Esente IVA (credito)","template_ivacode_pagata"
"IVCI","template_impcode_pagata","IVA a credito (imponibile)","vat_code_chart_root"
"IVC0I","template_impcode_pagata_0","Esente IVA a credito (imponibile)","template_impcode_pagata"
"IVC10","template_ivacode_pagata_10","IVA a credito 10%","template_ivacode_pagata"
"IVC10I","template_impcode_pagata_10","IVA a credito 10% (imponibile)","template_impcode_pagata"
"IVC10ind","template_ivacode_pagata_10ind","IVA a credito 10% indetraibile","template_ivacode_pagata"
"IVC10Iind","template_impcode_pagata_10ind","IVA a credito 10% indetraibile (imponibile)","template_impcode_pagata"
"IVC20ind","template_ivacode_pagata_20ind","IVA a credito 20% indetraibile","template_ivacode_pagata"
"IVC20Iind","template_impcode_pagata_20ind","IVA a credito 20% indetraibile (imponibile)","template_impcode_pagata"
"IVC4ind","template_ivacode_pagata_4ind","IVA a credito 4% indetraibile","template_ivacode_pagata"
"IVC4Iind","template_impcode_pagata_4ind","IVA a credito 4% indetraibile (imponibile)","template_impcode_pagata"
"IVC20det10","template_ivacode_pagata_20det10","IVA a credito 20% detraibile 10%","template_ivacode_pagata"
"IVC20Idet10","template_impcode_pagata_20det10","IVA a credito 20% detraibile 10% (imponibile)","template_impcode_pagata"
"IVC20det15","template_ivacode_pagata_20det15","IVA a credito 20% detraibile 15%","template_ivacode_pagata"
"IVC20Idet15","template_impcode_pagata_20det15","IVA a credito 20% detraibile 15% (imponibile)","template_impcode_pagata"
"IVC20det40","template_ivacode_pagata_20det40","IVA a credito 20% detraibile 40%","template_ivacode_pagata"
"IVC20Idet40","template_impcode_pagata_20det40","IVA a credito 20% detraibile 40% (imponibile)","template_impcode_pagata"
"IVC20det50","template_ivacode_pagata_20det50","IVA a credito 20% detraibile 50%","template_ivacode_pagata"
"IVC20Idet50","template_impcode_pagata_20det50","IVA a credito 20% detraibile 50% (imponibile)","template_impcode_pagata"
"IVC10det50","template_ivacode_pagata_10det50","IVA a credito 10% detraibile 50%","template_ivacode_pagata"
"IVC10Idet50","template_impcode_pagata_10det50","IVA a credito 10% detraibile 50% (imponibile)","template_impcode_pagata"
"IVC4det50","template_ivacode_pagata_4det50","IVA a credito 4% detraibile 50%","template_ivacode_pagata"
"IVC4Idet50","template_impcode_pagata_4det50","IVA a credito 4% detraibile 50% (imponibile)","template_impcode_pagata"
"IVC20","template_ivacode_pagata_20","IVA a credito 20%","template_ivacode_pagata"
"IVC20I","template_impcode_pagata_20","IVA a credito 20% (imponibile)","template_impcode_pagata"
"IVC21","template_ivacode_pagata_21","IVA a credito 21%","template_ivacode_pagata"
"IVC21I","template_impcode_pagata_21","IVA a credito 21% (imponibile)","template_impcode_pagata"
"IVC4","template_ivacode_pagata_4","IVA a credito 4%","template_ivacode_pagata"
"IVC4I","template_impcode_pagata_4","IVA a credito 4% (imponibile)","template_impcode_pagata"
"IVC12","template_ivacode_pagata_12","IVA a credito 12%","template_ivacode_pagata"
"IVC12I","template_impcode_pagata_12","IVA a credito 12% (imponibile)","template_impcode_pagata"
"IVC2","template_ivacode_pagata_2","IVA a credito 2%","template_ivacode_pagata"
"IVC2I","template_impcode_pagata_2","IVA a credito 2% (imponibile)","template_impcode_pagata"
"IVD","template_ivacode_riscossa","IVA a debito","vat_code_chart_root"
"IVD0","template_ivacode_riscossa_0","Esente IVA (debito)","template_ivacode_riscossa"
"IVDI","template_impcode_riscossa","IVA a debito (imponibile)","vat_code_chart_root"
"IVD0I","template_impcode_riscossa_0","Esente IVA a debito (imponibile)","template_impcode_riscossa"
"IVD10","template_ivacode_riscossa_10","IVA a debito 10%","template_ivacode_riscossa"
"IVD10I","template_impcode_riscossa_10","IVA a debito 10% (imponibile)","template_impcode_riscossa"
"IVD20","template_ivacode_riscossa_20","IVA a debito 20%","template_ivacode_riscossa"
"IVD20I","template_impcode_riscossa_20","IVA a debito 20% (imponibile)","template_impcode_riscossa"
"IVD21","template_ivacode_riscossa_21","IVA a debito 21%","template_ivacode_riscossa"
"IVD21I","template_impcode_riscossa_21","IVA a debito 21% (imponibile)","template_impcode_riscossa"
"IVD4","template_ivacode_riscossa_4","IVA a debito 4%","template_ivacode_riscossa"
"IVD4I","template_impcode_riscossa_4","IVA a debito 4% (imponibile)","template_impcode_riscossa"
"IVD12","template_ivacode_riscossa_12","IVA a debito 12%","template_ivacode_riscossa"
"IVD12I","template_impcode_riscossa_12","IVA a debito 12% (imponibile)","template_impcode_riscossa"
"IVD2","template_ivacode_riscossa_2","IVA a debito 2%","template_ivacode_riscossa"
"IVD2I","template_impcode_riscossa_2","IVA a debito 2% (imponibile)","template_impcode_riscossa"
"IVC21ind","template_ivacode_pagata_21ind","IVA a credito 21% indetraibile","template_ivacode_pagata"
"IVC21Iind","template_impcode_pagata_21ind","IVA a credito 21% indetraibile (imponibile)","template_impcode_pagata"
"IVC21det10","template_ivacode_pagata_21det10","IVA a credito 21% detraibile 10%","template_ivacode_pagata"
"IVC21Idet10","template_impcode_pagata_21det10","IVA a credito 21% detraibile 10% (imponibile)","template_impcode_pagata"
"IVC21det15","template_ivacode_pagata_21det15","IVA a credito 21% detraibile 15%","template_ivacode_pagata"
"IVC21Idet15","template_impcode_pagata_21det15","IVA a credito 21% detraibile 15% (imponibile)","template_impcode_pagata"
"IVC21det40","template_ivacode_pagata_21det40","IVA a credito 21% detraibile 40%","template_ivacode_pagata"
"IVC21Idet40","template_impcode_pagata_21det40","IVA a credito 21% detraibile 40% (imponibile)","template_impcode_pagata"
"IVC21det50","template_ivacode_pagata_21det50","IVA a credito 21% detraibile 50%","template_ivacode_pagata"
"IVC21Idet50","template_impcode_pagata_21det50","IVA a credito 21% detraibile 50% (imponibile)","template_impcode_pagata"
code,id,name,parent_id:id
,vat_code_chart_root,Tassazione,
IVC,template_ivacode_pagata,IVA a credito,vat_code_chart_root
IVC0,template_ivacode_pagata_0,Esente IVA (credito),template_ivacode_pagata
IVCI,template_impcode_pagata,IVA a credito (imponibile),vat_code_chart_root
IVC0I,template_impcode_pagata_0,Esente IVA a credito (imponibile),template_impcode_pagata
IVC10,template_ivacode_pagata_10,IVA a credito 10%,template_ivacode_pagata
IVC10I,template_impcode_pagata_10,IVA a credito 10% (imponibile),template_impcode_pagata
IVC10ind,template_ivacode_pagata_10ind,IVA a credito 10% indetraibile,template_ivacode_pagata
IVC10Iind,template_impcode_pagata_10ind,IVA a credito 10% indetraibile (imponibile),template_impcode_pagata
IVC20ind,template_ivacode_pagata_20ind,IVA a credito 20% indetraibile,template_ivacode_pagata
IVC20Iind,template_impcode_pagata_20ind,IVA a credito 20% indetraibile (imponibile),template_impcode_pagata
IVC4ind,template_ivacode_pagata_4ind,IVA a credito 4% indetraibile,template_ivacode_pagata
IVC4Iind,template_impcode_pagata_4ind,IVA a credito 4% indetraibile (imponibile),template_impcode_pagata
IVC20det10,template_ivacode_pagata_20det10,IVA a credito 20% detraibile 10%,template_ivacode_pagata
IVC20Idet10,template_impcode_pagata_20det10,IVA a credito 20% detraibile 10% (imponibile),template_impcode_pagata
IVC20det15,template_ivacode_pagata_20det15,IVA a credito 20% detraibile 15%,template_ivacode_pagata
IVC20Idet15,template_impcode_pagata_20det15,IVA a credito 20% detraibile 15% (imponibile),template_impcode_pagata
IVC20det40,template_ivacode_pagata_20det40,IVA a credito 20% detraibile 40%,template_ivacode_pagata
IVC20Idet40,template_impcode_pagata_20det40,IVA a credito 20% detraibile 40% (imponibile),template_impcode_pagata
IVC20det50,template_ivacode_pagata_20det50,IVA a credito 20% detraibile 50%,template_ivacode_pagata
IVC20Idet50,template_impcode_pagata_20det50,IVA a credito 20% detraibile 50% (imponibile),template_impcode_pagata
IVC10det50,template_ivacode_pagata_10det50,IVA a credito 10% detraibile 50%,template_ivacode_pagata
IVC10Idet50,template_impcode_pagata_10det50,IVA a credito 10% detraibile 50% (imponibile),template_impcode_pagata
IVC4det50,template_ivacode_pagata_4det50,IVA a credito 4% detraibile 50%,template_ivacode_pagata
IVC4Idet50,template_impcode_pagata_4det50,IVA a credito 4% detraibile 50% (imponibile),template_impcode_pagata
IVC20,template_ivacode_pagata_20,IVA a credito 20%,template_ivacode_pagata
IVC20I,template_impcode_pagata_20,IVA a credito 20% (imponibile),template_impcode_pagata
IVC21,template_ivacode_pagata_21,IVA a credito 21%,template_ivacode_pagata
IVC21I,template_impcode_pagata_21,IVA a credito 21% (imponibile),template_impcode_pagata
IVC4,template_ivacode_pagata_4,IVA a credito 4%,template_ivacode_pagata
IVC4I,template_impcode_pagata_4,IVA a credito 4% (imponibile),template_impcode_pagata
IVC12,template_ivacode_pagata_12,IVA a credito 12%,template_ivacode_pagata
IVC12I,template_impcode_pagata_12,IVA a credito 12% (imponibile),template_impcode_pagata
IVC2,template_ivacode_pagata_2,IVA a credito 2%,template_ivacode_pagata
IVC2I,template_impcode_pagata_2,IVA a credito 2% (imponibile),template_impcode_pagata
IVD,template_ivacode_riscossa,IVA a debito,vat_code_chart_root
IVD0,template_ivacode_riscossa_0,Esente IVA (debito),template_ivacode_riscossa
IVDI,template_impcode_riscossa,IVA a debito (imponibile),vat_code_chart_root
IVD0I,template_impcode_riscossa_0,Esente IVA a debito (imponibile),template_impcode_riscossa
IVD10,template_ivacode_riscossa_10,IVA a debito 10%,template_ivacode_riscossa
IVD10I,template_impcode_riscossa_10,IVA a debito 10% (imponibile),template_impcode_riscossa
IVD20,template_ivacode_riscossa_20,IVA a debito 20%,template_ivacode_riscossa
IVD20I,template_impcode_riscossa_20,IVA a debito 20% (imponibile),template_impcode_riscossa
IVD21,template_ivacode_riscossa_21,IVA a debito 21%,template_ivacode_riscossa
IVD21I,template_impcode_riscossa_21,IVA a debito 21% (imponibile),template_impcode_riscossa
IVD4,template_ivacode_riscossa_4,IVA a debito 4%,template_ivacode_riscossa
IVD4I,template_impcode_riscossa_4,IVA a debito 4% (imponibile),template_impcode_riscossa
IVD12,template_ivacode_riscossa_12,IVA a debito 12%,template_ivacode_riscossa
IVD12I,template_impcode_riscossa_12,IVA a debito 12% (imponibile),template_impcode_riscossa
IVD2,template_ivacode_riscossa_2,IVA a debito 2%,template_ivacode_riscossa
IVD2I,template_impcode_riscossa_2,IVA a debito 2% (imponibile),template_impcode_riscossa
IVC21ind,template_ivacode_pagata_21ind,IVA a credito 21% indetraibile,template_ivacode_pagata
IVC21Iind,template_impcode_pagata_21ind,IVA a credito 21% indetraibile (imponibile),template_impcode_pagata
IVC21det10,template_ivacode_pagata_21det10,IVA a credito 21% detraibile 10%,template_ivacode_pagata
IVC21Idet10,template_impcode_pagata_21det10,IVA a credito 21% detraibile 10% (imponibile),template_impcode_pagata
IVC21det15,template_ivacode_pagata_21det15,IVA a credito 21% detraibile 15%,template_ivacode_pagata
IVC21Idet15,template_impcode_pagata_21det15,IVA a credito 21% detraibile 15% (imponibile),template_impcode_pagata
IVC21det40,template_ivacode_pagata_21det40,IVA a credito 21% detraibile 40%,template_ivacode_pagata
IVC21Idet40,template_impcode_pagata_21det40,IVA a credito 21% detraibile 40% (imponibile),template_impcode_pagata
IVC21det50,template_ivacode_pagata_21det50,IVA a credito 21% detraibile 50%,template_ivacode_pagata
IVC21Idet50,template_impcode_pagata_21det50,IVA a credito 21% detraibile 50% (imponibile),template_impcode_pagata
Rit,template_ra,Ritenute d'acconto,vat_code_chart_root
RitD20,template_ritcode_20,Ritenute a debito 20%,template_ra
RitD20I,template_ritimpcode_20,Ritenute a debito 20% (imponibile),template_ra

1 code id name parent_id:id
2 vat_code_chart_root Tassazione
3 IVC template_ivacode_pagata IVA a credito vat_code_chart_root
4 IVC0 template_ivacode_pagata_0 Esente IVA (credito) template_ivacode_pagata
5 IVCI template_impcode_pagata IVA a credito (imponibile) vat_code_chart_root
6 IVC0I template_impcode_pagata_0 Esente IVA a credito (imponibile) template_impcode_pagata
7 IVC10 template_ivacode_pagata_10 IVA a credito 10% template_ivacode_pagata
8 IVC10I template_impcode_pagata_10 IVA a credito 10% (imponibile) template_impcode_pagata
9 IVC10ind template_ivacode_pagata_10ind IVA a credito 10% indetraibile template_ivacode_pagata
10 IVC10Iind template_impcode_pagata_10ind IVA a credito 10% indetraibile (imponibile) template_impcode_pagata
11 IVC20ind template_ivacode_pagata_20ind IVA a credito 20% indetraibile template_ivacode_pagata
12 IVC20Iind template_impcode_pagata_20ind IVA a credito 20% indetraibile (imponibile) template_impcode_pagata
13 IVC4ind template_ivacode_pagata_4ind IVA a credito 4% indetraibile template_ivacode_pagata
14 IVC4Iind template_impcode_pagata_4ind IVA a credito 4% indetraibile (imponibile) template_impcode_pagata
15 IVC20det10 template_ivacode_pagata_20det10 IVA a credito 20% detraibile 10% template_ivacode_pagata
16 IVC20Idet10 template_impcode_pagata_20det10 IVA a credito 20% detraibile 10% (imponibile) template_impcode_pagata
17 IVC20det15 template_ivacode_pagata_20det15 IVA a credito 20% detraibile 15% template_ivacode_pagata
18 IVC20Idet15 template_impcode_pagata_20det15 IVA a credito 20% detraibile 15% (imponibile) template_impcode_pagata
19 IVC20det40 template_ivacode_pagata_20det40 IVA a credito 20% detraibile 40% template_ivacode_pagata
20 IVC20Idet40 template_impcode_pagata_20det40 IVA a credito 20% detraibile 40% (imponibile) template_impcode_pagata
21 IVC20det50 template_ivacode_pagata_20det50 IVA a credito 20% detraibile 50% template_ivacode_pagata
22 IVC20Idet50 template_impcode_pagata_20det50 IVA a credito 20% detraibile 50% (imponibile) template_impcode_pagata
23 IVC10det50 template_ivacode_pagata_10det50 IVA a credito 10% detraibile 50% template_ivacode_pagata
24 IVC10Idet50 template_impcode_pagata_10det50 IVA a credito 10% detraibile 50% (imponibile) template_impcode_pagata
25 IVC4det50 template_ivacode_pagata_4det50 IVA a credito 4% detraibile 50% template_ivacode_pagata
26 IVC4Idet50 template_impcode_pagata_4det50 IVA a credito 4% detraibile 50% (imponibile) template_impcode_pagata
27 IVC20 template_ivacode_pagata_20 IVA a credito 20% template_ivacode_pagata
28 IVC20I template_impcode_pagata_20 IVA a credito 20% (imponibile) template_impcode_pagata
29 IVC21 template_ivacode_pagata_21 IVA a credito 21% template_ivacode_pagata
30 IVC21I template_impcode_pagata_21 IVA a credito 21% (imponibile) template_impcode_pagata
31 IVC4 template_ivacode_pagata_4 IVA a credito 4% template_ivacode_pagata
32 IVC4I template_impcode_pagata_4 IVA a credito 4% (imponibile) template_impcode_pagata
33 IVC12 template_ivacode_pagata_12 IVA a credito 12% template_ivacode_pagata
34 IVC12I template_impcode_pagata_12 IVA a credito 12% (imponibile) template_impcode_pagata
35 IVC2 template_ivacode_pagata_2 IVA a credito 2% template_ivacode_pagata
36 IVC2I template_impcode_pagata_2 IVA a credito 2% (imponibile) template_impcode_pagata
37 IVD template_ivacode_riscossa IVA a debito vat_code_chart_root
38 IVD0 template_ivacode_riscossa_0 Esente IVA (debito) template_ivacode_riscossa
39 IVDI template_impcode_riscossa IVA a debito (imponibile) vat_code_chart_root
40 IVD0I template_impcode_riscossa_0 Esente IVA a debito (imponibile) template_impcode_riscossa
41 IVD10 template_ivacode_riscossa_10 IVA a debito 10% template_ivacode_riscossa
42 IVD10I template_impcode_riscossa_10 IVA a debito 10% (imponibile) template_impcode_riscossa
43 IVD20 template_ivacode_riscossa_20 IVA a debito 20% template_ivacode_riscossa
44 IVD20I template_impcode_riscossa_20 IVA a debito 20% (imponibile) template_impcode_riscossa
45 IVD21 template_ivacode_riscossa_21 IVA a debito 21% template_ivacode_riscossa
46 IVD21I template_impcode_riscossa_21 IVA a debito 21% (imponibile) template_impcode_riscossa
47 IVD4 template_ivacode_riscossa_4 IVA a debito 4% template_ivacode_riscossa
48 IVD4I template_impcode_riscossa_4 IVA a debito 4% (imponibile) template_impcode_riscossa
49 IVD12 template_ivacode_riscossa_12 IVA a debito 12% template_ivacode_riscossa
50 IVD12I template_impcode_riscossa_12 IVA a debito 12% (imponibile) template_impcode_riscossa
51 IVD2 template_ivacode_riscossa_2 IVA a debito 2% template_ivacode_riscossa
52 IVD2I template_impcode_riscossa_2 IVA a debito 2% (imponibile) template_impcode_riscossa
53 IVC21ind template_ivacode_pagata_21ind IVA a credito 21% indetraibile template_ivacode_pagata
54 IVC21Iind template_impcode_pagata_21ind IVA a credito 21% indetraibile (imponibile) template_impcode_pagata
55 IVC21det10 template_ivacode_pagata_21det10 IVA a credito 21% detraibile 10% template_ivacode_pagata
56 IVC21Idet10 template_impcode_pagata_21det10 IVA a credito 21% detraibile 10% (imponibile) template_impcode_pagata
57 IVC21det15 template_ivacode_pagata_21det15 IVA a credito 21% detraibile 15% template_ivacode_pagata
58 IVC21Idet15 template_impcode_pagata_21det15 IVA a credito 21% detraibile 15% (imponibile) template_impcode_pagata
59 IVC21det40 template_ivacode_pagata_21det40 IVA a credito 21% detraibile 40% template_ivacode_pagata
60 IVC21Idet40 template_impcode_pagata_21det40 IVA a credito 21% detraibile 40% (imponibile) template_impcode_pagata
61 IVC21det50 template_ivacode_pagata_21det50 IVA a credito 21% detraibile 50% template_ivacode_pagata
62 IVC21Idet50 template_impcode_pagata_21det50 IVA a credito 21% detraibile 50% (imponibile) template_impcode_pagata
63 Rit template_ra Ritenute d'acconto vat_code_chart_root
64 RitD20 template_ritcode_20 Ritenute a debito 20% template_ra
65 RitD20I template_ritimpcode_20 Ritenute a debito 20% (imponibile) template_ra

1
addons/l10n_it/data/account.tax.template.csv
View File

@ -62,3 +62,4 @@ id,description,chart_template_id:id,name,sequence,amount,parent_id:id,child_depe
21I5,21I5,l10n_it_chart_template_generic,IVA al 21% detraibile al 50%,,0.21,,True,percent,,,purchase,template_impcode_pagata_21det50,,template_impcode_pagata_21det50,,,,False,-1,-1
21I5b,21I5b,l10n_it_chart_template_generic,IVA al 21% detraibile al 50% (I),1,0.5,21I5,False,percent,,,purchase,,,,,,,False,,
21I5a,21I5a,l10n_it_chart_template_generic,IVA al 21% detraibile al 50% (D),2,0,21I5,False,balance,1601,1601,purchase,,template_ivacode_pagata_21det50,,template_ivacode_pagata_21det50,,,False,,
rit-20,rit-20,l10n_it_chart_template_generic,Ritenuta d'acconto al 20% (debito),,-0.2,,False,percent,2602,2602,purchase,template_ritimpcode_20,template_ritcode_20,template_ritimpcode_20,template_ritcode_20,-1,1,False,1,-1

1 id description chart_template_id:id name sequence amount parent_id:id child_depend type account_collected_id:id account_paid_id:id type_tax_use base_code_id:id tax_code_id:id ref_base_code_id:id ref_tax_code_id:id ref_base_sign ref_tax_sign price_include base_sign tax_sign
62 21I5 21I5 l10n_it_chart_template_generic IVA al 21% detraibile al 50% 0.21 True percent purchase template_impcode_pagata_21det50 template_impcode_pagata_21det50 False -1 -1
63 21I5b 21I5b l10n_it_chart_template_generic IVA al 21% detraibile al 50% (I) 1 0.5 21I5 False percent purchase False
64 21I5a 21I5a l10n_it_chart_template_generic IVA al 21% detraibile al 50% (D) 2 0 21I5 False balance 1601 1601 purchase template_ivacode_pagata_21det50 template_ivacode_pagata_21det50 False
65 rit-20 rit-20 l10n_it_chart_template_generic Ritenuta d'acconto al 20% (debito) -0.2 False percent 2602 2602 purchase template_ritimpcode_20 template_ritcode_20 template_ritimpcode_20 template_ritcode_20 -1 1 False 1 -1

2
addons/mail/mail_message.py
View File

@ -157,7 +157,7 @@ class mail_message(osv.osv):
msg_txt += truncate_text(message.body_text)
else:
msg_txt = (message.user_id.name or '/') + _(' on ') + format_date_tz(message.date, tz) + ':\n\t'
msg_txt += message.subject
msg_txt += (message.subject or '')
result[message.id] = msg_txt
return result

4
addons/mail/wizard/mail_compose_message.py
View File

@ -147,13 +147,13 @@ class mail_compose_message(osv.osv_memory):
# as it is easier to quote than the HTML version.
# XXX TODO: make it possible to switch to HTML on the fly
current_user = self.pool.get('res.users').browse(cr, uid, uid, context)
body = message_data.body_text or current_user.signature
body = message_data.body_text or current_user.signature or ''
if context.get('mail.compose.message.mode') == 'reply':
sent_date = _('On %(date)s, ') % {'date': message_data.date} if message_data.date else ''
sender = _('%(sender_name)s wrote:') % {'sender_name': tools.ustr(message_data.email_from or _('You'))}
quoted_body = '> %s' % tools.ustr(body.replace('\n', "\n> ") or '')
body = '\n'.join(["\n", (sent_date + sender), quoted_body])
body += "\n" + current_user.signature
body += "\n" + (current_user.signature or '')
re_prefix = _("Re:")
if not (subject.startswith('Re:') or subject.startswith(re_prefix)):
subject = "%s %s" % (re_prefix, subject)

3
addons/point_of_sale/__openerp__.py
View File

@ -83,6 +83,7 @@ Main features :
'certificate' : '001156338024966477869',
# Web client
'js': ['static/lib/backbone/backbone-0.5.3.js', 'static/src/js/pos.js'],
'css': ['static/src/css/pos.css']
'css': ['static/src/css/pos.css'],
'qweb': ['static/src/xml/pos.xml'],
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

1
addons/point_of_sale/static/src/js/pos.js
View File

@ -19,7 +19,6 @@ openerp.point_of_sale = function(db) {
};
var QWeb = db.web.qweb;
QWeb.add_template("/point_of_sale/static/src/xml/pos.xml");
var qweb_template = function(template) {
return function(ctx) {
return QWeb.render(template, _.extend({}, ctx,{