[MERGE] merge with latest trunk

bzr revid: rma@tinyerp.com-20131111124249-18c9hwxcw4c8276o

diff --cc addons/base_calendar/i18n/sl.po
index 4d1226d,2687efb..c7a74bf
--- 1/addons/base_calendar/i18n/sl.po
--- 2/addons/base_calendar/i18n/sl.po
+++ b/addons/base_calendar/i18n/sl.po
@@@ -14,8 -14,8 +14,8 @@@ msgstr "
  "MIME-Version: 1.0\n"
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
- "X-Launchpad-Export-Date: 2013-03-16 05:45+0000\n"
- "X-Generator: Launchpad (build 16532)\n"
 -"X-Launchpad-Export-Date: 2013-11-12 05:41+0000\n"
 -"X-Generator: Launchpad (build 16820)\n"
++"X-Launchpad-Export-Date: 2013-09-12 06:24+0000\n"
++"X-Generator: Launchpad (build 16761)\n"
  
  #. module: base_calendar
  #: selection:calendar.alarm,trigger_related:0
@@@ -519,13 -523,13 +519,13 @@@ msgstr "Zaženi
  #. module: base_calendar
  #: model:ir.model,name:base_calendar.model_calendar_alarm
  msgid "Event alarm information"
 -msgstr "Informacija o alarmu dogodka"
 +msgstr ""
  
  #. module: base_calendar
- #: code:addons/base_calendar/base_calendar.py:1015
+ #: code:addons/base_calendar/base_calendar.py:1017
  #, python-format
  msgid "Count cannot be negative or 0."
 -msgstr "Število ne more biti negativno ali nič"
 +msgstr ""
  
  #. module: base_calendar
  #: field:crm.meeting,create_date:0
@@@ -1197,10 -1215,10 +1197,10 @@@ msgstr "Odgovorni uporabnik
  #. module: base_calendar
  #: view:crm.meeting:0
  msgid "Select Weekdays"
 -msgstr "Izberite dneve v tednu"
 +msgstr ""
  
  #. module: base_calendar
- #: code:addons/base_calendar/base_calendar.py:1519
+ #: code:addons/base_calendar/base_calendar.py:1521
  #: selection:calendar.attendee,availability:0
  #: selection:calendar.event,show_as:0
  #: selection:calendar.todo,show_as:0
@@@ -1453,10 -1482,10 +1453,10 @@@ msgid "Weekday
  msgstr "Delovni dan"
  
  #. module: base_calendar
- #: code:addons/base_calendar/base_calendar.py:1013
+ #: code:addons/base_calendar/base_calendar.py:1015
  #, python-format
  msgid "Interval cannot be negative."
 -msgstr "Interval ne more biti negativen."
 +msgstr ""
  
  #. module: base_calendar
  #: field:calendar.event,byday:0

diff --cc addons/point_of_sale/point_of_sale.py
index cd8e1b1,d32b8e9..e1fce07
--- 1/addons/point_of_sale/point_of_sale.py
--- 2/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@@ -1354,28 -1367,9 +1367,9 @@@ class product_product(osv.osv)
          'available_in_pos': fields.boolean('Available in the Point of Sale', help='Check if you want this product to appear in the Point of Sale'), 
          'pos_categ_id': fields.many2one('pos.category','Point of Sale Category',
              help="These products belong to those categories that are used to group similar products and are specific to the Point of Sale."),
 -        'to_weight' : fields.boolean('To Weight', help="Check if the product should be weighted (mainly used with self check-out interface)."),
 +        'to_weight' : fields.boolean('To Weigh', help="Check if the product should be weighted (mainly used with self check-out interface)."),
      }
  
-     def _default_pos_categ_id(self, cr, uid, context=None):
-         proxy = self.pool.get('ir.model.data')
- 
-         try:
-             category_id = proxy.get_object_reference(cr, uid, 'point_of_sale', 'categ_others')[1]
-         except ValueError:
-             values = {
-                 'name' : 'Others',
-             }
-             category_id = self.pool.get('pos.category').create(cr, uid, values, context=context)
-             values = {
-                 'name' : 'categ_others',
-                 'model' : 'pos.category',
-                 'module' : 'point_of_sale',
-                 'res_id' : category_id,
-             }
-             proxy.create(cr, uid, values, context=context)
- 
-         return category_id
  
      _defaults = {
          'to_weight' : False,

diff --cc addons/point_of_sale/point_of_sale_view.xml
Simple merge