Merge lp:~openerp-dev/openobject-addons/trunk-lunch-align-pricetags-psa into lp:openobject-addons

[Paramjit Singh Sahota(OpenERP)]

Hello,

Fixed the issue,

> Price tags should be aligned (https://docs.google.com/open?id=0B7c_6dPUa6bcMHNsVWdrU3BDLW8 )
additionally, the description should be editable for saved products (eg "je crois les doigts": should be able to remove that)

Thankz YoU.
 -PSA

[lp:~openerp-dev/openobject-addons/trunk-lunch-align-pricetags-psa]

8449. By Paramjit Singh Sahota(OpenERP) on 2012-12-26

[MERGE] Merged lp:openobject-addons.

Unmerged revisions

8449. By Paramjit Singh Sahota(OpenERP) on 2012-12-26

[MERGE] Merged lp:openobject-addons.

8448. By Paramjit Singh Sahota(OpenERP) on 2012-12-21

[IMP] Improved code for
Additionally, the description should be editable for saved products (eg 'je crois les doigts': should be able to remove that).

8447. By Paramjit Singh Sahota(OpenERP) on 2012-12-21

[IMP] Improved css
 Price tags should be aligned (https://docs.google.com/open?id=0B7c_6dPUa6bcMHNsVWdrU3BDLW8)

=== modified file 'lunch/lunch.py'
--- lunch/lunch.py	2012-12-18 13:41:18 +0000
+++ lunch/lunch.py	2012-12-26 07:45:26 +0000
@@ -268,6 +268,7 @@
 
                             xml_pref_10 = etree.Element("div")
                             xml_pref_10.set('class','oe_grey')
+                            xml_pref_10.set('contenteditable','true')
                             xml_pref_10.text = escape(pref.note or '')
                             xml_pref_3.append(xml_pref_10)
 

=== modified file 'lunch/static/src/css/lunch.css'
--- lunch/static/src/css/lunch.css	2012-11-06 17:25:44 +0000
+++ lunch/static/src/css/lunch.css	2012-12-26 07:45:26 +0000
@@ -41,3 +41,7 @@
 .openerp .oe_lunch .oe_group_text_button {
   margin-bottom: 3px;
 }
+.openerp .oe_lunch .oe_lunch_text .oe_tag {
+  float: right;
+  margin-right:5px;
+}

=== modified file 'lunch/static/src/css/lunch.sass'
--- lunch/static/src/css/lunch.sass	2012-11-06 17:25:44 +0000
+++ lunch/static/src/css/lunch.sass	2012-12-26 07:45:26 +0000
@@ -34,3 +34,6 @@
             border: none
         .oe_group_text_button
             margin-bottom: 3px
+        .oe_lunch_text .oe_tag
+            float: right
+            margin-right: 5px