diff --git a/addons/delivery/partner_view.xml b/addons/delivery/partner_view.xml new file mode 100644 index 00000000000..7be367faf22 --- /dev/null +++ b/addons/delivery/partner_view.xml @@ -0,0 +1,18 @@ + + + + + res.partner.carrier.property.form.inherit + res.partner + form + + + + + + + + + + + diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py index 56bf68750db..53e5087a1fa 100644 --- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py +++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py @@ -276,8 +276,16 @@ class hr_timesheet_sheet(osv.osv): return False return True + def _date_current_check(self, cr, uid, ids): + for sheet in self.browse(cr, uid, ids): + if sheet.date_current < sheet.date_from or sheet.date_current > sheet.date_to: + return False + return True + + _constraints = [ - (_sheet_date, 'You can not have 2 timesheets that overlaps !', ['date_from','date_to']) + (_sheet_date, 'You can not have 2 timesheets that overlaps !', ['date_from','date_to']), + (_date_current_check, 'You must select a Current date wich is in the timesheet dates !', ['date_current']), ] def action_set_to_draft(self, cr, uid, ids, *args): diff --git a/addons/product/partner_view.xml b/addons/product/partner_view.xml new file mode 100644 index 00000000000..68fc31d3640 --- /dev/null +++ b/addons/product/partner_view.xml @@ -0,0 +1,18 @@ + + + + + res.partner.product.property.form.inherit + res.partner + form + + + + + + + + + + + diff --git a/addons/purchase/partner_view.xml b/addons/purchase/partner_view.xml new file mode 100644 index 00000000000..188ac119d79 --- /dev/null +++ b/addons/purchase/partner_view.xml @@ -0,0 +1,18 @@ + + + + + res.partner.purchase.property.form.inherit + res.partner + form + + + + + + + + + + + diff --git a/addons/stock/partner_view.xml b/addons/stock/partner_view.xml new file mode 100644 index 00000000000..2cfc6cc3a4a --- /dev/null +++ b/addons/stock/partner_view.xml @@ -0,0 +1,23 @@ + + + + + + + res.partner.stock.property.form.inherit + res.partner + form + + + + + + + + + + + + diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml new file mode 100644 index 00000000000..19f32285538 --- /dev/null +++ b/addons/stock/product_view.xml @@ -0,0 +1,61 @@ + + + + + + product.category.stock.property.form.inherit + product.category + form + + + + + + + + + + + + + + + product.template.stock.property.form.inherit + product.template + form + + + + + + + + + + + + + + + + + product.normal.stock.property.form.inherit + product.product + form + + + + + + + + + + + + + + + + +