Merge lp:~openerp-dev/openobject-addons/trunk-bug-879295-kjo into lp:openobject-addons

[Kuldeep Joshi(OpenERP)]

Change the button name and the label name

[Bhumika Shrimali (sbh-openerp)]

review: Approve

[Serpent Consulting Services (serpent-consulting-services)]

Excuse me kjo,
Would you mind using the existing branch rather than creating and merging a new branch which even misses the .po changes?(thus reducing the duplicate work)

Hope to get it considered as a contribution.

Thanks in advance,
Serpent Consulting Services.

[Olivier Dony (Odoo) (odo-openerp)]

I agree with Serpent CS, whenever possible we should merge the proposed contribution by the community, instead of copying them and risking to forget properly crediting the patch to them.
If necessary and having no time to wait for the community to fix any issue in the merge prop, we can always merge their branch into a temporary branch in which we fix the last details, and then merge that in trunk, keeping all the history and credit.

You apparently lost matching changes in the PO files, and you also forgot to properly tag the commit with --fixes lp:879295, losing a precious link with the bug. As a result, your merge proposal is not linked on the bug right now, making people think the Fix Committed version is the one from Serpent CS, ironically.

Please be careful with this in the future - I'm rejecting this merge, we can directly process the one from the community.

review: Disapprove

[Bhumika Shrimali (sbh-openerp)]

Hello,

KJO is not missing po changes, he all ready see the branch is linked with po changed And KJO add the missing changes for button and label which is not in your branch.

@KJO Can you merge the branch ?

Thanks

[Serpent Consulting Services (serpent-consulting-services)]

Thanks Olivier Dony(OpenERP),

Yet another example why community respects you!

Merci.

[Olivier Dony (Odoo) (odo-openerp)]

Hi Bhumika, thanks for giving more details, but I'm not sure I understand your comment.

The original branch attached to the bug report contains changes for the PO[T] files *and* changes to the button and label. Changing the PO files only would make no sense of course.
So if I merge KJO 's branch after merging the branch from Serpent CS I get no diff at all, because it was all done already (just tried it).

You can compare the 2 revisions, committed at 2 hours of difference: [1] and [2]

Also this branch's description does not say that it fixes something that was supposedly missing in the original merge proposal, and does not have the --fixes lp:# flag. BTW, if something was missing it could have been mentioned on the review of the contributed branch :-)

So unless you think something is really missing, we can consider this branch and merge proposal rejected, as everything is already provided by Serpent's branch.

Do not hesitate to correct me if I'm wrong of course! :-)

Thanks!

[1] http://bazaar.launchpad.net/~serpent-consulting-services/openobject-addons/trunk-survey-typo-corrections/revision/5434
[2] http://bazaar.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-879295-kjo/revision/5434

Unmerged revisions

5434. By Kuldeep Joshi(OpenERP) on 2011-10-21

[FIXED]survery: change button name and label

=== modified file 'survey/survey_demo.xml'
--- survey/survey_demo.xml	2011-10-02 17:31:16 +0000
+++ survey/survey_demo.xml	2011-10-21 10:49:08 +0000
@@ -100,7 +100,7 @@
         </record>
         <record id="survey_question_company_size_Europ" model="survey.answer">
             <field name="in_visible_answer_type">1</field>
-            <field name="answer">Europ</field>
+            <field name="answer">Europe</field>
             <field name="question_id" ref="survey_question_located" />
             <field name="sequence" eval="1"/>
         </record>

=== modified file 'survey/survey_view.xml'
--- survey/survey_view.xml	2011-10-02 17:31:16 +0000
+++ survey/survey_view.xml	2011-10-21 10:49:08 +0000
@@ -1066,7 +1066,7 @@
                      <field name="state"/>
                         <button name="survey_req_cancel" string="Cancelled" states="waiting_answer" type="object" icon="gtk-cancel"/>
                         <button name="survey_req_draft" string="Set to Draft" states="cancel,done" type="object" icon="gtk-new"/>
-                        <button name="survey_req_waiting_answer" string="Watting Answer" states="draft" type="object" icon="gtk-new"/>
+                        <button name="survey_req_waiting_answer" string="Waiting Answer" states="draft" type="object" icon="gtk-new"/>
                         <button name="survey_req_done" string="Done" states="waiting_answer" type="object" icon="gtk-ok"/>
                     </group>
                 </form>