Merge lp:~openerp-community/openobject-addons/elico-6.0 into lp:openobject-addons

Proposed by Eric Caudal - www.elico-corp.com on 2011-02-14
Status: Rejected
Rejected by: Olivier Dony (Odoo) on 2011-03-28
Proposed branch: lp:~openerp-community/openobject-addons/elico-6.0
Merge into: lp:openobject-addons
Diff against target: 149 lines (+128/-0)
4 files modified
elico_account_payment_extension/__init__.py (+23/-0)
elico_account_payment_extension/__openerp__.py (+42/-0)
elico_base_contact_extension/__init__.py (+23/-0)
elico_base_contact_extension/__openerp__.py (+40/-0)
To merge this branch: bzr merge lp:~openerp-community/openobject-addons/elico-6.0
Reviewer Review Type Date Requested Status
Olivier Dony (Odoo) 2011-02-14 Needs Fixing on 2011-03-28
Review via email: mp+49599@code.launchpad.net

Description of the change

Main modules are:
- financial_statements that implements a gross profit report in a flexible reporting setup.
- year_end_process that implements a more detail year-end process.

To post a comment you must log in.
Download full text (7.6 KiB)

I never received any feedback from this request. How long should it take
for a normal review?

--
Eric

On Mon, 2011-02-14 at 08:51 +0000, Eric Caudal - www.elico-corp.com
wrote:

> Eric Caudal - www.elico-corp.com has proposed merging lp:~openerp-community/openobject-addons/elico-6.0 into lp:openobject-addons.
>
> Requested reviews:
> OpenERP Core Team (openerp)
>
> For more details, see:
> https://code.launchpad.net/~openerp-community/openobject-addons/elico-6.0/+merge/49599
>
> Main modules are:
> - financial_statements that implements a gross profit report in a flexible reporting setup.
> - year_end_process that implements a more detail year-end process.
>
>
>
> differences between files attachment (review-diff.txt)
>
> === added directory 'elico_account_payment_extension'
> === added file 'elico_account_payment_extension/__init__.py'
> --- elico_account_payment_extension/__init__.py 1970-01-01 00:00:00 +0000
> +++ elico_account_payment_extension/__init__.py 2011-02-14 08:50:44 +0000
> @@ -0,0 +1,23 @@
> +# -*- encoding: utf-8 -*-
> +##############################################################################
> +#
> +# OpenERP, Open Source Management Solution
> +# Copyright (c) 2010-2011 Elico Corp. All Rights Reserved.
> +# Author: Eric CAUDAL <email address hidden>
> +#
> +# This program is free software: you can redistribute it and/or modify
> +# it under the terms of the GNU General Public License as published by
> +# the Free Software Foundation, either version 3 of the License, or
> +# (at your option) any later version.
> +#
> +# This program is distributed in the hope that it will be useful,
> +# but WITHOUT ANY WARRANTY; without even the implied warranty of
> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> +# GNU General Public License for more details.
> +#
> +# You should have received a copy of the GNU General Public License
> +# along with this program. If not, see <http://www.gnu.org/licenses/>.
> +#
> +##############################################################################
> +
> +import account_payment_extension_invoice
>
> === added file 'elico_account_payment_extension/__openerp__.py'
> --- elico_account_payment_extension/__openerp__.py 1970-01-01 00:00:00 +0000
> +++ elico_account_payment_extension/__openerp__.py 2011-02-14 08:50:44 +0000
> @@ -0,0 +1,42 @@
> +# -*- coding: utf-8 -*-
> +##############################################################################
> +#
> +# OpenERP, Open Source Management Solution
> +# Copyright (c) 2010-2011 Elico Corp. All Rights Reserved.
> +# Author: Eric CAUDAL <email address hidden>
> +#
> +# This program is free software: you can redistribute it and/or modify
> +# it under the terms of the GNU Affero General Public License as
> +# published by the Free Software Foundation, either version 3 of the
> +# License, or (at your option) any later version.
> +#
> +# This program is distributed in the hope that it will be useful,
> +# but WITHOUT ANY WARRANTY; without even the implied warranty of
> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. ...

Read more...

Olivier Dony (Odoo) (odo-openerp) wrote :

Hello Eric,

Sorry about the delay, merge proposal reviews might take a few days or weeks depending on the workload of the R&D teams, but we are trying to improve it. Members of the community are also free to provide useful feedback on each other's patches.

Concerning this merge proposal, it is difficult to understand what you want to achieve...
I think you had a technical issue when creating the branch and pushing it on launchpad, so you might want to work on it, starting with the following issues:

- The description of your merge proposal is quite small, and does not seem to match the content of your branch at all.

- Look at the diff of the merge proposal or the content of the proposed branch: you'll see that it contains 2 empty modules. Your branch also appears to be stacked on the trunk addons branch, but this is not the case, as its revision numbers start at 1. I think you need to push your changes against, more carefully. If you are proposing a change of the official addons branch, your branch should be based on the lp:~openerp/openobject-addons/trunk branch, with a few revisions on top of the last official changes, to introduce your changes. If you are adding a module, there should be a revision that adds a new module directory next to the other official ones.

- The naming of you branch seems to imply it is meant for OpenERP v6.0, but it is proposed against the trunk branch. Proposing against 6.0 would be a waste of time indeed because it is stable now so no new features will be added in any case. Proposing against trunk makes sense if you think your changes are relevant for being included in the official addons for next version, but this is still unclear at this point ;-)

Now, a more generic comment: it is not very often that new modules are added to the official addons, as we try to keep the core lean and simple. Modules that customize core modules should usually be published as extra-addons (to be referenced on apps.openerp.com), and will only be included in the official addons once it's shown that they are clean and relevant for most OpenERP users.
You can publish such modules in your own LP branch (and then register it on apps.openerp.com), or add them to the community-addons (lp:~openerp-community/openobject-addons/trunk-addons-community) or extra-addons (lp:openobject-addons/extra-trunk or lp:openobject-addons/extra-6.0).
You should also try to have the simplest and most relevant name possible for your modules in any case (the author of a module is part of the metadata, no need to put it in the module name)

On the other hand, if your module is patching core features of OpenERP and is meant as an improvement of these features, then you might be better off modifying the core modules in your merge proposal than trying to add new modules.

Finally, you should keep in mind that the chances of seeing a merge proposal accepted decrease with the number of lines and complexity of the changes, so think about it (splitting the changes in small per-topic branches might be an option)

I hope this helps...

Do not hesitate to ask around, e.g. via Launchpad Answers or the forum if you need help for publishing your changes.

review: Needs Fixing

Hi Olivier,
Could you please help me understand why it is rejected so I can improve
the modules?

--
Eric

Olivier Dony (Odoo) (odo-openerp) wrote :

Eric, have you read my review on the merge proposal? It's on the merge prop page, further down, and you probably have received a copy by mail, too. I think it explains in details why we cannot merge this merge proposal (it does't say much about your modules, as they are not in the merge proposal...)

Unmerged revisions

53. By <elicoidal <email address hidden>> <email address hidden> on 2014-02-22

[FIX] merge

52. By <elicoidal <email address hidden>> <email address hidden> on 2014-02-22

[ADD] base_header_webkit for dependencies requirements

51. By <elicoidal <email address hidden>> on 2012-11-22

[ADD] manufacturing modules + changed FX revaluation method including now the special periods

50. By <elicoidal <email address hidden>> on 2012-10-01

[FIX] authoring details

49. By <elicoidal <email address hidden>> on 2012-09-18

[ADD] stock batch, mrp split, back 2 back

48. By <elicoidal <email address hidden>> on 2012-07-28

[ADD] l10n_cn_account_assets and fx_revaluation

47. By <elicoidal <email address hidden>> on 2012-07-19

[ADD] fx valuation and asset modules for the Chinese localization

46. By <elicoidal <email address hidden>> on 2012-06-09

[DEL] 6.1 modules

45. By <elicoidal <email address hidden>> on 2012-05-14

[FIX] improved WYSIWYG safety

44. By <elicoidal <email address hidden>> on 2012-05-11

[FIX] correct naming bug

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory 'elico_account_payment_extension'
2=== added file 'elico_account_payment_extension/__init__.py'
3--- elico_account_payment_extension/__init__.py 1970-01-01 00:00:00 +0000
4+++ elico_account_payment_extension/__init__.py 2011-02-14 08:50:44 +0000
5@@ -0,0 +1,23 @@
6+# -*- encoding: utf-8 -*-
7+##############################################################################
8+#
9+# OpenERP, Open Source Management Solution
10+# Copyright (c) 2010-2011 Elico Corp. All Rights Reserved.
11+# Author: Eric CAUDAL <contact@elico-corp.com>
12+#
13+# This program is free software: you can redistribute it and/or modify
14+# it under the terms of the GNU General Public License as published by
15+# the Free Software Foundation, either version 3 of the License, or
16+# (at your option) any later version.
17+#
18+# This program is distributed in the hope that it will be useful,
19+# but WITHOUT ANY WARRANTY; without even the implied warranty of
20+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
21+# GNU General Public License for more details.
22+#
23+# You should have received a copy of the GNU General Public License
24+# along with this program. If not, see <http://www.gnu.org/licenses/>.
25+#
26+##############################################################################
27+
28+import account_payment_extension_invoice
29
30=== added file 'elico_account_payment_extension/__openerp__.py'
31--- elico_account_payment_extension/__openerp__.py 1970-01-01 00:00:00 +0000
32+++ elico_account_payment_extension/__openerp__.py 2011-02-14 08:50:44 +0000
33@@ -0,0 +1,42 @@
34+# -*- coding: utf-8 -*-
35+##############################################################################
36+#
37+# OpenERP, Open Source Management Solution
38+# Copyright (c) 2010-2011 Elico Corp. All Rights Reserved.
39+# Author: Eric CAUDAL <contact@elico-corp.com>
40+#
41+# This program is free software: you can redistribute it and/or modify
42+# it under the terms of the GNU Affero General Public License as
43+# published by the Free Software Foundation, either version 3 of the
44+# License, or (at your option) any later version.
45+#
46+# This program is distributed in the hope that it will be useful,
47+# but WITHOUT ANY WARRANTY; without even the implied warranty of
48+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
49+# GNU Affero General Public License for more details.
50+#
51+# You should have received a copy of the GNU Affero General Public License
52+# along with this program. If not, see <http://www.gnu.org/licenses/>.
53+#
54+##############################################################################
55+
56+
57+{
58+ 'name': 'Make payment information mandatory in invoices',
59+ 'version': '1.0',
60+ 'category': 'Accounting',
61+ 'website' : "www.elico-corp.com",
62+ 'description': """
63+Extension to module account in order to:
64+- add mandatory payment type in invoices
65+- add mandatory payment term in invoices""",
66+ 'author': 'Eric Caudal (contact@elico-corp.com)',
67+ 'depends': ['account_payment_extension'],
68+ 'init_xml': [],
69+ 'update_xml': ['account_payment_extension_view.xml'],
70+ 'demo_xml': [],
71+ 'test': [],
72+ 'installable': True,
73+ 'active': False,
74+ 'certificate': '',
75+}
76
77=== added directory 'elico_base_contact_extension'
78=== added file 'elico_base_contact_extension/__init__.py'
79--- elico_base_contact_extension/__init__.py 1970-01-01 00:00:00 +0000
80+++ elico_base_contact_extension/__init__.py 2011-02-14 08:50:44 +0000
81@@ -0,0 +1,23 @@
82+# -*- encoding: utf-8 -*-
83+##############################################################################
84+#
85+# OpenERP, Open Source Management Solution
86+# Copyright (c) 2010-2011 Elico Corp. All Rights Reserved.
87+# Author: Eric CAUDAL <contact@elico-corp.com>
88+# $Id$
89+#
90+# This program is free software: you can redistribute it and/or modify
91+# it under the terms of the GNU General Public License as published by
92+# the Free Software Foundation, either version 3 of the License, or
93+# (at your option) any later version.
94+#
95+# This program is distributed in the hope that it will be useful,
96+# but WITHOUT ANY WARRANTY; without even the implied warranty of
97+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
98+# GNU General Public License for more details.
99+#
100+# You should have received a copy of the GNU General Public License
101+# along with this program. If not, see <http://www.gnu.org/licenses/>.
102+#
103+##############################################################################
104+
105
106=== added file 'elico_base_contact_extension/__openerp__.py'
107--- elico_base_contact_extension/__openerp__.py 1970-01-01 00:00:00 +0000
108+++ elico_base_contact_extension/__openerp__.py 2011-02-14 08:50:44 +0000
109@@ -0,0 +1,40 @@
110+# -*- coding: utf-8 -*-
111+##############################################################################
112+#
113+# OpenERP, Open Source Management Solution
114+# Copyright (c) 2010-2011 Elico Corp. All Rights Reserved.
115+# Author: Eric CAUDAL <contact@elico-corp.com>
116+#
117+# This program is free software: you can redistribute it and/or modify
118+# it under the terms of the GNU Affero General Public License as
119+# published by the Free Software Foundation, either version 3 of the
120+# License, or (at your option) any later version.
121+#
122+# This program is distributed in the hope that it will be useful,
123+# but WITHOUT ANY WARRANTY; without even the implied warranty of
124+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
125+# GNU Affero General Public License for more details.
126+#
127+# You should have received a copy of the GNU Affero General Public License
128+# along with this program. If not, see <http://www.gnu.org/licenses/>.
129+#
130+##############################################################################
131+
132+
133+{
134+ 'name': 'Street information added in base contact tree',
135+ 'version': '1.0',
136+ 'category': 'Generic Modules/Base',
137+ 'description': """
138+Extension to module base_contact to add field addr1 (street details) in base contact form """,
139+ 'author': 'Eric Caudal (contact@elico-corp.com)',
140+ 'website': 'http://www.elico-corp.com',
141+ 'depends': ['base_contact'],
142+ 'init_xml': [],
143+ 'update_xml': ['base_contact_view.xml'],
144+ 'demo_xml': [],
145+ 'test': [],
146+ 'installable': True,
147+ 'active': False,
148+ 'certificate': '',
149+}

Subscribers

People subscribed via source and target branches

to all changes: