Code review comment for lp:~christophe-chauvet/openobject-client/trunk-save-readonly-field

Hello.....

I try to make the merge..... but some conflicts are present...

can you please make the improvement in only the especific files needed and use the last revno please...

Thanks.

SHELL: ~/proyectos_bazaar/client_new$ bzr merge lp:~christophe-chauvet/openobject-client/trunk-save-readonly-field

LOG_:

+N bin/icons/accessories-archiver+.png
+N bin/icons/accessories-archiver-minus.png
+N bin/icons/accessories-archiver.png
+N bin/icons/call-start.png
+N bin/icons/camera_test.png
+N bin/icons/check.png
+N bin/icons/dialog-close.png
+N bin/icons/document-new.png
+N bin/icons/dolar.png
+N bin/icons/dolar_ok!.png
+N bin/icons/emblem-important.png
+N bin/icons/face-plain.png
+N bin/icons/folder-blue.png
+N bin/icons/folder-green.png
+N bin/icons/folder-orange.png
+N bin/icons/folder-yellow.png
+N bin/icons/gdu-smart-failing.png
+N bin/icons/gnome-cpu-frequency-applet+.png
+N bin/icons/go-home.png
+N bin/icons/go-month.png
+N bin/icons/go-today.png
+N bin/icons/go-week.png
+N bin/icons/go-year.png
+N bin/icons/gtk-go-back-ltr.png
+N bin/icons/gtk-go-back-rtl.png
+N bin/icons/gtk-jump-to-ltr.png
+N bin/icons/gtk-jump-to-rtl.png
+N bin/icons/gtk-media-pause.png
+N bin/icons/gtk-select-all.png
+N bin/icons/gtk-stop.png
+N bin/icons/idea.png
+N bin/icons/locked.png
+N bin/icons/mail-.png
+N bin/icons/mail-forward.png
+N bin/icons/mail-message-new.png
+N bin/icons/mail-replied.png
+N bin/icons/mail_delete.png
+N bin/icons/personal+.png
+N bin/icons/personal-.png
+N bin/icons/personal.png
+N bin/icons/rating-rated.png
+N bin/icons/stage.png
+N bin/icons/stock_align_left_24.png
+N bin/icons/stock_effects-object-colorize.png
+N bin/icons/stock_format-default.png
+N bin/icons/stock_format-scientific.png
+N bin/icons/stock_symbol-selection.png
+N bin/icons/stock_zoom.png
+N bin/po/be.po
+N bin/po/en_GB.po
+N bin/po/es_EC.po
+N bin/po/fa.po
+N bin/po/gl.po
+N bin/po/he.po
+N bin/po/hr.po
+N bin/po/is.po
+N bin/po/iu.po
+N bin/po/ja.po
+N bin/po/ko.po
+N bin/po/lv.po
+N bin/po/mk.po
+N bin/po/mn.po
+N bin/po/oc.po
+N bin/po/rom.po
+N bin/po/sk.po
+N bin/po/ta.po
+N bin/po/th.po
+N bin/po/vi.po
+N bin/po/zh_TW.po
+N bin/widget/view/calendar_gtk/calendar_dummy.py
+N bin/widget/view/diagram.py
+N bin/widget/view/diagram_gtk/
+N bin/widget/view/diagram_gtk/__init__.py
+N bin/widget/view/diagram_gtk/parser.py
+N bin/widget/view/diagram_gtk/xdot.py
+N bin/widget/view/form_gtk/pager.py
+N bin/widget_search/custom_filter.py
+N bin/widget_search/filter.py
 M bin/SpiffGtkWidgets/Calendar/Calendar.py
 M bin/SpiffGtkWidgets/Calendar/CanvasDay.py
 M bin/SpiffGtkWidgets/Calendar/CanvasDayRange.py
 M bin/SpiffGtkWidgets/Calendar/CanvasEvent.py
 M bin/SpiffGtkWidgets/Calendar/CanvasEventView.py
 M bin/SpiffGtkWidgets/Calendar/CanvasGrid.py
 M bin/SpiffGtkWidgets/Calendar/CanvasHEventView.py
 M bin/SpiffGtkWidgets/Calendar/CanvasMagnetTable.py
 M bin/SpiffGtkWidgets/Calendar/CanvasRectangle.py
 M bin/SpiffGtkWidgets/Calendar/CanvasTable.py
 M bin/SpiffGtkWidgets/Calendar/CanvasTimeline.py
 M bin/SpiffGtkWidgets/Calendar/CanvasVEventView.py
 M bin/SpiffGtkWidgets/Calendar/Event.py
 M bin/SpiffGtkWidgets/Calendar/Matrix.py
 M bin/SpiffGtkWidgets/Calendar/Model.py
 M bin/SpiffGtkWidgets/Calendar/MyCalendar.py
 M bin/SpiffGtkWidgets/Calendar/TableLayout.py
 M bin/SpiffGtkWidgets/Calendar/__init__.py
 M bin/SpiffGtkWidgets/Calendar/util.py
 M bin/SpiffGtkWidgets/__init__.py
 M bin/SpiffGtkWidgets/color.py
 M bin/common/__init__.py
 M bin/common/common.py
-D bin/dia_survey.glade
 M bin/environment_info.py
 M bin/modules/__init__.py
 M bin/modules/action/__init__.py
 M bin/modules/action/main.py
 M bin/modules/action/wizard.py
 M bin/modules/gui/__init__.py
 M bin/modules/gui/main.py
 M bin/modules/gui/window/__init__.py
 M bin/modules/gui/window/form.py
 M bin/modules/gui/window/tree.py
 M bin/modules/gui/window/view_sel/__init__.py
 M bin/modules/gui/window/view_tree/__init__.py
 M bin/modules/gui/window/view_tree/parse.py
 M bin/modules/gui/window/view_tree/view_tree.py
 M bin/modules/gui/window/view_tree/view_tree_sc.py
 M bin/modules/gui/window/win_export.py
 M bin/modules/gui/window/win_extension.py
 M bin/modules/gui/window/win_import.py
 M bin/modules/gui/window/win_list.py
 M bin/modules/gui/window/win_preference.py
 M bin/modules/gui/window/win_search.py
 M bin/modules/gui/window/win_selection.py
 M bin/modules/spool/__init__.py
 M bin/observator.py
 M bin/openerp-client.py
 M bin/openerp.glade
 M bin/options.py
 M bin/plugins/__init__.py
 M bin/plugins/workflow_print/__init__.py
 M bin/po/ar.po
 M bin/po/bg.po
 M bin/po/bs.po
 M bin/po/ca.po
 M bin/po/cs.po
 M bin/po/da.po
 M bin/po/de.po
 M bin/po/el.po
 M bin/po/es.po
 M bin/po/et.po
 M bin/po/eu.po
 M bin/po/fi.po
 M bin/po/fr.po
 M bin/po/hu.po
 M bin/po/id.po
 M bin/po/it.po
 M bin/po/lt.po
 M bin/po/ml.po
 M bin/po/nb.po
 M bin/po/nl.po
 M bin/po/openerp-client.pot
 M bin/po/pl.po
 M bin/po/pt.po
 M bin/po/pt_BR.po
 M bin/po/ro.po
 M bin/po/ru.po
 M bin/po/sl.po
 M bin/po/sr.po
 M bin/po/sv.po
 M bin/po/tr.po
 M bin/po/uk.po
 M bin/po/zh_CN.po
 M bin/printer/__init__.py
 M bin/printer/printer.py
 M bin/release.py
 M bin/rpc.py
 M bin/service.py
 M bin/signal_event.py
 M bin/tiny_socket.py
 M bin/tinygraph/__init__.py
 M bin/tools/__init__.py
 M bin/tools/datetime_util.py
 M bin/tools/debug.py
 M bin/tools/win32.py
 M bin/translate.py
 M bin/widget/__init__.py
 M bin/widget/model/__init__.py
 M bin/widget/model/field.py
 M bin/widget/model/group.py
 M bin/widget/model/record.py
 M bin/widget/screen/__init__.py
 M bin/widget/screen/screen.py
 M bin/widget/view/__init__.py
 M bin/widget/view/calendar.py
 M bin/widget/view/calendar_gtk/__init__.py
 M bin/widget/view/calendar_gtk/parser.py
 M bin/widget/view/calendar_gtk/parser_dummy.py
 M bin/widget/view/form.py
 M bin/widget/view/form_gtk/__init__.py
 M bin/widget/view/form_gtk/action.py
 M bin/widget/view/form_gtk/binary.py
 M bin/widget/view/form_gtk/button.py
 M bin/widget/view/form_gtk/calendar.py
 M bin/widget/view/form_gtk/char.py
 M bin/widget/view/form_gtk/checkbox.py
 M bin/widget/view/form_gtk/date_widget.py
 M bin/widget/view/form_gtk/float_time.py
 M bin/widget/view/form_gtk/image.py
 M bin/widget/view/form_gtk/interface.py
 M bin/widget/view/form_gtk/many2many.py
 M bin/widget/view/form_gtk/many2one.py
 M bin/widget/view/form_gtk/one2many_list.py
 M bin/widget/view/form_gtk/parser.py
 M bin/widget/view/form_gtk/picture.py
 M bin/widget/view/form_gtk/progressbar.py
 M bin/widget/view/form_gtk/reference.py
 M bin/widget/view/form_gtk/selection.py
 M bin/widget/view/form_gtk/spinbutton.py
 M bin/widget/view/form_gtk/spinint.py
 M bin/widget/view/form_gtk/textbox.py
 M bin/widget/view/form_gtk/textbox_tag.py
 M bin/widget/view/form_gtk/url.py
 M bin/widget/view/form_gtk/wid_common.py
 M bin/widget/view/gantt.py
 M bin/widget/view/gantt_gtk/__init__.py
 M bin/widget/view/gantt_gtk/parser_dummy.py
 M bin/widget/view/graph.py
 M bin/widget/view/graph_gtk/__init__.py
 M bin/widget/view/graph_gtk/graph.py
 M bin/widget/view/graph_gtk/parser.py
 M bin/widget/view/interface.py
 M bin/widget/view/list.py
 M bin/widget/view/screen_container.py
 M bin/widget/view/tree_gtk/__init__.py
 M bin/widget/view/tree_gtk/date_renderer.py
-D bin/widget/view/tree_gtk/decoratedtree.py
 M bin/widget/view/tree_gtk/editabletree.py
 M bin/widget/view/tree_gtk/parser.py
 M bin/widget/view/widget_parse.py
 M bin/widget_search/__init__.py
 M bin/widget_search/calendar.py
 M bin/widget_search/char.py
 M bin/widget_search/checkbox.py
 M bin/widget_search/date_widget.py
 M bin/widget_search/form.py
 M bin/widget_search/reference.py
 M bin/widget_search/selection.py
 M bin/widget_search/spinbutton.py
 M bin/widget_search/spinint.py
 M bin/widget_search/wid_int.py
 M doc/Changelog
 M msgfmt.py
 M mydistutils.py
 M setup.cfg
 M setup.py
Text conflict in bin/modules/action/main.py
Text conflict in bin/printer/printer.py
Text conflict in bin/release.py
Text conflict in bin/tools/__init__.py
Text conflict in bin/widget/model/group.py
Text conflict in bin/widget/model/record.py
Text conflict in bin/widget/view/form_gtk/many2one.py
Text conflict in doc/Changelog
Text conflict in setup.cfg
9 conflicts encountered.