From 0be6b8d655a65eea9173b2635cc8ac63942fc90c Mon Sep 17 00:00:00 2001 From: EliseDup Date: Tue, 18 Oct 2016 18:51:16 +0200 Subject: [PATCH 1/4] Account module added, make invoice_date as required. --- beesdoo_account/__init__.py | 2 ++ beesdoo_account/__openerp__.py | 21 +++++++++++++++++++ beesdoo_account/models/__init__.py | 1 + .../models/beesdoo_account_invoice.py | 13 ++++++++++++ 4 files changed, 37 insertions(+) create mode 100644 beesdoo_account/__init__.py create mode 100644 beesdoo_account/__openerp__.py create mode 100644 beesdoo_account/models/__init__.py create mode 100644 beesdoo_account/models/beesdoo_account_invoice.py diff --git a/beesdoo_account/__init__.py b/beesdoo_account/__init__.py new file mode 100644 index 0000000..0f7cb6b --- /dev/null +++ b/beesdoo_account/__init__.py @@ -0,0 +1,2 @@ +# -*- coding: utf-8 -*- +import models \ No newline at end of file diff --git a/beesdoo_account/__openerp__.py b/beesdoo_account/__openerp__.py new file mode 100644 index 0000000..73948e9 --- /dev/null +++ b/beesdoo_account/__openerp__.py @@ -0,0 +1,21 @@ +# -*- coding: utf-8 -*- +{ + 'name': "Beescoop Account Module", + + 'summary': """ + Module that customize account module for Beescoop + """, + + 'description': """ + """, + + 'author': "Beescoop - Cellule IT", + 'website': "https://github.com/beescoop/Obeesdoo", + + 'category': 'Account Module', + 'version': '0.1', + + 'depends': ['account'], + + 'data': [], +} diff --git a/beesdoo_account/models/__init__.py b/beesdoo_account/models/__init__.py new file mode 100644 index 0000000..4f79ac7 --- /dev/null +++ b/beesdoo_account/models/__init__.py @@ -0,0 +1 @@ +import beesdoo_account_invoice \ No newline at end of file diff --git a/beesdoo_account/models/beesdoo_account_invoice.py b/beesdoo_account/models/beesdoo_account_invoice.py new file mode 100644 index 0000000..aab91cb --- /dev/null +++ b/beesdoo_account/models/beesdoo_account_invoice.py @@ -0,0 +1,13 @@ +# -*- coding: utf-8 -*- +''' + Created on 5 déc. 2015 + + @author: Thibault François +''' + +from openerp import models, fields, api + +class BeesdooAccountInvoice(models.Model): + _inherit = "account.invoice" + + date_invoice = fields.Date(required=True) \ No newline at end of file From 3a01a9c54eb8a4cc8c94f964dae6987a476a0c53 Mon Sep 17 00:00:00 2001 From: EliseDup Date: Thu, 3 Nov 2016 12:20:51 +0100 Subject: [PATCH 2/4] Fix S0041 : make date_invoice as required in the view only not in the model --- beesdoo_account/__openerp__.py | 5 +++-- beesdoo_account/models/__init__.py | 1 - beesdoo_account/models/beesdoo_account_invoice.py | 13 ------------- beesdoo_account/views/account_invoice.xml | 14 ++++++++++++++ 4 files changed, 17 insertions(+), 16 deletions(-) delete mode 100644 beesdoo_account/models/__init__.py delete mode 100644 beesdoo_account/models/beesdoo_account_invoice.py create mode 100644 beesdoo_account/views/account_invoice.xml diff --git a/beesdoo_account/__openerp__.py b/beesdoo_account/__openerp__.py index 73948e9..694cf0f 100644 --- a/beesdoo_account/__openerp__.py +++ b/beesdoo_account/__openerp__.py @@ -15,7 +15,8 @@ 'category': 'Account Module', 'version': '0.1', - 'depends': ['account'], + 'depends': ['account', + 'beesdoo_base'], - 'data': [], + 'data': ['views/account_invoice.xml'], } diff --git a/beesdoo_account/models/__init__.py b/beesdoo_account/models/__init__.py deleted file mode 100644 index 4f79ac7..0000000 --- a/beesdoo_account/models/__init__.py +++ /dev/null @@ -1 +0,0 @@ -import beesdoo_account_invoice \ No newline at end of file diff --git a/beesdoo_account/models/beesdoo_account_invoice.py b/beesdoo_account/models/beesdoo_account_invoice.py deleted file mode 100644 index aab91cb..0000000 --- a/beesdoo_account/models/beesdoo_account_invoice.py +++ /dev/null @@ -1,13 +0,0 @@ -# -*- coding: utf-8 -*- -''' - Created on 5 déc. 2015 - - @author: Thibault François -''' - -from openerp import models, fields, api - -class BeesdooAccountInvoice(models.Model): - _inherit = "account.invoice" - - date_invoice = fields.Date(required=True) \ No newline at end of file diff --git a/beesdoo_account/views/account_invoice.xml b/beesdoo_account/views/account_invoice.xml new file mode 100644 index 0000000..57752d9 --- /dev/null +++ b/beesdoo_account/views/account_invoice.xml @@ -0,0 +1,14 @@ + + + + beesdoo.account.invoice.form.view + account.invoice + + + + True + + + + + \ No newline at end of file From d31de6a7c609e5b88d483f1200884d79008b03b4 Mon Sep 17 00:00:00 2001 From: EliseDup Date: Thu, 3 Nov 2016 14:24:57 +0100 Subject: [PATCH 3/4] Fix S0041 --- beesdoo_account/models/__init__.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 beesdoo_account/models/__init__.py diff --git a/beesdoo_account/models/__init__.py b/beesdoo_account/models/__init__.py new file mode 100644 index 0000000..e69de29 From 4415002e52b8ead31e9ea0f59c8ee5f1e1d4c7ae Mon Sep 17 00:00:00 2001 From: EliseDup Date: Wed, 9 Nov 2016 15:54:02 +0100 Subject: [PATCH 4/4] S0041 : add date_invoice as required in vendor bills view --- beesdoo_account/views/account_invoice.xml | 38 ++++++++++++++++------- beesdoo_pos/views/beesdoo_pos.xml | 2 ++ 2 files changed, 28 insertions(+), 12 deletions(-) diff --git a/beesdoo_account/views/account_invoice.xml b/beesdoo_account/views/account_invoice.xml index 57752d9..847748c 100644 --- a/beesdoo_account/views/account_invoice.xml +++ b/beesdoo_account/views/account_invoice.xml @@ -1,14 +1,28 @@ - - - beesdoo.account.invoice.form.view - account.invoice - - - - True - - - - + + + beesdoo.account.invoice.form.view + account.invoice + + + + True + + + + + + + + beesdoo.account.invoice.supplier.form.view + account.invoice + + + + True + + + + + \ No newline at end of file diff --git a/beesdoo_pos/views/beesdoo_pos.xml b/beesdoo_pos/views/beesdoo_pos.xml index d7868ff..5cb9f99 100644 --- a/beesdoo_pos/views/beesdoo_pos.xml +++ b/beesdoo_pos/views/beesdoo_pos.xml @@ -34,5 +34,7 @@ + +