diff --git a/models/hr_timesheet.py b/models/hr_timesheet.py index 0cb1cd2a360c18068aca2831f47c71a510fe061b..3ec040a11827da1bd18044d1e408bfa4380d4a02 100644 --- a/models/hr_timesheet.py +++ b/models/hr_timesheet.py @@ -10,13 +10,11 @@ class ScopHrTimesheetExp(models.Model): expense_ids = fields.One2many( comodel_name='hr.expense', inverse_name='timesheet_id', - string='Dépsenses associées') + string='Dépenses associées') @api.multi def create_expense(self): for ts in self: - print("__ Fonction dépense") - print(ts) return { "type": 'ir.actions.act_window', "res_model": 'hr.expense', diff --git a/models/product.py b/models/product.py index 39fb388cc86756465c6774e262e7ecce5025349a..2b0115096189c58477a26b2b403ab7ec9beec667 100644 --- a/models/product.py +++ b/models/product.py @@ -16,7 +16,7 @@ class CGScopProductTemplate(models.Model): string="Type de calcul", default="free", help=""" - Défini l'option de calcul dans la note de frais : + Définit l'option de calcul dans la note de frais : - Libre : permet à l'utilisateur de définir le prix et la quantité - Forfait : l'utilisateur n'a pas la possibilité de modifier le prix ni la quantité égale à 1 par défaut diff --git a/views/hr_expense.xml b/views/hr_expense.xml index 7bc7bf7231a039d7d043d29e7ceaeaa510bd3244..3daadcd5cf8aae2399a07c8d2abfb78b39979b04 100644 --- a/views/hr_expense.xml +++ b/views/hr_expense.xml @@ -11,7 +11,7 @@ <field name="model">hr.expense</field> <field name="inherit_id" ref="hr_expense.view_expenses_tree"/> <field name="arch" type="xml"> - <field name="analytic_account_id" position="attributes"> + <field name="analytic_account_id" position="attributes" options="{'no_open': True, 'no_create': True}"> <attribute name="groups"></attribute> </field> </field> @@ -38,10 +38,10 @@ <attribute name="required">True</attribute> </field> <field name="product_id" position="attributes"> - <attribute name="options">{'no_open': True}</attribute> + <attribute name="options">{'no_open': True, 'no_create': True}</attribute> </field> <field name="employee_id" position="attributes"> - <attribute name="options">{'no_open': True}</attribute> + <attribute name="options">{'no_open': True, 'no_create': True}</attribute> </field> <field name="unit_amount" position="attributes"> <attribute name="attrs">{'invisible': [('expense_formula', '!=', 'free')]}</attribute> @@ -67,12 +67,12 @@ <attribute name="string">Code activité UR</attribute> <attribute name="groups"></attribute> <attribute name="readonly">True</attribute> - <attribute name="options">{'no_open': True}</attribute> + <attribute name="options">{'no_open': True, 'no_create': True}</attribute> <attribute name="attrs">{'invisible': [('timesheet_id', '=', False)]}</attribute> </field> <field name="analytic_account_id" position="after"> - <field name="coop_id" attrs="{'invisible': [('timesheet_id', '=', False)]}" readonly="True" options="{'no_open': True}" /> - <field name="ur_financial_system_id" attrs="{'invisible': [('timesheet_id', '=', False)]}" readonly="True" options="{'no_open': True}"/> + <field name="coop_id" attrs="{'invisible': [('timesheet_id', '=', False)]}" readonly="True" options="{'no_open': True, 'no_create': True}" /> + <field name="ur_financial_system_id" attrs="{'invisible': [('timesheet_id', '=', False)]}" readonly="True" options="{'no_open': True, 'no_create': True}"/> </field> <label for="payment_mode" position="attributes"> <attribute name="invisible">True</attribute>