From 3905013318e7dd52b6dff6c3059be9808442d337 Mon Sep 17 00:00:00 2001 From: Mustufa Rangwala Date: Wed, 18 Aug 2010 16:32:46 +0530 Subject: [PATCH] [FIX] l10n_fr,l10n_lu: Missing wizard actions bzr revid: mra@mra-laptop-20100818110246-a3o6nzc3koi4j99u --- addons/l10n_fr/__openerp__.py | 2 ++ addons/l10n_fr/l10n_fr_wizard.xml | 11 +++++++++++ addons/l10n_lu/__openerp__.py | 1 + addons/l10n_lu/l10n_lu_wizard.xml | 11 +++++++++++ addons/sale/sale.py | 2 +- 5 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 addons/l10n_fr/l10n_fr_wizard.xml create mode 100644 addons/l10n_lu/l10n_lu_wizard.xml diff --git a/addons/l10n_fr/__openerp__.py b/addons/l10n_fr/__openerp__.py index 42332628208..f96945a8bc8 100644 --- a/addons/l10n_fr/__openerp__.py +++ b/addons/l10n_fr/__openerp__.py @@ -40,6 +40,7 @@ Credits: Sistheo Zeekom CrysaLEAD "update_xml" : [ "fr_report_demo.xml", "plan_comptable_general_demo.xml", + "l10n_fr_wizard.xml", "fr_pcg_taxes_demo.xml", "fr_tax_demo.xml", "fr_fiscal_templates_demo.xml", @@ -47,6 +48,7 @@ Credits: Sistheo Zeekom CrysaLEAD "security/ir.model.access.csv", "wizard/fr_report_bilan_view.xml", "wizard/fr_report_compute_resultant_view.xml", + ], "demo_xml" : [], "certificate" : "00435321693876313629", diff --git a/addons/l10n_fr/l10n_fr_wizard.xml b/addons/l10n_fr/l10n_fr_wizard.xml new file mode 100644 index 00000000000..985c3b81195 --- /dev/null +++ b/addons/l10n_fr/l10n_fr_wizard.xml @@ -0,0 +1,11 @@ + + + + + + + onskip + + + + diff --git a/addons/l10n_lu/__openerp__.py b/addons/l10n_lu/__openerp__.py index 1745de85ba7..739f36c9ce4 100644 --- a/addons/l10n_lu/__openerp__.py +++ b/addons/l10n_lu/__openerp__.py @@ -37,6 +37,7 @@ This module installs: 'update_xml': [ 'account.tax.code.template.csv', 'l10n_lu_data.xml', + 'l10n_lu_wizard.xml', 'account.tax.template.csv', 'wizard/print_vat_view.xml' ], diff --git a/addons/l10n_lu/l10n_lu_wizard.xml b/addons/l10n_lu/l10n_lu_wizard.xml new file mode 100644 index 00000000000..f0655f3dc99 --- /dev/null +++ b/addons/l10n_lu/l10n_lu_wizard.xml @@ -0,0 +1,11 @@ + + + + + + + onskip + + + + diff --git a/addons/sale/sale.py b/addons/sale/sale.py index 632143d8e20..f84d9600dbc 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -276,7 +276,7 @@ class sale_order(osv.osv): 'invoice_quantity': fields.selection([('order', 'Ordered Quantities'), ('procurement', 'Shipped Quantities')], 'Invoice on', help="The sale order will automatically create the invoice proposition (draft invoice). Ordered and delivered quantities may not be the same. You have to choose if you invoice based on ordered or shipped quantities. If the product is a service, shipped quantities means hours spent on the associated tasks.", required=True), 'payment_term': fields.many2one('account.payment.term', 'Payment Term'), 'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position'), - 'company_id': fields.related('shop_id','company_id',type='many2one',relation='res.company',string='Company',store=True, required=True) + 'company_id': fields.related('shop_id','company_id',type='many2one',relation='res.company',string='Company',store=True) } _defaults = { 'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'sale.order', context=c),