Vo Minh Thu (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-warning-clean-vmt into
lp:openobject-addons.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-warning-clean-vmt/+merge/84739
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-warning-clean-vmt/+merge/84739
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-warning-clean-vmt.
=== modified file 'account/account.py'
--- account/account.py 2011-11-30 14:06:20 +0000
+++ account/account.py 2011-12-07 11:17:27 +0000
@@ -1223,7 +1223,7 @@
'period_id': fields.many2one('account.period', 'Period', required=True, states={'posted':[('readonly',True)]}),
'journal_id': fields.many2one('account.journal', 'Journal', required=True, states={'posted':[('readonly',True)]}),
'state': fields.selection([('draft','Unposted'), ('posted','Posted')], 'State', required=True, readonly=True,
- help='All manually created new journal entry are usually in the state \'Unposted\', but you can set the option to skip that state on the related journal. In that case, they will be behave as journal entries automatically created by the system on document validation (invoices, bank statements...) and will be created in \'Posted\' state.'),
+ help='All manually created new journal entries are usually in the state \'Unposted\', but you can set the option to skip that state on the related journal. In that case, they will be behave as journal entries automatically created by the system on document validation (invoices, bank statements...) and will be created in \'Posted\' state.'),
'line_id': fields.one2many('account.move.line', 'move_id', 'Entries', states={'posted':[('readonly',True)]}),
'to_check': fields.boolean('To Review', help='Check this box if you are unsure of that journal entry and if you want to note it as \'to be reviewed\' by an accounting expert.'),
'partner_id': fields.related('line_id', 'partner_id', type="many2one", relation="res.partner", string="Partner", store=True),
@@ -3154,7 +3154,7 @@
'type': line.account_type == 'cash' and 'cash' or 'bank',
'company_id': company_id,
'analytic_journal_id': False,
- 'currency_id': False,
+ 'currency': False,
}
if line.currency_id:
vals_journal['view_id'] = view_id_cur
=== modified file 'account/account_bank.py'
--- account/account_bank.py 2011-11-22 08:51:38 +0000
+++ account/account_bank.py 2011-12-07 11:17:27 +0000
@@ -99,7 +99,6 @@
'type': 'bank',
'company_id': bank.company_id.id,
'analytic_journal_id': False,
- 'currency_id': False,
'default_credit_account_id': acc_bank_id,
'default_debit_account_id': acc_bank_id,
'view_id': view_id_cash
=== modified file 'account/account_invoice.py'
--- account/account_invoice.py 2011-11-30 15:51:56 +0000
+++ account/account_invoice.py 2011-12-07 11:17:27 +0000
@@ -923,7 +923,6 @@
'line_id': line,
'journal_id': journal_id,
'date': date,
- 'type': entry_type,
'narration':inv.comment
}
period_id = inv.period_id and inv.period_id.id or False
@@ -1081,7 +1080,8 @@
del line['invoice_id']
for field in ('company_id', 'partner_id', 'account_id', 'product_id',
'uos_id', 'account_analytic_id', 'tax_code_id', 'base_code_id'):
- line[field] = line.get(field, False) and line[field][0]
+ if line.get(field):
+ line[field] = line[field][0]
if 'invoice_line_tax_id' in line:
line['invoice_line_tax_id'] = [(6,0, line.get('invoice_line_tax_id', [])) ]
return map(lambda x: (0,0,x), lines)
@@ -1209,7 +1209,7 @@
l2['name'] = name
lines = [(0, 0, l1), (0, 0, l2)]
- move = {'ref': ref, 'line_id': lines, 'journal_id': pay_journal_id, 'period_id': period_id, 'date': date, 'type': entry_type}
+ move = {'ref': ref, 'line_id': lines, 'journal_id': pay_journal_id, 'period_id': period_id, 'date': date}
move_id = self.pool.get('account.move').create(cr, uid, move, context=context)
line_ids = []
=== modified file 'anonymization/security/ir.model.access.csv'
--- anonymization/security/ir.model.access.csv 2011-01-07 15:31:06 +0000
+++ anonymization/security/ir.model.access.csv 2011-12-07 11:17:27 +0000
@@ -3,5 +3,3 @@
"access_ir_model_fields_anonymization_user","ir_model_fields_anonymization user","model_ir_model_fields_anonymization",,1,0,0,0
"access_ir_model_fields_anonymization_history_group_system","ir_model_fields_anonymization_history group_user","model_ir_model_fields_anonymization_history","base.group_system",1,1,1,1
"access_ir_model_fields_anonymization_history_user","ir_model_fields_anonymization_history user","model_ir_model_fields_anonymization_history",,1,0,0,0
-"access_ir_model_fields_anonymize_wizard_group_system","ir_model_fields_anonymize_wizard group_user","model_ir_model_fields_anonymize_wizard","base.group_system",1,1,1,1
-"access_ir_model_fields_anonymize_wizard_user","ir_model_fields_anonymize_wizard user","model_ir_model_fields_anonymize_wizard",,1,0,0,0
=== modified file 'base_report_creator/security/ir.model.access.csv'
--- base_report_creator/security/ir.model.access.csv 2011-01-14 00:11:01 +0000
+++ base_report_creator/security/ir.model.access.csv 2011-12-07 11:17:27 +0000
@@ -2,3 +2,4 @@
"access_base_report_creator_report","base_report_creator.report","model_base_report_creator_report","base.group_system",1,1,1,1
"access_base_report_creator_report_fields","base_report_creator.report.fields","model_base_report_creator_report_fields","base.group_system",1,1,1,1
"access_base_report_creator_report_filter","base_report_creator.report.filter","model_base_report_creator_report_filter","base.group_system",1,1,1,1
+"access_base_report_creator_report_result","base_report_creator.report.result","model_base_report_creator_report_result","base.group_system",1,1,1,1
=== modified file 'email_template/security/ir.model.access.csv'
--- email_template/security/ir.model.access.csv 2011-02-03 11:28:31 +0000
+++ email_template/security/ir.model.access.csv 2011-12-07 11:17:27 +0000
@@ -2,3 +2,4 @@
"access_email_template","email.template","model_email_template",,1,0,0,0
"access_email_template_system","email.template system","model_email_template","base.group_system",1,1,1,1
"access_email_template_manager","email.template","model_email_template",,1,1,1,1
+"access_email_template_preview_system","email.template.preview system","model_email_template_preview","base.group_system",1,1,1,1
=== modified file 'hr_holidays/hr_holidays.py'
--- hr_holidays/hr_holidays.py 2011-11-14 12:22:44 +0000
+++ hr_holidays/hr_holidays.py 2011-12-07 11:17:27 +0000
@@ -262,7 +262,7 @@
'name': record.name,
'categ_id': record.holiday_status_id.categ_id.id,
'duration': record.number_of_days_temp * 8,
- 'note': record.notes,
+ 'description': record.notes,
'user_id': record.user_id.id,
'date': record.date_from,
'end_date': record.date_to,
=== modified file 'hr_payroll/hr_payroll_demo.xml'
--- hr_payroll/hr_payroll_demo.xml 2011-09-15 13:01:51 +0000
+++ hr_payroll/hr_payroll_demo.xml 2011-12-07 11:17:27 +0000
@@ -146,7 +146,7 @@
<field name="employee_id" ref="hr_employee_bonamy0"/>
<field name="notes">Default contract for marketing executives</field>
<field eval="4000.0" name="wage"/>
- <field eval="5" name="working_days_per_week"/>
+ <field name="working_hours" ref="resource.timesheet_group1"/>
</record>
<record id="hr_contract_quentin_paolino" model="hr.contract">
@@ -158,7 +158,6 @@
<field name="employee_id" ref="hr.employee2"/>
<field name="notes">This is Quentin Paolino's contract</field>
<field eval="5000.0" name="wage"/>
- <field eval="5" name="working_days_per_week"/>
<field name="working_hours" ref="resource.timesheet_group1"/>
</record>
=== modified file 'hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml'
--- hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml 2011-11-16 14:59:58 +0000
+++ hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml 2011-12-07 11:17:27 +0000
@@ -13,7 +13,6 @@
<record model="ir.values" id="hr_timesheet_invoice_create_final_values">
<field name="model_id" ref="model_account_analytic_account" />
- <field name="object" eval="1" />
<field name="name">Invoice</field>
<field name="key2">client_action_multi</field>
<field name="value" eval="'ir.actions.act_window,' + str(ref('action_hr_timesheet_invoice_create_final'))" />
=== modified file 'import_sugarcrm/__openerp__.py'
--- import_sugarcrm/__openerp__.py 2011-11-09 18:12:56 +0000
+++ import_sugarcrm/__openerp__.py 2011-12-07 11:17:27 +0000
@@ -28,10 +28,12 @@
'author': 'OpenERP SA',
'website': 'http://www.openerp.com',
'depends': ['import_base','crm', 'document'],
- 'init_xml': [],
- 'update_xml': ["wizard/import_message_view.xml",
- "import_sugarcrm_view.xml"],
- 'demo_xml': [],
+ 'data': [
+ "wizard/import_message_view.xml",
+ "import_sugarcrm_view.xml",
+ "security/ir.model.access.csv",
+ ],
+ 'demo': [],
'test': [],
'installable': True,
'active': False,
=== added directory 'import_sugarcrm/security'
=== added file 'import_sugarcrm/security/ir.model.access.csv'
--- import_sugarcrm/security/ir.model.access.csv 1970-01-01 00:00:00 +0000
+++ import_sugarcrm/security/ir.model.access.csv 2011-12-07 11:17:27 +0000
@@ -0,0 +1,3 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_import_sugarcrm_system","import.sugarcrm system","model_import_sugarcrm","base.group_system",1,1,1,1
+"access_import_message_system","import.message system","model_import_message","base.group_system",1,1,1,1
=== modified file 'l10n_be_hr_payroll/l10n_be_hr_payroll_data.xml'
--- l10n_be_hr_payroll/l10n_be_hr_payroll_data.xml 2011-10-16 01:28:00 +0000
+++ l10n_be_hr_payroll/l10n_be_hr_payroll_data.xml 2011-12-07 11:17:27 +0000
@@ -165,7 +165,7 @@
<field name="code">car</field>
<field name="amount_select">fix</field>
<field name="sequence">15</field>
- <field name="condtion_select">none</field>
+ <field name="condition_select">none</field>
<field name="appears_on_payslip" eval="False"/>
</record>
<record id="hr_payroll_rules_parent_company_car" model="hr.salary.rule">
@@ -266,7 +266,7 @@
<field name="sequence">165</field>
<field name="condition_select">python</field>
<field name="condition_python">result = bool(contract.insurance_employee_deduction)</field>
- <field name="amount_pyton_compute">result = -contract.insurance_employee_deduction</field>
+ <field name="amount_python_compute">result = -contract.insurance_employee_deduction</field>
</record>
<record id="hr_payroll_rules_advantage" model="hr.salary.rule">
<field name="category_id" ref="hr_payroll.ALW"/>
=== modified file 'l10n_br/data/account_tax_template.xml'
--- l10n_br/data/account_tax_template.xml 2011-10-03 13:32:03 +0000
+++ l10n_br/data/account_tax_template.xml 2011-12-07 11:17:27 +0000
@@ -5,7 +5,6 @@
<record id="tax_template_1" model="account.tax.template">
<field name="description">IPI</field>
<field name="name">IPI</field>
- <field name="tax_group">vat</field>
<field name="amount">0.00</field>
<field ref="account_template_244" name="account_collected_id"/>
<field ref="account_template_44" name="account_paid_id"/>
@@ -21,7 +20,6 @@
<record id="tax_template_3" model="account.tax.template">
<field name="description">IPI 2%</field>
<field name="name">IPI 2%</field>
- <field name="tax_group">vat</field>
<field name="amount">0.02</field>
<field ref="account_template_244" name="account_collected_id"/>
<field ref="account_template_44" name="account_paid_id"/>
@@ -37,7 +35,6 @@
<record id="tax_template_4" model="account.tax.template">
<field name="description">IPI 3%</field>
<field name="name">IPI 3%</field>
- <field name="tax_group">vat</field>
<field name="amount">0.03</field>
<field ref="account_template_244" name="account_collected_id"/>
<field ref="account_template_44" name="account_paid_id"/>
@@ -53,7 +50,6 @@
<record id="tax_template_5" model="account.tax.template">
<field name="description">IPI 4%</field>
<field name="name">IPI 4%</field>
- <field name="tax_group">vat</field>
<field name="amount">0.04</field>
<field ref="account_template_244" name="account_collected_id"/>
<field ref="account_template_44" name="account_paid_id"/>
@@ -69,7 +65,6 @@
<record id="tax_template_6" model="account.tax.template">
<field name="description">IPI 5%</field>
<field name="name">IPI 5%</field>
- <field name="tax_group">vat</field>
<field name="amount">0.05</field>
<field ref="account_template_244" name="account_collected_id"/>
<field ref="account_template_44" name="account_paid_id"/>
@@ -85,7 +80,6 @@
<record id="tax_template_7" model="account.tax.template">
<field name="description">IPI 7%</field>
<field name="name">IPI 7%</field>
- <field name="tax_group">vat</field>
<field name="amount">0.07</field>
<field ref="account_template_244" name="account_collected_id"/>
<field ref="account_template_44" name="account_paid_id"/>
@@ -101,7 +95,6 @@
<record id="tax_template_8" model="account.tax.template">
<field name="description">IPI 8%</field>
<field name="name">IPI 8%</field>
- <field name="tax_group">vat</field>
<field name="amount">0.08</field>
<field ref="account_template_244" name="account_collected_id"/>
<field ref="account_template_44" name="account_paid_id"/>
@@ -117,7 +110,6 @@
<record id="tax_template_9" model="account.tax.template">
<field name="description">IPI 10%</field>
<field name="name">IPI 10%</field>
- <field name="tax_group">vat</field>
<field name="amount">0.10</field>
<field ref="account_template_244" name="account_collected_id"/>
<field ref="account_template_44" name="account_paid_id"/>
@@ -133,7 +125,6 @@
<record id="tax_template_10" model="account.tax.template">
<field name="description">IPI 12%</field>
<field name="name">IPI 12%</field>
- <field name="tax_group">vat</field>
<field name="amount">0.12</field>
<field ref="account_template_244" name="account_collected_id"/>
<field ref="account_template_44" name="account_paid_id"/>
@@ -149,7 +140,6 @@
<record id="tax_template_11" model="account.tax.template">
<field name="description">IPI 13%</field>
<field name="name">IPI 13%</field>
- <field name="tax_group">vat</field>
<field name="amount">0.13</field>
<field ref="account_template_244" name="account_collected_id"/>
<field ref="account_template_44" name="account_paid_id"/>
@@ -165,7 +155,6 @@
<record id="tax_template_12" model="account.tax.template">
<field name="description">IPI 15%</field>
<field name="name">IPI 15%</field>
- <field name="tax_group">vat</field>
<field name="amount">0.15</field>
<field ref="account_template_244" name="account_collected_id"/>
<field ref="account_template_44" name="account_paid_id"/>
@@ -181,7 +170,6 @@
<record id="tax_template_13" model="account.tax.template">
<field name="description">IPI 16%</field>
<field name="name">IPI 16%</field>
- <field name="tax_group">vat</field>
<field name="amount">0.16</field>
<field ref="account_template_244" name="account_collected_id"/>
<field ref="account_template_44" name="account_paid_id"/>
@@ -197,7 +185,6 @@
<record id="tax_template_14" model="account.tax.template">
<field name="description">IPI 18%</field>
<field name="name">IPI 18%</field>
- <field name="tax_group">vat</field>
<field name="amount">0.18</field>
<field ref="account_template_244" name="account_collected_id"/>
<field ref="account_template_44" name="account_paid_id"/>
@@ -213,7 +200,6 @@
<record id="tax_template_15" model="account.tax.template">
<field name="description">IPI 20%</field>
<field name="name">IPI 20%</field>
- <field name="tax_group">vat</field>
<field name="amount">0.20</field>
<field ref="account_template_244" name="account_collected_id"/>
<field ref="account_template_44" name="account_paid_id"/>
@@ -229,7 +215,6 @@
<record id="tax_template_16" model="account.tax.template">
<field name="description">IPI 22%</field>
<field name="name">IPI 22%</field>
- <field name="tax_group">vat</field>
<field name="amount">0.22</field>
<field ref="account_template_244" name="account_collected_id"/>
<field ref="account_template_44" name="account_paid_id"/>
@@ -245,7 +230,6 @@
<record id="tax_template_17" model="account.tax.template">
<field name="description">IPI 25%</field>
<field name="name">IPI 25%</field>
- <field name="tax_group">vat</field>
<field name="amount">0.25</field>
<field ref="account_template_244" name="account_collected_id"/>
<field ref="account_template_44" name="account_paid_id"/>
@@ -261,7 +245,6 @@
<record id="tax_template_18" model="account.tax.template">
<field name="description">IPI 27%</field>
<field name="name">IPI 27%</field>
- <field name="tax_group">vat</field>
<field name="amount">0.27</field>
<field ref="account_template_244" name="account_collected_id"/>
<field ref="account_template_44" name="account_paid_id"/>
@@ -277,7 +260,6 @@
<record id="tax_template_19" model="account.tax.template">
<field name="description">IPI 30%</field>
<field name="name">IPI 30%</field>
- <field name="tax_group">vat</field>
<field name="amount">0.30</field>
<field ref="account_template_244" name="account_collected_id"/>
<field ref="account_template_44" name="account_paid_id"/>
@@ -293,7 +275,6 @@
<record id="tax_template_20" model="account.tax.template">
<field name="description">IPI 35%</field>
<field name="name">IPI 35%</field>
- <field name="tax_group">vat</field>
<field name="amount">0.35</field>
<field ref="account_template_244" name="account_collected_id"/>
<field ref="account_template_44" name="account_paid_id"/>
@@ -309,7 +290,6 @@
<record id="tax_template_21" model="account.tax.template">
<field name="description">IPI 40%</field>
<field name="name">IPI 40%</field>
- <field name="tax_group">vat</field>
<field name="amount">0.40</field>
<field ref="account_template_244" name="account_collected_id"/>
<field ref="account_template_44" name="account_paid_id"/>
@@ -325,7 +305,6 @@
<record id="tax_template_22" model="account.tax.template">
<field name="description">IPI 42%</field>
<field name="name">IPI 42%</field>
- <field name="tax_group">vat</field>
<field name="amount">0.42</field>
<field ref="account_template_244" name="account_collected_id"/>
<field ref="account_template_44" name="account_paid_id"/>
@@ -341,7 +320,6 @@
<record id="tax_template_23" model="account.tax.template">
<field name="description">IPI 45%</field>
<field name="name">IPI 45%</field>
- <field name="tax_group">vat</field>
<field name="amount">0.45</field>
<field ref="account_template_244" name="account_collected_id"/>
<field ref="account_template_44" name="account_paid_id"/>
@@ -357,7 +335,6 @@
<record id="tax_template_24" model="account.tax.template">
<field name="description">IPI 50%</field>
<field name="name">IPI 50%</field>
- <field name="tax_group">vat</field>
<field name="amount">0.50</field>
<field ref="account_template_244" name="account_collected_id"/>
<field ref="account_template_44" name="account_paid_id"/>
@@ -373,7 +350,6 @@
<record id="tax_template_25" model="account.tax.template">
<field name="description">IPI 60%</field>
<field name="name">IPI 60%</field>
- <field name="tax_group">vat</field>
<field name="amount">0.60</field>
<field ref="account_template_244" name="account_collected_id"/>
<field ref="account_template_44" name="account_paid_id"/>
@@ -389,7 +365,6 @@
<record id="tax_template_26" model="account.tax.template">
<field name="description">IPI 330%</field>
<field name="name">IPI 330%</field>
- <field name="tax_group">vat</field>
<field name="amount">3.30</field>
<field ref="account_template_244" name="account_collected_id"/>
<field ref="account_template_44" name="account_paid_id"/>
@@ -405,7 +380,6 @@
<record id="tax_template_27" model="account.tax.template">
<field name="description">ICMS Interno</field>
<field name="name">ICMS Interno</field>
- <field name="tax_group">vat</field>
<field name="amount">0.00</field>
<field ref="account_template_241" name="account_collected_id"/>
<field ref="account_template_42" name="account_paid_id"/>
@@ -421,7 +395,6 @@
<record id="tax_template_28" model="account.tax.template">
<field name="description">ICMS Externo</field>
<field name="name">ICMS Externo</field>
- <field name="tax_group">vat</field>
<field name="amount">0.00</field>
<field ref="account_template_241" name="account_collected_id"/>
<field ref="account_template_42" name="account_paid_id"/>
@@ -437,7 +410,6 @@
<record id="tax_template_29" model="account.tax.template">
<field name="description">ICMS Subist</field>
<field name="name">ICMS Subist</field>
- <field name="tax_group">vat</field>
<field name="amount">0.00</field>
<field eval="0" name="price_include"/>
<field eval="0" name="tax_discount"/>
@@ -451,7 +423,6 @@
<record id="tax_template_30" model="account.tax.template">
<field name="description">ICMS Externo 7%</field>
<field name="name">ICMS Externo 7%</field>
- <field name="tax_group">vat</field>
<field name="amount">0.07</field>
<field ref="account_template_241" name="account_collected_id"/>
<field ref="account_template_42" name="account_paid_id"/>
@@ -467,7 +438,6 @@
<record id="tax_template_31" model="account.tax.template">
<field name="description">ICMS Externo 12%</field>
<field name="name">ICMS Externo 12%</field>
- <field name="tax_group">vat</field>
<field name="amount">0.12</field>
<field ref="account_template_241" name="account_collected_id"/>
<field ref="account_template_42" name="account_paid_id"/>
@@ -483,7 +453,6 @@
<record id="tax_template_32" model="account.tax.template">
<field name="description">ICMS Interno 19%</field>
<field name="name">ICMS Interno 19%</field>
- <field name="tax_group">vat</field>
<field name="amount">0.19</field>
<field ref="account_template_241" name="account_collected_id"/>
<field ref="account_template_42" name="account_paid_id"/>
@@ -499,7 +468,6 @@
<record id="tax_template_33" model="account.tax.template">
<field name="description">ICMS Interno 26%</field>
<field name="name">ICMS Interno 26%</field>
- <field name="tax_group">vat</field>
<field name="amount">0.26</field>
<field ref="account_template_241" name="account_collected_id"/>
<field ref="account_template_42" name="account_paid_id"/>
@@ -515,7 +483,6 @@
<record id="tax_template_34" model="account.tax.template">
<field name="description">PIS</field>
<field name="name">PIS</field>
- <field name="tax_group">vat</field>
<field name="amount">0.00</field>
<field ref="account_template_243" name="account_collected_id"/>
<field ref="account_template_49" name="account_paid_id"/>
@@ -531,7 +498,6 @@
<record id="tax_template_35" model="account.tax.template">
<field name="description">PIS 0,65%</field>
<field name="name">PIS 0,65%</field>
- <field name="tax_group">vat</field>
<field name="amount">0.0065</field>
<field ref="account_template_243" name="account_collected_id"/>
<field ref="account_template_49" name="account_paid_id"/>
@@ -547,7 +513,6 @@
<record id="tax_template_36" model="account.tax.template">
<field name="description">COFINS</field>
<field name="name">COFINS</field>
- <field name="tax_group">vat</field>
<field name="amount">0.00</field>
<field ref="account_template_242" name="account_collected_id"/>
<field ref="account_template_39" name="account_paid_id"/>
@@ -563,7 +528,6 @@
<record id="tax_template_37" model="account.tax.template">
<field name="description">COFINS 3%</field>
<field name="name">COFINS 3%</field>
- <field name="tax_group">vat</field>
<field name="amount">0.03</field>
<field ref="account_template_242" name="account_collected_id"/>
<field ref="account_template_39" name="account_paid_id"/>
@@ -579,7 +543,6 @@
<record id="tax_template_38" model="account.tax.template">
<field name="description">IRPJ</field>
<field name="name">IRPJ</field>
- <field name="tax_group">vat</field>
<field name="amount">0.00</field>
<field eval="0" name="price_include"/>
<field eval="1" name="tax_discount"/>
@@ -593,7 +556,6 @@
<record id="tax_template_39" model="account.tax.template">
<field name="description">IR</field>
<field name="name">IR</field>
- <field name="tax_group">vat</field>
<field name="amount">0.00</field>
<field eval="0" name="price_include"/>
<field eval="1" name="tax_discount"/>
@@ -607,7 +569,6 @@
<record id="tax_template_40" model="account.tax.template">
<field name="description">ISS</field>
<field name="name">ISS</field>
- <field name="tax_group">vat</field>
<field name="amount">0.00</field>
<field eval="0" name="price_include"/>
<field eval="1" name="tax_discount"/>
@@ -621,7 +582,6 @@
<record id="tax_template_41" model="account.tax.template">
<field name="description">ISS 1%</field>
<field name="name">ISS 1%</field>
- <field name="tax_group">vat</field>
<field name="amount">0.01</field>
<field eval="0" name="price_include"/>
<field eval="1" name="tax_discount"/>
@@ -635,7 +595,6 @@
<record id="tax_template_42" model="account.tax.template">
<field name="description">ISS 2%</field>
<field name="name">ISS 2%</field>
- <field name="tax_group">vat</field>
<field name="amount">0.02</field>
<field eval="0" name="price_include"/>
<field eval="1" name="tax_discount"/>
@@ -649,7 +608,6 @@
<record id="tax_template_43" model="account.tax.template">
<field name="description">ISS 3%</field>
<field name="name">ISS 3%</field>
- <field name="tax_group">vat</field>
<field name="amount">0.03</field>
<field eval="0" name="price_include"/>
<field eval="1" name="tax_discount"/>
@@ -663,7 +621,6 @@
<record id="tax_template_44" model="account.tax.template">
<field name="description">ISS 4%</field>
<field name="name">ISS 4%</field>
- <field name="tax_group">vat</field>
<field name="amount">0.04</field>
<field eval="0" name="price_include"/>
<field eval="1" name="tax_discount"/>
@@ -677,7 +634,6 @@
<record id="tax_template_45" model="account.tax.template">
<field name="description">ISS 5%</field>
<field name="name">ISS 5%</field>
- <field name="tax_group">vat</field>
<field name="amount">0.05</field>
<field eval="0" name="price_include"/>
<field eval="1" name="tax_discount"/>
@@ -691,7 +647,6 @@
<record id="tax_template_46" model="account.tax.template">
<field name="description">CSLL</field>
<field name="name">CSLL</field>
- <field name="tax_group">vat</field>
<field name="amount">0.00</field>
<field eval="0" name="price_include"/>
<field eval="1" name="tax_discount"/>
@@ -703,4 +658,4 @@
</record>
</data>
-</openerp>
\ No newline at end of file
+</openerp>
=== modified file 'l10n_br/data/l10n_br_account_chart_template.xml'
--- l10n_br/data/l10n_br_account_chart_template.xml 2011-10-03 13:32:03 +0000
+++ l10n_br/data/l10n_br_account_chart_template.xml 2011-12-07 11:17:27 +0000
@@ -19,7 +19,7 @@
This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template.</field>
<field name="action_id" ref="account.action_wizard_multi_chart"/>
<field name="state">open</field>
- <field name="restart">onskip</field>
+ <field name="type">once</field>
</record>
</data>
=== modified file 'l10n_ch/bank_view.xml'
--- l10n_ch/bank_view.xml 2011-11-29 15:03:45 +0000
+++ l10n_ch/bank_view.xml 2011-12-07 11:17:27 +0000
@@ -6,7 +6,6 @@
<field name="name">res.bank.form</field>
<field name="model">res.bank</field>
<field name="type">form</field>
- <field name="sequence" eval="9" />
<field name="inherit_id" ref="base.view_res_bank_form"/>
<field name="arch" type="xml">
<field name="name" position="after">
@@ -23,7 +22,6 @@
<field name="name">res.bank.tree</field>
<field name="model">res.bank</field>
<field name="type">tree</field>
- <field name="sequence" eval="9" />
<field name="inherit_id" ref="base.view_res_bank_tree"/>
<field name="arch" type="xml">
<field name="name" position="after">
@@ -40,7 +38,6 @@
<field name="name">res.partner_bank.form.hide.f1</field>
<field name="model">res.partner</field>
<field name="type">form</field>
- <field name="sequence" eval="9" />
<field name="inherit_id" ref="account.view_partner_property_form"/>
<field name="arch" type="xml">
<field name="acc_number" position="replace">
@@ -51,7 +48,6 @@
<field name="name">res.partner_bank.form.hide.f2</field>
<field name="model">res.partner</field>
<field name="type">form</field>
- <field name="sequence" eval="9" />
<field name="inherit_id" ref="account.view_partner_property_form"/>
<field name="arch" type="xml">
<field name="bank" position="replace">
@@ -63,7 +59,6 @@
<field name="name">res.partner_bank.form.hide.f2</field>
<field name="model">res.partner</field>
<field name="type">form</field>
- <field name="sequence" eval="10" />
<field name="inherit_id" ref="account.view_partner_property_form"/>
<field name="arch" type="xml">
<field name="state" position="after">
@@ -94,7 +89,6 @@
<field name="name">res.partner_bank.form.hide.acc_number.frominvoice</field>
<field name="model">res.partner.bank</field>
<field name="type">form</field>
- <field name="sequence" eval="9" />
<field name="inherit_id" ref="base.view_partner_bank_form"/>
<field name="arch" type="xml">
<field name="acc_number" position="replace">
@@ -106,7 +100,6 @@
<field name="name">res.partner_bank.form.hide.bank.frominvoice</field>
<field name="model">res.partner.bank</field>
<field name="type">form</field>
- <field name="sequence" eval="9" />
<field name="inherit_id" ref="base.view_partner_bank_form"/>
<field name="arch" type="xml">
<field name="bank" position="replace">
@@ -118,7 +111,6 @@
<field name="name">res.partner_bank.form.hide.frominvoice</field>
<field name="model">res.partner.bank</field>
<field name="type">form</field>
- <field name="sequence" eval="10"/>
<field name="inherit_id" ref="base.view_partner_bank_form"/>
<field name="arch" type="xml">
<field name="state" position="after">
=== modified file 'l10n_ch/sterchi_chart/account.xml'
--- l10n_ch/sterchi_chart/account.xml 2011-11-24 08:30:28 +0000
+++ l10n_ch/sterchi_chart/account.xml 2011-12-07 11:17:27 +0000
@@ -177,14 +177,12 @@
<record model="account.account.type" id="account_type_receivable">
<field name="name">Bilan : Debiteurs</field>
<field name="code">receivable</field>
- <field name="partner_account">True</field>
<field name="close_method">unreconciled</field>
<field name="report_type">none</field>
</record>
<record model="account.account.type" id="account_type_payable">
<field name="name">Bilan : Fournisseurs</field>
<field name="code">payable</field>
- <field name="partner_account">True</field>
<field name="close_method">unreconciled</field>
<field name="report_type">none</field>
</record>
=== modified file 'l10n_cr/data/account_tax_template.xml'
--- l10n_cr/data/account_tax_template.xml 2011-01-14 00:11:01 +0000
+++ l10n_cr/data/account_tax_template.xml 2011-12-07 11:17:27 +0000
@@ -11,7 +11,6 @@
<field name="sequence">10</field>
<field name="amount">13</field>
<field name="type">percent</field>
- <!-- <field name="tax_group">vat</field> -->
<field name="type_tax_use">all</field>
<field name="applicable_type">true</field>
<field name="child_depend" eval="False"/>
@@ -34,7 +33,6 @@
<field name="sequence">10</field>
<field name="amount">13</field>
<field name="type">percent</field>
- <!-- <field name="tax_group">vat</field> -->
<field name="type_tax_use">all</field>
<field name="applicable_type">true</field>
<field name="child_depend" eval="False"/>
=== modified file 'l10n_gt/l10n_gt_base.xml'
--- l10n_gt/l10n_gt_base.xml 2011-07-29 14:03:24 +0000
+++ l10n_gt/l10n_gt_base.xml 2011-12-07 11:17:27 +0000
@@ -16,7 +16,6 @@
<record id="GTQ" model="res.currency">
<field name="name">GTQ</field>
- <field name="code">GTQ</field>
<field name="symbol">Q</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
=== modified file 'l10n_uk/l10n_uk_wizard.xml'
--- l10n_uk/l10n_uk_wizard.xml 2011-09-16 14:01:34 +0000
+++ l10n_uk/l10n_uk_wizard.xml 2011-12-07 11:17:27 +0000
@@ -34,7 +34,7 @@
<record id="l10n_uk_latest_wizard_id" model="ir.actions.todo">
<field name="action_id" ref="action_wizard_multi_chart_uk"/>
<field name="sequence">10</field>
- <field name="restart">onskip</field>
+ <field name="type">once</field>
<field name="state">open</field>
</record>
=== modified file 'marketing_campaign_crm_demo/marketing_campaign_demo.xml'
--- marketing_campaign_crm_demo/marketing_campaign_demo.xml 2011-01-14 00:11:01 +0000
+++ marketing_campaign_crm_demo/marketing_campaign_demo.xml 2011-12-07 11:17:27 +0000
@@ -34,137 +34,113 @@
<!-- Email tempalte -->
<record id="email_template_1" model="email.template">
- <field name="def_subject">Thanks for showing interest in OpenERP</field>
- <field name="def_to">[email protected]</field>
- <field eval="[(6,0,[])]" name="allowed_groups"/>
+ <field name="subject">Thanks for showing interest in OpenERP</field>
+ <field name="email_to">[email protected]</field>
<field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For OpenERP OnDemand Free Trial 2010 Mail Form')]"/>
<field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
- <field name="object_name" ref="crm.model_crm_lead"/>
- <field eval="0" name="use_sign"/>
- <field name="def_body_text">Hello,Thanks for generous interest you have shown in the openERP.Regards,OpenERP Team,</field>
- <field name="template_language">mako</field>
+ <field name="model_id" ref="crm.model_crm_lead"/>
+ <field eval="0" name="user_signature"/>
+ <field name="body_text">Hello,Thanks for generous interest you have shown in the openERP.Regards,OpenERP Team,</field>
<field name="name">For OpenERP OnDemand Free Trial 2010</field>
- <field name="model_int_name">crm.lead</field>
</record>
<record id="email_template_2" model="email.template">
- <field name="def_subject">Propose to subscribe to the OpenERP Discovery Day on May 2010</field>
- <field name="def_to">[email protected]</field>
- <field eval="[(6,0,[])]" name="allowed_groups"/>
+ <field name="subject">Propose to subscribe to the OpenERP Discovery Day on May 2010</field>
+ <field name="email_to">[email protected]</field>
<field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For OpenERP OnDemand Free Trial 2010 Mail Form')]"/>
<field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
- <field name="object_name" ref="crm.model_crm_lead"/>
- <field eval="0" name="use_sign"/>
- <field name="def_body_text">Hello,We have very good offer that might suit you.
+ <field name="model_id" ref="crm.model_crm_lead"/>
+ <field eval="0" name="user_signature"/>
+ <field name="body_text">Hello,We have very good offer that might suit you.
We propose you to subscribe to the OpenERP Discovery Day on May 2010.
If any further information required kindly revert back.
We really appreciate your co-operation on this.
Regards,OpenERP Team,</field>
- <field name="template_language">mako</field>
<field name="name">For OpenERP Discovery Day on May 2010</field>
- <field name="model_int_name">crm.lead</field>
</record>
<record id="email_template_3" model="email.template">
- <field name="def_subject">Thanks for subscribing to the OpenERP Discovery Day</field>
- <field name="def_to">[email protected]</field>
- <field eval="[(6,0,[])]" name="allowed_groups"/>
+ <field name="subject">Thanks for subscribing to the OpenERP Discovery Day</field>
+ <field name="email_to">[email protected]</field>
<field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For OpenERP OnDemand Free Trial 2010 Mail Form')]"/>
<field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
- <field name="object_name" ref="crm.model_crm_lead"/>
- <field eval="0" name="use_sign"/>
- <field name="def_body_text">Hello,Thanks for showing intrest and for subscribing to the OpenERP Discovery Day.
+ <field name="model_id" ref="crm.model_crm_lead"/>
+ <field eval="0" name="user_signature"/>
+ <field name="body_text">Hello,Thanks for showing intrest and for subscribing to the OpenERP Discovery Day.
If any further information required kindly revert back.
I really appreciate your co-operation on this.
Regards,OpenERP Team,</field>
- <field name="template_language">mako</field>
<field name="name">For OpenERP Discovery Day</field>
- <field name="model_int_name">crm.lead</field>
</record>
<record id="email_template_4" model="email.template">
- <field name="def_subject">Thanks for buying the OpenERP book</field>
- <field name="def_to">[email protected]</field>
- <field eval="[(6,0,[])]" name="allowed_groups"/>
+ <field name="subject">Thanks for buying the OpenERP book</field>
+ <field name="email_to">[email protected]</field>
<field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For OpenERP OnDemand Free Trial 2010 Mail Form')]"/>
<field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
- <field name="object_name" ref="crm.model_crm_lead"/>
- <field eval="0" name="use_sign"/>
- <field name="def_body_text">Hello,Thanks for showing intrest and buying the OpenERP book.
+ <field name="model_id" ref="crm.model_crm_lead"/>
+ <field eval="0" name="user_signature"/>
+ <field name="body_text">Hello,Thanks for showing intrest and buying the OpenERP book.
If any further information required kindly revert back.
I really appreciate your co-operation on this.
Regards,OpenERP Team,</field>
- <field name="template_language">mako</field>
<field name="name">For OpenERP book</field>
- <field name="model_int_name">crm.lead</field>
</record>
<record id="email_template_5" model="email.template">
- <field name="def_subject">Propose a free technical training to Gold partners</field>
- <field name="def_to">[email protected]</field>
- <field eval="[(6,0,[])]" name="allowed_groups"/>
+ <field name="subject">Propose a free technical training to Gold partners</field>
+ <field name="email_to">[email protected]</field>
<field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For OpenERP OnDemand Free Trial 2010 Mail Form')]"/>
<field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
- <field name="object_name" ref="crm.model_crm_lead"/>
- <field eval="0" name="use_sign"/>
- <field name="def_body_text">Hello, We have very good offer that might suit you.
+ <field name="model_id" ref="crm.model_crm_lead"/>
+ <field eval="0" name="user_signature"/>
+ <field name="body_text">Hello, We have very good offer that might suit you.
For our gold partners,We are arranging free technical training on june,2010.
If any further information required kindly revert back.
I really appreciate your co-operation on this.
Regards,OpenERP Team,</field>
- <field name="template_language">mako</field>
<field name="name">For technical training to Gold partners</field>
- <field name="model_int_name">crm.lead</field>
</record>
<record id="email_template_6" model="email.template">
- <field name="def_subject">Propose paid training to Silver partners</field>
- <field name="def_to">[email protected]</field>
- <field eval="[(6,0,[])]" name="allowed_groups"/>
+ <field name="subject">Propose paid training to Silver partners</field>
+ <field name="email_to">[email protected]</field>
<field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For OpenERP OnDemand Free Trial 2010 Mail Form')]"/>
<field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
- <field name="object_name" ref="crm.model_crm_lead"/>
- <field eval="0" name="use_sign"/>
- <field name="def_body_text">Hello, We have very good offer that might suit you.
+ <field name="model_id" ref="crm.model_crm_lead"/>
+ <field eval="0" name="user_signature"/>
+ <field name="body_text">Hello, We have very good offer that might suit you.
For our silver partners,We are paid technical training on june,2010.
If any further information required kindly revert back.
I really appreciate your co-operation on this.
Regards,OpenERP Team,</field>
- <field name="template_language">mako</field>
<field name="name">For training to Silver partners</field>
- <field name="model_int_name">crm.lead</field>
</record>
<record id="email_template_7" model="email.template">
- <field name="def_subject">Propose gold partnership to silver partners</field>
- <field name="def_to">[email protected]</field>
- <field eval="[(6,0,[])]" name="allowed_groups"/>
+ <field name="subject">Propose gold partnership to silver partners</field>
+ <field name="email_to">[email protected]</field>
<field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For OpenERP OnDemand Free Trial 2010 Mail Form')]"/>
<field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
- <field name="object_name" ref="crm.model_crm_lead"/>
- <field eval="0" name="use_sign"/>
- <field name="def_body_text">Hello, We have very good offer that might suit you.
+ <field name="model_id" ref="crm.model_crm_lead"/>
+ <field eval="0" name="user_signature"/>
+ <field name="body_text">Hello, We have very good offer that might suit you.
For our silver partners,We are offering Gold partnership.
If any further information required kindly revert back.
I really appreciate your co-operation on this.
Regards,OpenERP Team,</field>
- <field name="template_language">mako</field>
<field name="name">For gold partnership to silver partners</field>
- <field name="model_int_name">crm.lead</field>
</record>
<record id="email_template_8" model="email.template">
- <field name="def_subject">Thanks for subscribing to technical training</field>
- <field name="def_to">[email protected]</field>
- <field eval="[(6,0,[])]" name="allowed_groups"/>
+ <field name="subject">Thanks for subscribing to technical training</field>
+ <field name="email_to">[email protected]</field>
<field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For OpenERP OnDemand Free Trial 2010 Mail Form')]"/>
<field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
- <field name="object_name" ref="crm.model_crm_lead"/>
- <field eval="0" name="use_sign"/>
- <field name="def_body_text">Hello, Thanks for showing intrest and for subscribing to technical training.If any further information required kindly revert back.I really appreciate your co-operation on this.
+ <field name="model_id" ref="crm.model_crm_lead"/>
+ <field eval="0" name="user_signature"/>
+ <field name="body_text">Hello, Thanks for showing intrest and for subscribing to technical training.If any further information required kindly revert back.I really appreciate your co-operation on this.
Regards,OpenERP Team,</field>
- <field name="template_language">mako</field>
<field name="name">For subscribing to technical training</field>
- <field name="model_int_name">crm.lead</field>
</record>
<!-- Report -->
=== modified file 'project_issue/project_issue.py'
--- project_issue/project_issue.py 2011-11-29 12:35:13 +0000
+++ project_issue/project_issue.py 2011-12-07 11:17:27 +0000
@@ -312,7 +312,7 @@
'name': bug.name,
'partner_id': bug.partner_id.id,
'description':bug.description,
- 'date': bug.date,
+ 'date_deadline': bug.date,
'project_id': bug.project_id.id,
'priority': bug.priority,
'user_id': bug.user_id.id,
=== modified file 'sale/sale.py'
--- sale/sale.py 2011-12-05 10:27:29 +0000
+++ sale/sale.py 2011-12-07 11:17:27 +0000
@@ -701,7 +701,6 @@
'location_id': order.shop_id.warehouse_id.lot_stock_id.id,
'procure_method': line.type,
'move_id': move_id,
- 'property_ids': [(6, 0, [x.id for x in line.property_ids])],
'company_id': order.company_id.id,
}
=== modified file 'stock/test/stock_test.yml'
--- stock/test/stock_test.yml 2011-10-16 01:28:00 +0000
+++ stock/test/stock_test.yml 2011-12-07 11:17:27 +0000
@@ -307,7 +307,6 @@
}
split_id = self.pool.get('stock.move.split').create(cr, uid, partial_datas, context={})
split_move_data= {
- 'lot_id': split_id,
'quantity': 10,
'name': 'lot',
}
=== modified file 'stock_planning/test/stock_planning.yml'
--- stock_planning/test/stock_planning.yml 2011-10-16 01:28:00 +0000
+++ stock_planning/test/stock_planning.yml 2011-12-07 11:17:27 +0000
@@ -168,7 +168,6 @@
!python {model: stock.sale.forecast}: |
forecast_ids = self.search(cr, uid, [('product_id','=',ref('product.product_product_pc1'))])
write_dict = {'product_qty': 30.0,
- 'analyzed_section_id': ref("crm.section_sales_department"),
'analyzed_period1_id': ref("stock_period_03"),
'analyzed_user_id': ref("base.user_root"),
'analyzed_warehouse_id': ref("stock.warehouse0")}
=== modified file 'survey/wizard/survey_answer.py'
--- survey/wizard/survey_answer.py 2011-11-09 18:12:56 +0000
+++ survey/wizard/survey_answer.py 2011-12-07 11:17:27 +0000
@@ -528,8 +528,8 @@
Create the Answer of survey and store in survey.response object, and if set validation of question then check the value of question if value is wrong then raise the exception.
"""
if context is None: context = {}
-
- survey_question_wiz_id = super(survey_question_wiz,self).create(cr, uid, vals, context=context)
+
+ survey_question_wiz_id = super(survey_question_wiz,self).create(cr, uid, {'name': vals.get('name')}, context=context)
if context.has_key('active') and context.get('active',False):
return survey_question_wiz_id
=== modified file 'users_ldap/__openerp__.py'
--- users_ldap/__openerp__.py 2011-12-06 12:03:55 +0000
+++ users_ldap/__openerp__.py 2011-12-07 11:17:27 +0000
@@ -120,6 +120,7 @@
"data" : [
"users_ldap_view.xml",
"user_ldap_installer.xml",
+ "security/ir.model.access.csv",
],
"active": False,
"installable": True,
=== added directory 'users_ldap/security'
=== added file 'users_ldap/security/ir.model.access.csv'
--- users_ldap/security/ir.model.access.csv 1970-01-01 00:00:00 +0000
+++ users_ldap/security/ir.model.access.csv 2011-12-07 11:17:27 +0000
@@ -0,0 +1,2 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_res_company_ldap","res_company_ldap","model_res_company_ldap","base.group_system",1,1,1,1
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
