Etienne Hirt has proposed merging lp:~hirt/ocb-addons/6.1_stock-move-tree into
lp:ocb-addons/6.1.
Requested reviews:
OpenERP Community Backports (ocb)
Related bugs:
Bug #1327887 in OpenERP Community Backports (Addons): [6.1] stock.move.tree2
wrong priority, stock.move.tree3 leftover
https://bugs.launchpad.net/ocb-addons/+bug/1327887
For more details, see:
https://code.launchpad.net/~hirt/ocb-addons/6.1_stock-move-tree/+merge/222463
* change stock.move.tree2 to 18 as directly referenced when used
* remove stock.move.tree3 as a leftover from a test
--
https://code.launchpad.net/~hirt/ocb-addons/6.1_stock-move-tree/+merge/222463
Your team OpenERP Community Backports is requested to review the proposed merge
of lp:~hirt/ocb-addons/6.1_stock-move-tree into lp:ocb-addons/6.1.
=== modified file 'account_asset/i18n/ca.po' (properties changed: +x to -x)
=== modified file 'account_asset/i18n/de.po' (properties changed: +x to -x)
=== modified file 'account_asset/i18n/es.po' (properties changed: +x to -x)
=== modified file 'account_asset/i18n/es_CR.po' (properties changed: +x to -x)
=== modified file 'account_asset/i18n/fr.po' (properties changed: +x to -x)
=== modified file 'account_asset/i18n/fr_BE.po' (properties changed: +x to -x)
=== modified file 'account_asset/i18n/pl.po' (properties changed: +x to -x)
=== modified file 'account_asset/i18n/pt.po' (properties changed: +x to -x)
=== modified file 'account_asset/i18n/sv.po' (properties changed: +x to -x)
=== modified file 'account_asset/security/ir.model.access.csv' (properties changed: +x to -x)
=== modified file 'account_asset/wizard/__init__.py' (properties changed: +x to -x)
=== modified file 'account_asset/wizard/account_asset_change_duration.py' (properties changed: +x to -x)
=== modified file 'account_asset/wizard/wizard_asset_compute.py' (properties changed: +x to -x)
=== modified file 'base_report_designer/plugin/openerp_report_designer/bin/OOo_run.sh' (properties changed: +x to -x)
=== modified file 'document/odt2txt.py' (properties changed: +x to -x)
=== modified file 'document/test_cindex.py' (properties changed: +x to -x)
=== modified file 'document_ftp/ftpserver/ftpserver.py' (properties changed: +x to -x)
=== modified file 'document_webdav/test_davclient.py' (properties changed: +x to -x)
=== modified file 'email_template/html2text.py' (properties changed: +x to -x)
=== modified file 'l10n_ch/report/ocrbb.ttf' (properties changed: +x to -x)
=== modified file 'l10n_ch/test/test.v11' (properties changed: +x to -x)
=== modified file 'l10n_ch/test/test_part_1.v11' (properties changed: +x to -x)
=== modified file 'l10n_ch/test/test_part_2.v11' (properties changed: +x to -x)
=== modified file 'mail/static/scripts/openerp_mailgate.py' (properties changed: +x to -x)
=== modified file 'plugin_thunderbird/static/thunderbird_plugin/install.sh' (properties changed: +x to -x)
=== modified file 'purchase/wizard/purchase_line_invoice.py' (properties changed: +x to -x)
=== modified file 'purchase_double_validation/test/purchase_double_validation_test.yml' (properties changed: +x to -x)
=== modified file 'purchase_requisition/test/purchase_requisition_demo.yml' (properties changed: +x to -x)
=== modified file 'stock/stock_view.xml'
--- stock/stock_view.xml 2013-09-10 15:12:35 +
+++ stock/stock_view.xml 2014-06-08 21:56:37 +
@@ -1536,7 +1536,7 @@
field name=namestock.move.tree2/field
field name=modelstock.move/field
field name=typetree/field
-field name=priority eval=6 /
+field name=priority eval=18 /
field name=arch type=xml
tree colors=grey:state == 'cancel' string=Moves
field name=picking_id string=Reference/
@@ -1571,26 +1571,6 @@
/tree
/field
/record
-!-- test --
- record id=view_move_tree_reception_picking_board model=ir.ui.view
-field name=namestock.move.tree3/field
-field name=modelstock.move/field
-field name=typetree/field
-field eval=6 name=priority/
-field name=arch type=xml
-tree string=Moves
-field name=picking_id string=Reference/
-field name=partner_id string=Partner/
-field name=product_id/
-field name=product_qty /
-field name=product_uom string=UoM/
-field name=date/
-field name=state/
-button name=action_done states=confirmed,assigned string=Process type=object icon=gtk-go-forward/
-/tree
-/field
-/record
-
record id=view_move_form_reception_picking model=ir.ui.view
field name=namestock.move.form2/field
=== modified file 'wiki/static/src/lib/wiky/Readme.md' (properties changed: +x to -x)
=== modified file 'wiki/static/src/lib/wiky/autogit.sh' (properties changed: +x